- show which patch is applied; exclude git/svn dirs

Changed files:
    generate-tarball.sh -> 1.4

diff --git a/generate-tarball.sh b/generate-tarball.sh
index d22a8652b4b50d62940aaee240bcd9b85443a197..caa4a2092d9e5c288384eec04d0a2b001b184c4a 100644 (file)
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+rm -rf psi
 git clone git://git.psi-im.org/psi.git
 cd psi
 git submodule init
@@ -9,7 +10,10 @@ git submodule update
 svn co http://psi-dev.googlecode.com/svn/trunk/patches/
 # already applied
 rm patches/0005-psi-proxy-settings-in-opt.diff
-cat patches/*.diff | patch -p1
+for patch in patches/*.diff; do
+       echo "* PATCHING WITH $patch"
+       cat $patch | patch -p1
+done
 pkgrel=`svnversion "patches"`
 cd src
 sed "s/\(.xxx\)/.${pkgrel}/" -i "applicationinfo.cpp"
@@ -17,5 +21,5 @@ cd ..
 svn co --force http://psi-dev.googlecode.com/svn/trunk/iconsets/ iconsets
 cd ..
 mv psi psi-plus-0.15.${pkgrel}
-tar -cvJf psi-plus-0.15.${pkgrel}.tar.xz psi-plus-0.15.${pkgrel}
+tar --exclude .svn --exclude .git -cvJf psi-plus-0.15.${pkgrel}.tar.xz psi-plus-0.15.${pkgrel}
 rm -rf psi-plus-0.15.${pkgrel}