debian:

* add a -local option for create tarball script (handy to avoid multiple re-dl) * cherry pick some changes of micove ppa package git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4729 96395faa-99c1-11dd-bbfe-3dabce05a288
2011-06-12 12:39:11 +00:00 · 2011-06-12 12:39:11 +00:00 · 0543f24466
parent ae004d5e58
commit 0543f24466
6 changed files with 58 additions and 34 deletions
--- a/debian-unstable-upstream/README.Debian
+++ b/debian-unstable-upstream/README.Debian
@ -4,8 +4,6 @@
 * This version has some major modifications against the default upstream version. 
    -> documents are stored in $XDG_CONFIG_HOME instead of $HOME/pcsx2

-* This package is highly experimental.
-
 * Documentation needs some love. Feel free to help.

 * -fPIC option was removed for multiple reason.
--- a/debian-unstable-upstream/control
+++ b/debian-unstable-upstream/control
@ -1,5 +1,5 @@
 Source: pcsx2.snapshot
-Section: games
+Section: contrib/games
 Priority: optional
 Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 # WARNING we need dpkg-dev 1.15.7 to support dpkg-buildflags but ubunutu 10.04 have only 1.15.5.6...
@ -10,13 +10,13 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
    libbz2-dev (>= 1.0.4),
    libsdl1.2-dev,
    libjpeg-dev,
-    libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11), 
-    libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
+    libwxbase2.8-dev, 
+    libwxgtk2.8-dev,
    libgtk2.0-dev (>= 2.16),
    libasound2-dev | lib32asound2-dev [amd64],
    portaudio19-dev,
 # 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
-    libsoundtouch1-dev (>= 1.3)| libsoundtouch0-dev | lib32soundtouch0-dev [amd64],
+    libsoundtouch0-dev | lib32soundtouch0-dev [amd64] | libsoundtouch1-dev (>= 1.3),
    libsparsehash-dev (>= 1.6),
    libx11-dev,
    libglew1.5-dev (>= 1.5.1),
@ -37,7 +37,7 @@ Package: pcsx2-unstable
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends},
-    pcsx2-data-unstable (>= ${binary:Version}),
+    pcsx2-data-unstable (>= ${source:Version}),
    pcsx2-plugins-unstable (>= ${binary:Version})
 Conflicts: pcsx2
 Description: Playstation 2 emulator
@ -52,7 +52,7 @@ Description: Playstation 2 emulator
 Package: pcsx2-data-unstable
 Architecture: all 
 Depends: ${misc:Depends}
-Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-plugins-unstable (>= ${binary:Version})
+Recommends: pcsx2-unstable (>= ${source:Version}), pcsx2-plugins-unstable (>= ${source:Version})
 Conflicts: pcsx2-data
 Description: data for pcsx2
 PCSX2 is a PlayStation 2 emulator for Windows and Linux.
@ -66,11 +66,11 @@ Description: data for pcsx2
 Package: pcsx2-plugins-unstable
 # Warning amd64 need additional ia32libs
 Architecture: i386 amd64
-# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
+# manually add nvidia-cg-toolkit for zzogl (cg pacakge does not provide symbol or shlibs files)
 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})
+    pcsx2-data-unstable (>= ${source:Version})
 Conflicts: pcsx2-plugins
 Description: Various plugins for pcsx2
 PCSX2 is a PlayStation 2 emulator for Windows and Linux.
@ -119,6 +119,7 @@ Priority: optional
 # Warning amd64 need additional ia32libs
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: pcsx2-unstable (>= ${source:Version})
 Conflicts: pcsx2-l10n
 Description: Languages package for PCSX2
 PCSX2 is a PlayStation 2 emulator for Windows and Linux.
--- a/debian-unstable-upstream/control_ppa
+++ b/debian-unstable-upstream/control_ppa
@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
    libasound2-dev,
    portaudio19-dev,
 # 1.5 is in debian experimental, rename to libsoundtouch0 (yeah...). Keep 1.3 for the moment
-    libsoundtouch1-dev (>= 1.3)| libsoundtouch0-dev,
+    libsoundtouch0-dev | libsoundtouch1-dev (>= 1.3),
    libsparsehash-dev (>= 1.6),
    libx11-dev,
    libglew1.5-dev (>= 1.5.1),
--- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
+++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
@ -18,19 +18,42 @@
 ######################################################################
 # Global Parameters
 ######################################################################
-# Svn parameter
-if [ -n "$1" ] ; then
-    SVN_CO_VERSION=$1;
-else
-    echo "Please provide the subversion revision number as the first parameter"
-    exit 1;
+help()
+{
+    cat <<EOF
+    Help:
+    -rev <rev>     : revision number
+    -branch <name> : branch name, take trunk otherwise
+    -local         : download the svn repository into $HOME/.cache (not deleted by the script)
+EOF
+
+    exit 0
+}
+
+# Default value
+SVN_CO_VERSION=0;
+BRANCH="trunk"
+LOCAL=0
+while [ -n "$1" ]; do
+case $1 in
+    -help|-h) help;shift 1;;
+    -rev|-r) SVN_CO_VERSION=$2; shift 2;;
+    -branch|-b) BRANCH=$2; shift 1;;
+    -local|-l) LOCAL=1;shift 1;;
+    --) shift;break;;
+    -*) echo "ERROR: $1 option does not exists. Use -h for help";exit 1;;
+    *)  break;;
+esac
+done
+
+if [ "$SVN_CO_VERSION" = "0" ] ; then
+    help
 fi
-if [ -n "$2" ] ; then
-    # Use branch argument
-    SVN_TRUNK="http://pcsx2.googlecode.com/svn/branches/$2"
-else
-    # by default take the trunk
+
+if [ "$BRANCH" = "trunk" ] ; then
    SVN_TRUNK="http://pcsx2.googlecode.com/svn/trunk"
+else
+    SVN_TRUNK="http://pcsx2.googlecode.com/svn/branches/$BRANCH"
 fi

 # Debian name of package and tarball
@ -39,7 +62,11 @@ TAR_NAME="pcsx2.snapshot_${SVN_CO_VERSION}.orig.tar"

 # Directory
 TMP_DIR=/tmp
-ROOT_DIR=${TMP_DIR}/subversion_pcsx2_${SVN_CO_VERSION}
+if [ "$LOCAL" = 1 ] ; then
+    ROOT_DIR=${HOME}/.cache/svn_pcsx2__${BRANCH}
+else
+    ROOT_DIR=${TMP_DIR}/subversion_pcsx2_${SVN_CO_VERSION}
+fi
 NEW_DIR=${TMP_DIR}/$PKG_NAME


@ -63,11 +90,9 @@ get_svn_dir()
 get_svn_file()
 {
    for file in $* ; do
-        if [ ! -e `basename ${file}` ] ; then
-            # Versioning information is not supported for a single file
-            # therefore you can't use svn co
-            svn export --quiet ${SVN_TRUNK}/${file} -r $SVN_CO_VERSION;
-        fi
+        # Versioning information is not supported for a single file
+        # therefore you can't use svn co
+        svn export --quiet ${SVN_TRUNK}/${file} -r $SVN_CO_VERSION;
    done
 }

@ -120,8 +145,6 @@ 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 3rd party directories"
-find $NEW_DIR -name "3rdparty" -exec rm -fr {} \; 2> /dev/null
 echo "Remove windows file (useless & copyright issue)"
 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
@ -129,6 +152,7 @@ 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"

@ -138,4 +162,6 @@ tar -C $TMP_DIR -czf ${TAR_NAME}.gz $PKG_NAME

 ## Clean
 rm -fr $NEW_DIR
-rm -fr $ROOT_DIR
+if [ "$LOCAL" = 0 ] ; then
+    rm -fr $ROOT_DIR
+fi
--- a/debian-unstable-upstream/pcsx2-data-unstable.dirs
+++ b/debian-unstable-upstream/pcsx2-data-unstable.dirs
@ -1,2 +1,2 @@
 usr/share/games/pcsx2/shaders
-var/games/pcsx2/
+var/games/pcsx2
--- a/debian-unstable-upstream/pcsx2-l10n-unstable.dirs
+++ b/debian-unstable-upstream/pcsx2-l10n-unstable.dirs
@ -1,2 +1 @@
-usr/share/games/pcsx2/shaders
-var/games/pcsx2/
+usr/share