From e0998c8d7e8a4f182dc10aba219683887c9702f1 Mon Sep 17 00:00:00 2001 From: "gregory.hainaut@gmail.com" Date: Wed, 6 Oct 2010 13:36:46 +0000 Subject: [PATCH] debian: * forgot to remove some unstable stuff * Remove a bad tabulation in control file... git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3882 96395faa-99c1-11dd-bbfe-3dabce05a288 --- debian-upstream/control | 2 +- debian-upstream/control_ppa | 2 +- debian-upstream/rules | 4 ++-- debian-upstream/rules_fglrx | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian-upstream/control b/debian-upstream/control index b90658df54..69ad30da4b 100644 --- a/debian-upstream/control +++ b/debian-upstream/control @@ -37,7 +37,7 @@ Architecture: i386 amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data (>= ${binary:Version}), pcsx2-plugins (>= ${binary:Version}) - Conflicts: pcsx2-unstable +Conflicts: pcsx2-unstable 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). diff --git a/debian-upstream/control_ppa b/debian-upstream/control_ppa index 30aaa3d140..280180287e 100644 --- a/debian-upstream/control_ppa +++ b/debian-upstream/control_ppa @@ -31,7 +31,7 @@ Architecture: i386 Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data (>= ${binary:Version}), pcsx2-plugins (>= ${binary:Version}) - Conflicts: pcsx2-unstable +Conflicts: pcsx2-unstable 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). diff --git a/debian-upstream/rules b/debian-upstream/rules index 3b4533aef0..83bc98990d 100755 --- a/debian-upstream/rules +++ b/debian-upstream/rules @@ -74,8 +74,8 @@ clean: # dh_shlibdeps -- --ignore-missing-info override_dh_strip: - dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg - dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg + dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg + dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg # Avoid to relaunch the compilation twice. (build and dh_auto_build target) override_dh_auto_build: diff --git a/debian-upstream/rules_fglrx b/debian-upstream/rules_fglrx index ebd5629269..e11f48f0bc 100755 --- a/debian-upstream/rules_fglrx +++ b/debian-upstream/rules_fglrx @@ -74,8 +74,8 @@ override_dh_shlibdeps: dh_shlibdeps -- --ignore-missing-info override_dh_strip: - dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg - dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg + dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg + dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg # Avoid to relaunch the compilation twice. (build and dh_auto_build target) override_dh_auto_build: