From f5fd43f3c90bbe0fe4618d24f390bf62619ee99d Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Fri, 2 Jul 2010 14:55:41 +0000 Subject: [PATCH] [debian] * mass package rename from pcsx2 to pcsx2-unstable * refresh some patches git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3371 96395faa-99c1-11dd-bbfe-3dabce05a288 --- debian-upstream/control | 25 +++++++++++-------- ...reate_pcsx2_tarball_from_svn_repository.sh | 2 +- .../patches/01_rename_binary_generated.patch | 6 ++--- .../patches/02_update_default_path.patch | 18 ++++++------- .../patches/05_move_data_to_config.patch | 6 ++--- .../patches/21_use_legacy_soundtouch_13.patch | 18 ++++++------- .../patches/55_cmake_opt_clean.patch | 18 ++++++------- .../patches/56_cmake_enable_opt1.patch | 18 ++++++------- .../patches/57_cmake_enable_opt2.patch | 18 ++++++------- ...sx2-data.dirs => pcsx2-data-unstable.dirs} | 0 ...ta.install => pcsx2-data-unstable.install} | 0 ...ugins.dirs => pcsx2-plugins-unstable.dirs} | 0 ...install => pcsx2-plugins-unstable.install} | 0 .../{pcsx2.dirs => pcsx2-unstable.dirs} | 0 .../{pcsx2.install => pcsx2-unstable.install} | 0 .../{pcsx2.menu => pcsx2-unstable.menu} | 2 +- debian-upstream/pcsx2.snapshot-doc.docs | 1 - debian-upstream/pcsx2.snapshot-doc.install | 1 - debian-upstream/rules | 8 +++--- 19 files changed, 72 insertions(+), 69 deletions(-) rename debian-upstream/{pcsx2-data.dirs => pcsx2-data-unstable.dirs} (100%) rename debian-upstream/{pcsx2-data.install => pcsx2-data-unstable.install} (100%) rename debian-upstream/{pcsx2-plugins.dirs => pcsx2-plugins-unstable.dirs} (100%) rename debian-upstream/{pcsx2-plugins.install => pcsx2-plugins-unstable.install} (100%) rename debian-upstream/{pcsx2.dirs => pcsx2-unstable.dirs} (100%) rename debian-upstream/{pcsx2.install => pcsx2-unstable.install} (100%) rename debian-upstream/{pcsx2.menu => pcsx2-unstable.menu} (84%) delete mode 100644 debian-upstream/pcsx2.snapshot-doc.docs delete mode 100644 debian-upstream/pcsx2.snapshot-doc.install diff --git a/debian-upstream/control b/debian-upstream/control index 54d0ff9386..df9a40fce3 100644 --- a/debian-upstream/control +++ b/debian-upstream/control @@ -30,10 +30,11 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.7.1), cmake (>=2.8), Standards-Version: 3.9.0 Homepage: http://pcsx2.net/ -Package: pcsx2 +Package: pcsx2-unstable # Warning amd64 need additional ia32libs Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2-data (>= ${binary:Version}), pcsx2-plugins (>= ${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 Linux, started by the same team that brought you PCSX @@ -46,10 +47,11 @@ Description: Playstation 2 emulator This package includes the main binary file. -Package: pcsx2-data +Package: pcsx2-data-unstable Architecture: all Depends: ${misc:Depends} -Recommends: pcsx2 (>= ${binary:Version}), +Recommends: pcsx2-unstable (>= ${binary:Version}), +Conflicts: pcsx2-data Description: data for pcsx2 PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same team that brought you PCSX @@ -61,10 +63,11 @@ Description: data for pcsx2 . This package includes data files. -Package: pcsx2-plugins +Package: pcsx2-plugins-unstable # Warning amd64 need additional ia32libs Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, pcsx2 (>= ${binary:Version}), pcsx2-data (>= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, 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 Linux, started by the same team that brought you PCSX @@ -76,12 +79,13 @@ Description: Various plugins for pcsx2 . This package includes the plugins of the emulator. -Package: pcsx2-dbg +Package: pcsx2-unstable-dbg Section: debug Priority: extra # Warning amd64 need additional ia32libs Architecture: i386 amd64 -Depends: ${misc:Depends}, pcsx2 (= ${binary:Version}) +Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version}) +Conflicts: pcsx2-dbg Description: Debug symbols for pcsx2 PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by the same team that brought you PCSX @@ -89,12 +93,13 @@ Description: Debug symbols for pcsx2 . This package contains the debug symbol of pcsx2. -Package: pcsx2-plugins-dbg +Package: pcsx2-plugins-unstable-dbg Section: debug Priority: extra # Warning amd64 need additional ia32libs Architecture: i386 amd64 -Depends: ${misc:Depends}, pcsx2-plugins (= ${binary:Version}) +Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version}) +Conflicts: pcsx2-plugins-dbg 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 diff --git a/debian-upstream/create_pcsx2_tarball_from_svn_repository.sh b/debian-upstream/create_pcsx2_tarball_from_svn_repository.sh index 6bd563cd1d..a6d14ee1fa 100755 --- a/debian-upstream/create_pcsx2_tarball_from_svn_repository.sh +++ b/debian-upstream/create_pcsx2_tarball_from_svn_repository.sh @@ -60,7 +60,7 @@ mkdir -p $ROOT_DIR; (cd $ROOT_DIR; get_svn_file CMakeLists.txt; get_svn_dir bin common cmake pcsx2 tools; - get_svn_dir debian_unofficial; + get_svn_dir debian-unstable-upstream; echo "Done") echo "Donwload Linux compatible plugins ${SVN_CO_VERSION}" diff --git a/debian-upstream/patches/01_rename_binary_generated.patch b/debian-upstream/patches/01_rename_binary_generated.patch index 8c315fc995..da71cd736a 100644 --- a/debian-upstream/patches/01_rename_binary_generated.patch +++ b/debian-upstream/patches/01_rename_binary_generated.patch @@ -1,9 +1,9 @@ Debian specific Always uses the same executable name for the build. Easier for the install script -Index: pcsx2.snapshot-3343/pcsx2/CMakeLists.txt +Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3343.orig/pcsx2/CMakeLists.txt 2010-06-29 13:26:25.000000000 +0200 -+++ pcsx2.snapshot-3343/pcsx2/CMakeLists.txt 2010-06-29 13:28:38.334405496 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt ++++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt @@ -83,7 +83,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug) diff --git a/debian-upstream/patches/02_update_default_path.patch b/debian-upstream/patches/02_update_default_path.patch index 9e4222236f..331d9f9f6e 100644 --- a/debian-upstream/patches/02_update_default_path.patch +++ b/debian-upstream/patches/02_update_default_path.patch @@ -2,10 +2,10 @@ Debian policy. This patch updates default plugin path and config path. It also updates the pcsx2 game db path and shaders data path. AppInit.cpp:93 could be probably updated -Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp +Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp =================================================================== ---- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp 2010-06-29 13:26:25.000000000 +0200 -+++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:38.859568437 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp ++++ pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp @@ -162,7 +162,8 @@ wxDirName GetPlugins() @@ -16,10 +16,10 @@ Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp } wxDirName GetSettings() -Index: pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp +Index: pcsx2.snapshot-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp =================================================================== ---- pcsx2.snapshot-3343.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2010-06-29 13:26:25.000000000 +0200 -+++ pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp 2010-06-29 13:28:38.859568437 +0200 +--- pcsx2.snapshot-3369.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp ++++ pcsx2.snapshot-3369/plugins/zzogl-pg/opengl/ZZoglCreate.cpp @@ -347,17 +347,12 @@ assert(hShaderGlob != NULL); s_lpShaderResources = (u8*)LockResource(hShaderGlob); @@ -41,10 +41,10 @@ Index: pcsx2.snapshot-3343/plugins/zzogl-pg/opengl/ZZoglCreate.cpp } fseek(fres, 0, SEEK_END); -Index: pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h +Index: pcsx2.snapshot-3369/pcsx2/gui/AppGameDatabase.h =================================================================== ---- pcsx2.snapshot-3343.orig/pcsx2/gui/AppGameDatabase.h 2010-06-29 13:26:25.000000000 +0200 -+++ pcsx2.snapshot-3343/pcsx2/gui/AppGameDatabase.h 2010-06-29 13:28:38.859568437 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppGameDatabase.h ++++ pcsx2.snapshot-3369/pcsx2/gui/AppGameDatabase.h @@ -51,8 +51,8 @@ Console.WriteLn( "(GameDB) Unloading..." ); } diff --git a/debian-upstream/patches/05_move_data_to_config.patch b/debian-upstream/patches/05_move_data_to_config.patch index dbc886606e..b3a27dfa21 100644 --- a/debian-upstream/patches/05_move_data_to_config.patch +++ b/debian-upstream/patches/05_move_data_to_config.patch @@ -1,7 +1,7 @@ -Index: pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp +Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp =================================================================== ---- pcsx2.snapshot-3343.orig/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:38.859568437 +0200 -+++ pcsx2.snapshot-3343/pcsx2/gui/AppConfig.cpp 2010-06-29 13:28:39.100612322 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp ++++ pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp @@ -125,7 +125,12 @@ { switch( mode ) diff --git a/debian-upstream/patches/21_use_legacy_soundtouch_13.patch b/debian-upstream/patches/21_use_legacy_soundtouch_13.patch index 03ed69e5fe..3898e78d4c 100644 --- a/debian-upstream/patches/21_use_legacy_soundtouch_13.patch +++ b/debian-upstream/patches/21_use_legacy_soundtouch_13.patch @@ -2,10 +2,10 @@ This patch removes recording feature beacause it needs libsoundtouch > 1.4. Howerever only the version 1.3 is in debian. Unfortunately the package seems to be not actively maintained. Note it also correct the inlude path. -Index: pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp +Index: pcsx2.snapshot-3369/plugins/spu2-x/src/Wavedump_wav.cpp =================================================================== ---- pcsx2.snapshot-3337.orig/plugins/spu2-x/src/Wavedump_wav.cpp 2010-06-28 22:39:30.000000000 +0200 -+++ pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp 2010-06-28 22:43:07.313797414 +0200 +--- pcsx2.snapshot-3369.orig/plugins/spu2-x/src/Wavedump_wav.cpp ++++ pcsx2.snapshot-3369/plugins/spu2-x/src/Wavedump_wav.cpp @@ -16,16 +16,22 @@ */ @@ -107,10 +107,10 @@ Index: pcsx2.snapshot-3337/plugins/spu2-x/src/Wavedump_wav.cpp m_wavrecord->write( (s16*)&sample, 2 ); +#endif } -Index: pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp +Index: pcsx2.snapshot-3369/plugins/zerospu2/zerospu2.cpp =================================================================== ---- pcsx2.snapshot-3337.orig/plugins/zerospu2/zerospu2.cpp 2010-06-28 22:39:30.000000000 +0200 -+++ pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp 2010-06-28 22:43:07.313797414 +0200 +--- pcsx2.snapshot-3369.orig/plugins/zerospu2/zerospu2.cpp ++++ pcsx2.snapshot-3369/plugins/zerospu2/zerospu2.cpp @@ -28,7 +28,9 @@ #include @@ -141,10 +141,10 @@ Index: pcsx2.snapshot-3337/plugins/zerospu2/zerospu2.cpp delete pSoundTouch; pSoundTouch = NULL; for (u32 i = 0; i < ArraySize(s_pAudioBuffers); ++i) -Index: pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp +Index: pcsx2.snapshot-3369/plugins/zerospu2/zeroworker.cpp =================================================================== ---- pcsx2.snapshot-3337.orig/plugins/zerospu2/zeroworker.cpp 2010-06-28 22:39:30.000000000 +0200 -+++ pcsx2.snapshot-3337/plugins/zerospu2/zeroworker.cpp 2010-06-28 22:43:07.313797414 +0200 +--- pcsx2.snapshot-3369.orig/plugins/zerospu2/zeroworker.cpp ++++ pcsx2.snapshot-3369/plugins/zerospu2/zeroworker.cpp @@ -19,10 +19,14 @@ #include "zerospu2.h" #include "zeroworker.h" diff --git a/debian-upstream/patches/55_cmake_opt_clean.patch b/debian-upstream/patches/55_cmake_opt_clean.patch index 5f135986cc..88bb08e898 100644 --- a/debian-upstream/patches/55_cmake_opt_clean.patch +++ b/debian-upstream/patches/55_cmake_opt_clean.patch @@ -1,7 +1,7 @@ -Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt +Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:06.223607055 +0200 -+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.082609942 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt ++++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt @@ -17,12 +17,8 @@ set(CMAKE_CXX_FLAGS_RELEASE "") @@ -157,10 +157,10 @@ Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt # link target with wx target_link_libraries(${pcsx2Name} ${wxWidgets_LIBRARIES}) -Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:39:30.000000000 +0200 -+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200 +--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt @@ -22,10 +22,6 @@ # set common flags set(CommonFlags @@ -274,10 +274,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt endif(CMAKE_BUILD_TYPE STREQUAL Release) # variable with all sources of this library -Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:39:30.000000000 +0200 -+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200 +--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt @@ -20,16 +20,12 @@ set(CMAKE_CXX_FLAGS_RELEASE "") diff --git a/debian-upstream/patches/56_cmake_enable_opt1.patch b/debian-upstream/patches/56_cmake_enable_opt1.patch index 045771bb3a..c3c6e6bc56 100644 --- a/debian-upstream/patches/56_cmake_enable_opt1.patch +++ b/debian-upstream/patches/56_cmake_enable_opt1.patch @@ -1,7 +1,7 @@ -Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200 -+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.330002361 +0200 +--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt @@ -39,21 +39,9 @@ # Remove optimization that can break the code. Must be retested @@ -24,10 +24,10 @@ Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt ) -Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.084613185 +0200 -+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200 +--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt @@ -39,21 +39,9 @@ # Remove optimization that can break the code. Must be retested @@ -50,10 +50,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt ) -Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt +Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.082609942 +0200 -+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt ++++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt @@ -36,21 +36,9 @@ # Remove optimization that can break the code. Must be retested diff --git a/debian-upstream/patches/57_cmake_enable_opt2.patch b/debian-upstream/patches/57_cmake_enable_opt2.patch index bb44a50a2c..5bac1f073e 100644 --- a/debian-upstream/patches/57_cmake_enable_opt2.patch +++ b/debian-upstream/patches/57_cmake_enable_opt2.patch @@ -1,7 +1,7 @@ -Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.330002361 +0200 -+++ pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt 2010-06-28 22:43:08.621848268 +0200 +--- pcsx2.snapshot-3369.orig/common/src/Utilities/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/Utilities/CMakeLists.txt @@ -46,13 +46,6 @@ @@ -16,10 +16,10 @@ Index: pcsx2.snapshot-3337/common/src/Utilities/CMakeLists.txt ) -Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt +Index: pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200 -+++ pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt 2010-06-28 22:43:08.621848268 +0200 +--- pcsx2.snapshot-3369.orig/common/src/x86emitter/CMakeLists.txt ++++ pcsx2.snapshot-3369/common/src/x86emitter/CMakeLists.txt @@ -46,13 +46,6 @@ @@ -34,10 +34,10 @@ Index: pcsx2.snapshot-3337/common/src/x86emitter/CMakeLists.txt ) # set optimization flags -Index: pcsx2.snapshot-3337/pcsx2/CMakeLists.txt +Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt =================================================================== ---- pcsx2.snapshot-3337.orig/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.330726425 +0200 -+++ pcsx2.snapshot-3337/pcsx2/CMakeLists.txt 2010-06-28 22:43:08.622848331 +0200 +--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt ++++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt @@ -42,13 +42,6 @@ ) diff --git a/debian-upstream/pcsx2-data.dirs b/debian-upstream/pcsx2-data-unstable.dirs similarity index 100% rename from debian-upstream/pcsx2-data.dirs rename to debian-upstream/pcsx2-data-unstable.dirs diff --git a/debian-upstream/pcsx2-data.install b/debian-upstream/pcsx2-data-unstable.install similarity index 100% rename from debian-upstream/pcsx2-data.install rename to debian-upstream/pcsx2-data-unstable.install diff --git a/debian-upstream/pcsx2-plugins.dirs b/debian-upstream/pcsx2-plugins-unstable.dirs similarity index 100% rename from debian-upstream/pcsx2-plugins.dirs rename to debian-upstream/pcsx2-plugins-unstable.dirs diff --git a/debian-upstream/pcsx2-plugins.install b/debian-upstream/pcsx2-plugins-unstable.install similarity index 100% rename from debian-upstream/pcsx2-plugins.install rename to debian-upstream/pcsx2-plugins-unstable.install diff --git a/debian-upstream/pcsx2.dirs b/debian-upstream/pcsx2-unstable.dirs similarity index 100% rename from debian-upstream/pcsx2.dirs rename to debian-upstream/pcsx2-unstable.dirs diff --git a/debian-upstream/pcsx2.install b/debian-upstream/pcsx2-unstable.install similarity index 100% rename from debian-upstream/pcsx2.install rename to debian-upstream/pcsx2-unstable.install diff --git a/debian-upstream/pcsx2.menu b/debian-upstream/pcsx2-unstable.menu similarity index 84% rename from debian-upstream/pcsx2.menu rename to debian-upstream/pcsx2-unstable.menu index d967db3ff6..bbaf11071a 100644 --- a/debian-upstream/pcsx2.menu +++ b/debian-upstream/pcsx2-unstable.menu @@ -1,4 +1,4 @@ -?package(pcsx2): \ +?package(pcsx2-unstable): \ needs="X11" \ section="Applications/Emulators" \ title="pcsx2" \ diff --git a/debian-upstream/pcsx2.snapshot-doc.docs b/debian-upstream/pcsx2.snapshot-doc.docs deleted file mode 100644 index d4f4542584..0000000000 --- a/debian-upstream/pcsx2.snapshot-doc.docs +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/debian-upstream/pcsx2.snapshot-doc.install b/debian-upstream/pcsx2.snapshot-doc.install deleted file mode 100644 index d4f4542584..0000000000 --- a/debian-upstream/pcsx2.snapshot-doc.install +++ /dev/null @@ -1 +0,0 @@ -#DOCS# diff --git a/debian-upstream/rules b/debian-upstream/rules index 7063ae6b58..9197c16303 100755 --- a/debian-upstream/rules +++ b/debian-upstream/rules @@ -73,8 +73,8 @@ install: build dh_install # install menu and icon - cp debian/pcsx2.desktop debian/pcsx2/usr/share/applications - cp debian/pcsx2.xpm debian/pcsx2/usr/share/pixmaps + cp debian/pcsx2.desktop debian/pcsx2-unstable/usr/share/applications + cp debian/pcsx2.xpm debian/pcsx2-unstable/usr/share/pixmaps # Build architecture-independent files here. binary-indep: build install @@ -99,8 +99,8 @@ binary-arch: build install dh_installdocs -a dh_installmenu -a dh_installman -a - dh_strip --package=pcsx2 --dbg-package=pcsx2-dbg - dh_strip --package=pcsx2-plugins --dbg-package=pcsx2-plugins-dbg + dh_strip --package=pcsx2-unstable --dbg-package=pcsx2-unstable-dbg + dh_strip --package=pcsx2-plugins-unstable --dbg-package=pcsx2-plugins-unstable-dbg dh_link -a dh_compress -a dh_fixperms -a