From 0046f4a6f7202d507818ff78e5e1355ed0444a2b Mon Sep 17 00:00:00 2001
From: "gregory.hainaut" <gregory.hainaut@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 2 Jan 2013 16:09:09 +0000
Subject: [PATCH] debian: * add libaio new dependency * update
 create_pcsx2_tarball_from_svn_repository script to support svn 1.7

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5496 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 debian-unstable-upstream/control              |  7 ++++--
 ...reate_pcsx2_tarball_from_svn_repository.sh | 24 ++++++-------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/debian-unstable-upstream/control b/debian-unstable-upstream/control
index f5e283a978..cfddfafeb8 100644
--- a/debian-unstable-upstream/control
+++ b/debian-unstable-upstream/control
@@ -5,6 +5,7 @@ Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
 Build-Depends: cmake (>= 2.8.5),
     debhelper (>= 8.9),
     dpkg-dev (>= 1.15.7),
+    libaio-dev,
     libasound2-dev,
     libbz2-dev,
     libgl1-mesa-dev,
@@ -29,9 +30,11 @@ Homepage: http://pcsx2.net/
 
 Package: pcsx2-unstable
 Architecture: i386
-# recommand libasound for alsa plugin for pulseaudio
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libasound2-plugins
+# libasound => alsa plugin for pulseaudio
+# libusb    => ps3 controller (and probably others)
+Recommends: libasound2-plugins,
+    libusb-0.1-4
 Conflicts: pcsx2,
     pcsx2-data-unstable,
     pcsx2-l10n-unstable,
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 f04e5be13c..6f81365ebf 100755
--- a/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
+++ b/debian-unstable-upstream/create_pcsx2_tarball_from_svn_repository.sh
@@ -80,7 +80,7 @@ get_svn_dir()
         echo "  $directory" | sed -e 's/\//\ /g'
         if [ -e `basename ${directory}` ] ; then
             # Directory already exist so only update
-            svn up --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION;
+            svn up --quiet `basename ${directory}` -r $SVN_CO_VERSION;
         else 
             svn co --quiet ${SVN_TRUNK}/${directory} -r $SVN_CO_VERSION;
         fi
@@ -92,7 +92,7 @@ get_svn_file()
     for file in $* ; do
         # 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;
+        svn export --quiet ${SVN_TRUNK}/${file} --force -r $SVN_CO_VERSION;
     done
 }
 
@@ -130,33 +130,23 @@ mkdir -p $ROOT_DIR/plugins
 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"
-    
-
 ## Installation
 echo "Copy the subversion repository to a temporary directory"
 # Copy the dir
 rm -fr $NEW_DIR
 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 windows files (useless & copyright issues)"
+echo "Remove windows files (useless & potential copyright issues)"
+# => pcsx2/windows
+# Copyright header must be updated
 find $NEW_DIR -iname "windows" -type d -exec rm -fr {} \; 2> /dev/null
+# => ./plugins/zzogl-pg*/opengl/Win32 (reduced to the current linux plugins)
 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}/common/vsprops"
+
 echo "Remove useless files (copyright issues)"
 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"
-rm -fr "${NEW_DIR}/plugins/GSdx/vtune"
 
 ## BUILD
 echo "Build the tar.gz file"