diff --git a/debian-unstable-upstream/TODO.debian b/debian-unstable-upstream/TODO.debian deleted file mode 100644 index 2bc229e232..0000000000 --- a/debian-unstable-upstream/TODO.debian +++ /dev/null @@ -1,9 +0,0 @@ -* policy bin2cpp tool ?? - May be we could pregenerate the file in the upstream tar ball!! - -* copyright and doc stuff - Lots of work to do here.... - * need to add copyrigh info in Cmake file - -## 64 bit -=> see multiarch diff --git a/debian-unstable-upstream/compat b/debian-unstable-upstream/compat index 7f8f011eb7..45a4fb75db 100644 --- a/debian-unstable-upstream/compat +++ b/debian-unstable-upstream/compat @@ -1 +1 @@ -7 +8 diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control index b33dfba216..c7b1cff9b0 100644 --- a/debian-unstable-upstream/control +++ b/debian-unstable-upstream/control @@ -3,14 +3,13 @@ Section: contrib/games Priority: optional Maintainer: Gregory Hainaut # WARNING Natty need at least cmake 2.8.5 (multiarch issue) -Build-Depends: cmake (>= 2.8), - debhelper (>= 7.0.50), +Build-Depends: cmake (>= 2.8.5), + debhelper (>= 9), dpkg-dev (>= 1.15.7), libasound2-dev, libbz2-dev, libgl1-mesa-dev, # Future GSdx version will need glew1.6. Only Oneiric have it... -# libglew1.6-dev, libglew-dev (>= 1.6)| libglew1.5-dev, libglu1-mesa-dev, libgtk2.0-dev (>= 2.16), @@ -26,17 +25,24 @@ Build-Depends: cmake (>= 2.8), libcg, nvidia-cg-toolkit (>= 3), portaudio19-dev, zlib1g-dev (>= 1:1.2.3.3) -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://pcsx2.net/ Package: pcsx2-unstable Architecture: i386 +# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files) +# recommand libasound for alsa plugin for pulseaudio Depends: ${shlibs:Depends}, ${misc:Depends}, - pcsx2-plugins-unstable (>= ${binary:Version}) + libcg | nvidia-cg-toolkit (>= 2.1), +Recommends: libasound2-plugins Conflicts: pcsx2, - pcsx2-data-unstable -Replaces: pcsx2-data-unstable -Description: Playstation 2 emulator + pcsx2-data-unstable, + pcsx2-l10n-unstable, + pcsx2-plugins-unstable +Replaces: pcsx2-data-unstable, + pcsx2-l10n-unstable, + pcsx2-plugins-unstable +Description: Playstation 2 emulator. PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support @@ -45,31 +51,15 @@ Description: Playstation 2 emulator . This package includes the main binary file. -Package: pcsx2-plugins-unstable -Architecture: i386 -# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files) -Depends: ${shlibs:Depends}, ${misc:Depends}, - libcg | nvidia-cg-toolkit (>= 2.1) -Recommends: pcsx2-unstable (>= ${binary:Version}), -Conflicts: pcsx2-plugins, - pcsx2-data-unstable -Replaces: pcsx2-data-unstable -Description: Various plugins for PCSX2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux. - . - 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 includes the plugins for PCSX2. - Package: pcsx2-unstable-dbg Section: contrib/debug Priority: extra Architecture: i386 Depends: ${misc:Depends}, pcsx2-unstable (= ${binary:Version}) -Conflicts: pcsx2-dbg -Description: Debug symbols for pcsx2 +Conflicts: pcsx2-dbg, + pcsx2-plugins-unstable-dbg +Replaces: pcsx2-plugins-unstable-dbg +Description: Debug symbols for pcsx2. PCSX2 is a PlayStation 2 emulator for Windows and Linux. . WARNING: It requires a CPU with SSE2 instructions. If your CPU does not support @@ -78,32 +68,3 @@ Description: Debug symbols for pcsx2 . This package contains the debug symbols for PCSX2. -Package: pcsx2-plugins-unstable-dbg -Section: contrib/debug -Priority: extra -Architecture: i386 -Depends: ${misc:Depends}, pcsx2-plugins-unstable (= ${binary:Version}) -Conflicts: pcsx2-plugins-dbg -Description: Debug symbols of the pcsx2-plugins - PCSX2 is a PlayStation 2 emulator for Windows and Linux. - . - 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 for the PCSX2 plugins. - -Package: pcsx2-l10n-unstable -Section: contrib/localization -Architecture: all -Depends: ${misc:Depends} -Recommends: pcsx2-unstable (>= ${source:Version}) -Conflicts: pcsx2-l10n -Description: Language files for PCSX2 - PCSX2 is a PlayStation 2 emulator for Windows and Linux. - . - 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 localization of the emulator in various languages. diff --git a/debian-unstable-upstream/copyright b/debian-unstable-upstream/copyright index 799ff70a58..a7050d3593 100644 --- a/debian-unstable-upstream/copyright +++ b/debian-unstable-upstream/copyright @@ -1,168 +1,155 @@ -This work was packaged for Debian by: - - Gregory Hainaut on Sat, 24 Apr 2010 23:11:10 +0200 - -It was downloaded from: - - http://pcsx2.googlecode.com/svn/ - -Upstream Author(s): - - PCSX2 Dev Team +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: PCSX2 +Source: http://code.google.com/p/pcsx2/source +Files: debian/* Copyright: + 2010-2012 Gregory Hainaut + 2010-2012 Miguel Colon +License: LGPL-3 - Copyright (C) 2002-2010 PCSX2 Dev Team - -Files: pcsx2/*, common/*, plugins/spu2-x/*, plugins/PadNull/Pad*, plugins/USBnull/*, plugins/FWnull/*, plugins/CDVDnull/CDVD*, plugins/GSnull/*, plugins/dev9null/DEV9.cpp +Files: pcsx2/* common/* plugins/spu2-x/* plugins/PadNull/Pad* plugins/USBnull/* plugins/FWnull/* plugins/CDVDnull/CDVD* plugins/GSnull/* plugins/dev9null/DEV9.cpp +Copyright: 2002-2012 PCSX2 Dev Team License: LGPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU Lesser General -Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3". - - -Files: pcsx2/Mdec.cpp, pcsx2/Mdec.h, pcsx2/RDebug/deci2_drfp.cpp, pcsx2/IPU/mpeg2lib/*, pcsx2/cheatscpp.h, common/include/api/*, plugins/onepad/*, plugins/PadNull/Linux/*, plugins/SPU2null/*, plugins/FWnull/FW.cpp, plugins/zerospu2/*, plugins/zzogl-pg/*, plugins/GSnull/Registers.h, plugins/GSnull/Linux/Linux*, plugins/GSnull/Linux/Config*, plugins/dev9null/DEV9.h, plugins/dev9null/Config.* +Files: pcsx2/Mdec.cpp pcsx2/Mdec.h pcsx2/RDebug/deci2_drfp.cpp pcsx2/IPU/mpeg2lib/* pcsx2/cheatscpp.h common/include/api/* plugins/onepad/* plugins/PadNull/Linux/* plugins/SPU2null/* plugins/FWnull/FW.cpp plugins/zerospu2/* plugins/zzogl-pg/* plugins/GSnull/Registers.h plugins/GSnull/Linux/Linux* plugins/GSnull/Linux/Config* plugins/dev9null/DEV9.h plugins/dev9null/Config.* +Copyright: 2002-2012 PCSX2 Dev Team License: GPL-2+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU General -Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - - -Files: plugins/spu2-x/src/Spu2replay.*, plugins/spu2-x/src/Decode*, plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp, plugins/spu2-x/src/spdif.h, plugins/spu2-x/src/Debug.h - +Files: plugins/spu2-x/src/Spu2replay.* plugins/spu2-x/src/Decode* plugins/spu2-x/src/Linux/ConfigSoundTouch.cpp plugins/spu2-x/src/spdif.h plugins/spu2-x/src/Debug.h +Copyright: 2002-2012 PCSX2 Dev Team License: LGPL-2.1+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation, either version 2.1 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - -On Debian systems, the complete text of the GNU Lesser General -Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". Files: plugins/zzogl-pg/opengl/glprocs.* -Copyright: 1991-2000, Silicon Graphics, Inc -License: MIT/X11 (BSD like) - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice including the dates of first publication and - either this permission notice or a reference to - http://oss.sgi.com/projects/FreeB/ - shall be included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - SILICON GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - Except as contained in this notice, the name of Silicon Graphics, Inc. - shall not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization from - Silicon Graphics, Inc. - +Copyright: 1991-2000 Silicon Graphics, Inc +License: SGI FREE SOFTWARE LICENSE B 2.0 Files: common/include/intrin_x86.h -Copyright: 2006, KJK::Hyperion -License: MIT/X11 (BSD like) - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - +Copyright: 2006 KJK::Hyperion +License: Expat Files: common/src/Utilities/vssprintf.cpp -Copyright: 2002, Michael Ringgaard -License: BSD (3 clause) - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the project nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. +Copyright: 2002 Michael Ringgaard +License: BSD-3-Clause Files: plugins/zzogl-pg/opengl/zpipe.cpp -Copyright: public domain +Copyright: not applicable +License: public-domain + Author's Note: + zpipe.c: example of proper use of zlib's inflate() and deflate() + Not copyrighted -- provided to the public domain + Version 1.4 11 December 2005 Mark Adler -Files: plugins/zzogl-pg/opengl/ZeroGSShaders/zerogsshaders* -Copyright: Unknown +License: LGPL-3 or LGPL-3+ + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free + Software Foundation, either version 3 of the License, or (at your option) any + later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License along + with this program. If not, see . +Comment: On Debian systems, the complete text of the GNU Lesser General Public + License version 3 can be found in "/usr/share/common-licenses/LGPL-3". -The Debian packaging is: +License: GPL-2+ + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 51 Franklin + Street, Fifth Floor, Boston, MA 02110-1301, USA. +Comment: On Debian systems, the complete text of the GNU General Public License + version 2 can be found in "/usr/share/common-licenses/GPL-2". - Copyright (C) 2010 Gregory Hainaut +License: LGPL-2.1+ + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free + Software Foundation; either version 2.1 of the License, or (at your option) any + later version. + . + This program is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public License along + with this program; if not, write to the Free Software Foundation, Inc., 51 + Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +Comment: On Debian systems, the complete text of the GNU Lesser General Public + License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". -and is licensed under the Lesser GPL version 3, see above. +License: SGI FREE SOFTWARE LICENSE B 2.0 + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice including the dates of first publication and either + this permission notice or a reference to http://oss.sgi.com/projects/FreeB/ + shall be included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON + GRAPHICS, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of Silicon Graphics, Inc. shall + not be used in advertising or otherwise to promote the sale, use or other + dealings in this Software without prior written authorization from Silicon + Graphics, Inc. + +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +License: BSD-3-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + . + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. Neither the name of the project nor the names of its contributors may be + used to endorse or promote products derived from this software without specific + prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh index f8bd4e5fbe..a394f9e942 100755 --- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh +++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh @@ -105,7 +105,7 @@ echo "Downloading pcsx2 source revision ${SVN_CO_VERSION}" mkdir -p $ROOT_DIR; (cd $ROOT_DIR; get_svn_file CMakeLists.txt; - get_svn_dir common cmake locales pcsx2 tools; + get_svn_dir common cmake locales pcsx2; get_svn_dir debian-unstable-upstream linux_various; echo "Done") @@ -125,18 +125,18 @@ mkdir -p $ROOT_DIR/plugins # get_svn_dir plugins/CDVDnull plugins/CDVDiso; get_svn_dir plugins/PadNull plugins/onepad; get_svn_dir plugins/SPU2null plugins/spu2-x; - get_svn_dir plugins/GSnull plugins/zzogl-pg plugins/GSdx; + get_svn_dir plugins/GSnull plugins/zzogl-pg plugins/zzogl-pg-cg plugins/GSdx; get_svn_dir plugins/dev9null plugins/FWnull plugins/USBnull; echo "Note: some plugins are more or less deprecated CDVDisoEFP, CDVDlinuz, Zerogs, Zeropad ..."; echo "Done") ## Download the internal sdl 1.3 for gsdx -echo "Downloading 3rdpary SDL 1.3 (need by gsdx) revision ${SVN_CO_VERSION}" -mkdir -p $ROOT_DIR/3rdparty -(cd $ROOT_DIR/3rdparty/; - get_svn_file 3rdparty/CMakeLists.txt; - get_svn_dir 3rdparty/SDL-1.3.0-5387;) -echo "Done" +# echo "Downloading 3rdpary SDL 1.3 (need by gsdx) revision ${SVN_CO_VERSION}" +# mkdir -p $ROOT_DIR/3rdparty +# (cd $ROOT_DIR/3rdparty/; +# get_svn_file 3rdparty/CMakeLists.txt; +# get_svn_dir 3rdparty/SDL-1.3.0-5387;) +# echo "Done" ## Installation @@ -147,22 +147,12 @@ cp -r $ROOT_DIR $NEW_DIR echo "Remove .svn directories" find $NEW_DIR -name ".svn" -type d -exec rm -fr {} \; 2> /dev/null -echo "Remove old build system (scripts and autotools)" -find $NEW_DIR -name "build.sh" -exec rm -f {} \; -find $NEW_DIR -name "install-sh" -exec rm -f {} \; -find $NEW_DIR -name "depcomp" -exec rm -f {} \; -find $NEW_DIR -name "missing" -exec rm -f {} \; -find $NEW_DIR -name "aclocal.m4" -exec rm -f {} \; -find $NEW_DIR -name "configure.ac" -exec rm -f {} \; -find $NEW_DIR -name "Makefile.am" -exec rm -f {} \; echo "Remove windows files (useless & copyright issues)" find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null find $NEW_DIR -name "Win32" -type d -exec rm -fr {} \; 2> /dev/null rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/Win32" -rm -fr "${NEW_DIR}/tools/GSDumpGUI" rm -fr "${NEW_DIR}/common/vsprops" echo "Remove useless files (copyright issues)" -rm -fr "${NEW_DIR}/pcsx2/3rdparty" # useless link which annoy me rm -fr "${NEW_DIR}/plugins/zzogl-pg/opengl/ZeroGSShaders" rm -fr "${NEW_DIR}/common/src/Utilities/x86/MemcpyFast.cpp" rm -fr "${NEW_DIR}/plugins/GSdx/baseclasses" diff --git a/debian-unstable-upstream/docs b/debian-unstable-upstream/docs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian-unstable-upstream/pcsx2-l10n-unstable.install b/debian-unstable-upstream/pcsx2-l10n-unstable.install deleted file mode 100644 index d1dca5a6ef..0000000000 --- a/debian-unstable-upstream/pcsx2-l10n-unstable.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale usr/share/ diff --git a/debian-unstable-upstream/pcsx2-plugins-unstable.install b/debian-unstable-upstream/pcsx2-plugins-unstable.install deleted file mode 100644 index 7f244277b2..0000000000 --- a/debian-unstable-upstream/pcsx2-plugins-unstable.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/games/pcsx2 diff --git a/debian-unstable-upstream/pcsx2-unstable.docs b/debian-unstable-upstream/pcsx2-unstable.docs index 6f4c9c160f..bb72d3eddf 100644 --- a/debian-unstable-upstream/pcsx2-unstable.docs +++ b/debian-unstable-upstream/pcsx2-unstable.docs @@ -1 +1,2 @@ debian/tmp/usr/share/doc/pcsx2 +bin/docs/*.pdf diff --git a/debian-unstable-upstream/pcsx2-unstable.install b/debian-unstable-upstream/pcsx2-unstable.install index 28bfbb78a5..e0f12684bc 100644 --- a/debian-unstable-upstream/pcsx2-unstable.install +++ b/debian-unstable-upstream/pcsx2-unstable.install @@ -1,4 +1,7 @@ usr/bin/pcsx2 +usr/lib/games/pcsx2 usr/share/applications/pcsx2.desktop usr/share/pixmaps/pcsx2.xpm +usr/share/locale usr/share/ var/games/pcsx2 +usr/share/games/pcsx2 diff --git a/debian-unstable-upstream/pcsx2-plugins-unstable.lintian-overrides b/debian-unstable-upstream/pcsx2-unstable.lintian-overrides similarity index 100% rename from debian-unstable-upstream/pcsx2-plugins-unstable.lintian-overrides rename to debian-unstable-upstream/pcsx2-unstable.lintian-overrides diff --git a/debian-unstable-upstream/pcsx2-unstable.manpages b/debian-unstable-upstream/pcsx2-unstable.manpages index 5da2a57c4b..f4f1725fa4 100644 --- a/debian-unstable-upstream/pcsx2-unstable.manpages +++ b/debian-unstable-upstream/pcsx2-unstable.manpages @@ -1 +1 @@ -bin/docs/pcsx2.man +bin/docs/pcsx2.1 diff --git a/debian-unstable-upstream/pcsx2-unstable.menu b/debian-unstable-upstream/pcsx2-unstable.menu index bbaf11071a..40ce1a1400 100644 --- a/debian-unstable-upstream/pcsx2-unstable.menu +++ b/debian-unstable-upstream/pcsx2-unstable.menu @@ -3,4 +3,4 @@ section="Applications/Emulators" \ title="pcsx2" \ longtitle="A playstation 2 emulators" \ - command="/usr/games/pcsx2" + command="/usr/bin/pcsx2" diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules index 33d58738a9..748d5c322c 100755 --- a/debian-unstable-upstream/rules +++ b/debian-unstable-upstream/rules @@ -1,5 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 @@ -15,20 +14,15 @@ override_dh_auto_configure: -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \ -DCMAKE_BUILD_STRIP=FALSE \ -DXDG_STD=TRUE \ - -DFORCE_INTERNAL_SDL=TRUE \ -DPACKAGE_MODE=TRUE -clean: - dh_testdir - dh_testroot - dh_auto_clean - dh_clean - 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 +override_dh_makeshlibs: + +clean: + dh_auto_clean + dh_clean %: - dh $@ --parallel - -.PHONY: clean + dh $@ diff --git a/debian-unstable-upstream/watch b/debian-unstable-upstream/watch index ee7121df88..65d2360ad0 100644 --- a/debian-unstable-upstream/watch +++ b/debian-unstable-upstream/watch @@ -1,9 +1,3 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 # Note: Upstream does not release prepackaged source files.