debian:

* remove personal rule target: has not worked since last change...
* Some fix to control. Update package std version


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3721 96395faa-99c1-11dd-bbfe-3dabce05a288

debian-unstable-upstream/control

@@ -29,14 +29,16 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
 #     nvidia-cg-toolkit (>= 2.1.0017.deb1) | nvidia-cg-toolkit (>= 2.1.0017.deb1+nmu2) [amd64],
     nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64],
     ia32-libs (>= 20090808+nmu7) [amd64], ia32-libs-gtk (= 20100503+local1) [amd64]
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://pcsx2.net/
 
 Package: pcsx2-unstable
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
-Conflicts: pcsx2
+    pcsx2-data-unstable (>= ${binary:Version}),
+    pcsx2-plugins-unstable (>= ${binary:Version})
+    Conflicts: pcsx2
 Description: Playstation 2 emulator
  PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
  team that brought you PCSX (a Sony PlayStation 1 emulator).
@@ -66,8 +68,8 @@ Description: data for pcsx2
 Package: pcsx2-plugins-unstable
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends},
 # manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
+Depends: ${shlibs:Depends}, ${misc:Depends},
     nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
 Recommends: pcsx2-unstable (>= ${binary:Version}),
     pcsx2-data-unstable (>= ${binary:Version})

debian-unstable-upstream/control_ppa

@@ -24,21 +24,22 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
     libgl1-mesa-dev,
     libglu1-mesa-dev,
     nvidia-cg-toolkit-pcsx2
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://pcsx2.net/
 
 Package: pcsx2-unstable
 Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends},
+    pcsx2-data-unstable (>= ${binary:Version}),
+    pcsx2-plugins-unstable (>= ${binary:Version})
 Conflicts: pcsx2
 Description: Playstation 2 emulator
- PCSX2 is a PlayStation 2 emulator for Windows and
+ PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
- Linux, started by the same team that brought you PCSX
+ team that brought you PCSX (a Sony PlayStation 1 emulator).
- (a Sony PlayStation 1 emulator).
  .
- WARNING: it requieres a CPU with sse2 instructions. If your
+ WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
- CPU does not support this instruction set, it does not have
+ this instruction set, it does not have enough horse power to run this emulator
- enough horse power to run this emulator anyway.
+ anyway.
  .
  This package includes the main binary file.
 
@@ -49,33 +50,32 @@ Depends: ${misc:Depends}
 Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
 Conflicts: pcsx2-data
 Description: data for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and
+ PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
- Linux, started by the same team that brought you PCSX
+ team that brought you PCSX (a Sony PlayStation 1 emulator).
- (a Sony PlayStation 1 emulator).
  .
- WARNING: it requieres a CPU with sse2 instructions. If your
+ WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
- CPU does not support this instruction set, it does not have
+ this instruction set, it does not have enough horse power to run this emulator
- enough horse power to run this emulator anyway.
+ anyway.
  .
  This package includes data files.
 
 Package: pcsx2-plugins-unstable
 Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}),
 # manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
+Depends: ${shlibs:Depends}, ${misc:Depends},
     nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
+Recommends: pcsx2-unstable (>= ${binary:Version}),
+    pcsx2-data-unstable (>= ${binary:Version})
 Conflicts: pcsx2-plugins
 Description: Various plugins for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and
+ PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
- Linux, started by the same team that brought you PCSX
+ team that brought you PCSX (a Sony PlayStation 1 emulator).
- (a Sony PlayStation 1 emulator).
  .
- WARNING: it requieres a CPU with sse2 instructions. If your
+ WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
- CPU does not support this instruction set, it does not have
+ this instruction set, it does not have enough horse power to run this emulator
- enough horse power to run this emulator anyway.
+ anyway.
  .
- This package includes the plugins of the emulator.
+ This package includes the plugins for PCSX2.
 
 Package: pcsx2-unstable-dbg
 Section: debug
@@ -84,9 +84,12 @@ Architecture: i386
 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version})
 Conflicts: pcsx2-dbg
 Description: Debug symbols for pcsx2
- PCSX2 is a PlayStation 2 emulator for Windows and
+ PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
- Linux, started by the same team that brought you PCSX
+ team that brought you PCSX (a Sony PlayStation 1 emulator).
- (a Sony PlayStation 1 emulator).
+ .
+ WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
+ this instruction set, it does not have enough horse power to run this emulator
+ anyway.
  .
  This package contains the debug symbol of pcsx2.
 
@@ -96,9 +99,12 @@ Priority: extra
 Architecture: i386
 Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version})
 Conflicts: pcsx2-plugins-dbg
-Description: Debug symbols for pcsx2-plugins
+Description: Debug symbols of the pcsx2-plugins
- PCSX2 is a PlayStation 2 emulator for Windows and
+ PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same 
- Linux, started by the same team that brought you PCSX
+ team that brought you PCSX (a Sony PlayStation 1 emulator).
- (a Sony PlayStation 1 emulator).
  .
- This package contains the debug symbol of pcsx2 plugins.
+ WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support
+ this instruction set, it does not have enough horse power to run this emulator
+ anyway.
+ .
+ This package contains the debug symbols of the pcsx2 plugins.

debian-unstable-upstream/pcsx2-unstable.install

@@ -1 +1,3 @@
 bin/pcsx2 usr/games
+debian/pcsx2.desktop usr/share/applications
+debian/pcsx2.xpm usr/share/pixmaps

debian-unstable-upstream/rules

@@ -69,28 +69,6 @@ clean:
 
 	dh_clean
 
-install:
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	### the project build usefull thing in ./bin so directly install
-	### from this directory to the debian pkg directory (skip debian/tmp)
-	# Ubuntu use debian/tmp as default sourcedir...
-	# copy bin into debian tmp
-	mkdir -p debian/tmp
-	cp -fr bin debian/tmp
-	dh_install --sourcedir=debian/tmp
-
-	# install menu and icon
-	cp debian/pcsx2.desktop debian/pcsx2-unstable/usr/share/applications
-	cp debian/pcsx2.xpm debian/pcsx2-unstable/usr/share/pixmaps
-
-	# lintian override
-	dh_lintian
-
 ## Uncomment this, if fglrx driver is installed
 #override_dh_shlibdeps:
 #	dh_shlibdeps -- --ignore-missing-info

debian-unstable-upstream/rules_fglrx

@@ -69,28 +69,6 @@ clean:
 
 	dh_clean
 
-install:
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	### the project build usefull thing in ./bin so directly install
-	### from this directory to the debian pkg directory (skip debian/tmp)
-	# Ubuntu use debian/tmp as default sourcedir...
-	# copy bin into debian tmp
-	mkdir -p debian/tmp
-	cp -fr bin debian/tmp
-	dh_install --sourcedir=debian/tmp
-
-	# install menu and icon
-	cp debian/pcsx2.desktop debian/pcsx2-unstable/usr/share/applications
-	cp debian/pcsx2.xpm debian/pcsx2-unstable/usr/share/pixmaps
-
-	# lintian override
-	dh_lintian
-
 # Allow compilation when fglrx is installed
 override_dh_shlibdeps:
 	dh_shlibdeps -- --ignore-missing-info