From d4fdb080495e978e5322cef97691242bdbcb1c0f Mon Sep 17 00:00:00 2001
From: "gregory.hainaut" <gregory.hainaut@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 1 Jul 2010 22:50:18 +0000
Subject: [PATCH] [cmake] Fix a typo [debian] Multiple lintian (package
 checker) fix

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3365 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 debian-upstream/README.Debian     |  6 ++++--
 debian-upstream/control           | 34 ++++++++++++++++++++-----------
 debian-upstream/pcsx2.desktop     |  3 +--
 debian-upstream/pcsx2.menu        |  2 +-
 plugins/spu2-x/src/CMakeLists.txt |  2 +-
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/debian-upstream/README.Debian b/debian-upstream/README.Debian
index 47db34c433..cbea48e9f1 100644
--- a/debian-upstream/README.Debian
+++ b/debian-upstream/README.Debian
@@ -1,5 +1,5 @@
-pcsx2.snapshot for Debian
--------------------------
+    pcsx2 for debian
+=========================
 
 * This version have some majors modification against default upstream
     -> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2
@@ -8,4 +8,6 @@ pcsx2.snapshot for Debian
 
 * This package is highly experimental.
 
+* Documentation needs some loves. Feel free to help.
+
  -- Gregory Hainaut <gregory.hainaut@gmail.com>  Sat, 24 Apr 2010 23:11:10 +0200
diff --git a/debian-upstream/control b/debian-upstream/control
index ee21d6115d..54d0ff9386 100644
--- a/debian-upstream/control
+++ b/debian-upstream/control
@@ -1,5 +1,3 @@
-# it would may be a good idea to use only 1 package for both pcsx2 and plugins. Both are required anyway.
-
 Source: pcsx2.snapshot
 Section: games
 Priority: optional
@@ -17,7 +15,7 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7.1), cmake (>=2.8),
     libasound2-dev | lib32asound2 [amd64],
     portaudio19-dev,
 # version not yet in debian 
-# libsoundtouch1-dev (>= 1.4),
+# libsoundtouch1-dev (>= 1.5),
 # I patch the source (remove feature) to compile with version 1.3
     libsoundtouch1-dev (>= 1.3),
     libsparsehash-dev (>=1.6),
@@ -27,10 +25,9 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7.1), cmake (>=2.8),
     libgl1-mesa-dev,
     libglu1-mesa-dev,
 # my nmu: add 32bits packages
-# TODO repackage with a local in the name (to avoid conflict with debian real nmu)
     nvidia-cg-toolkit (>= 2.1.0017.deb1) | nvidia-cg-toolkit (>= 2.1.0017.deb1+nmu2) [amd64],
     ia32-libs (>= 20090808+nmu7) [amd64], ia32-libs-gtk (= 20100503+local1) [amd64]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://pcsx2.net/
 
 Package: pcsx2
@@ -48,12 +45,6 @@ Description: Playstation 2 emulator
  .
  This package includes the main binary file.
 
-Package: pcsx2-dbg
-Section: devel
-# Warning amd64 need additional ia32libs
-Architecture: i386 amd64
-Depends: ${misc:Depends}, pcsx2 (= ${binary:Version})
-Description: Debug symbols for pcsx2
 
 Package: pcsx2-data
 Architecture: all 
@@ -85,9 +76,28 @@ Description: Various plugins for pcsx2
  .
  This package includes the plugins of the emulator.
 
+Package: pcsx2-dbg
+Section: debug
+Priority: extra
+# Warning amd64 need additional ia32libs
+Architecture: i386 amd64
+Depends: ${misc:Depends}, pcsx2 (= ${binary:Version})
+Description: Debug symbols for pcsx2
+ PCSX2 is a PlayStation 2 emulator for Windows and
+ Linux, started by the same team that brought you PCSX
+ (a Sony PlayStation 1 emulator).
+ .
+ This package contains the debug symbol of pcsx2.
+
 Package: pcsx2-plugins-dbg
-Section: devel
+Section: debug
+Priority: extra
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
 Depends: ${misc:Depends}, pcsx2-plugins (= ${binary:Version})
 Description: Debug symbols for pcsx2-plugins
+ PCSX2 is a PlayStation 2 emulator for Windows and
+ Linux, started by the same team that brought you PCSX
+ (a Sony PlayStation 1 emulator).
+ .
+ This package contains the debug symbol of pcsx2 plugins.
diff --git a/debian-upstream/pcsx2.desktop b/debian-upstream/pcsx2.desktop
index 7b0398f561..cf8c17f3ab 100644
--- a/debian-upstream/pcsx2.desktop
+++ b/debian-upstream/pcsx2.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Type=Application
 Name=PCSX2
 GenericName=Playstation 2 Emulator
 Comment=Sony Playstation 2 emulator
 Exec=pcsx2
 Icon=pcsx2
-Categories=Application;Game;Emulator;GTK
+Categories=Game;Emulator;GTK;
diff --git a/debian-upstream/pcsx2.menu b/debian-upstream/pcsx2.menu
index a8c64c0ce2..d967db3ff6 100644
--- a/debian-upstream/pcsx2.menu
+++ b/debian-upstream/pcsx2.menu
@@ -1,4 +1,4 @@
-?package(pcsx2.snapshot): \
+?package(pcsx2): \
     needs="X11" \
     section="Applications/Emulators" \
     title="pcsx2" \
diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
index 732534d377..70a6592976 100644
--- a/plugins/spu2-x/src/CMakeLists.txt
+++ b/plugins/spu2-x/src/CMakeLists.txt
@@ -22,7 +22,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 set(CommonFlags
     -Wall
     -m32
-    -FPIC
+    -fPIC
     -msse2
     )