From 7072ea5d922dff65fa1cf5f7b1174aa3c45cc3bb Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 27 Jun 2010 20:31:50 +0000 Subject: [PATCH] final debian package tweak git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.0@3230 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- build_scripts/Ubuntu_src/make.sh | 10 ++++++--- build_scripts/Ubuntu_src/makeSourcePackage.sh | 21 +++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/build_scripts/Ubuntu_src/make.sh b/build_scripts/Ubuntu_src/make.sh index 46bd8358e..cca5a12c6 100755 --- a/build_scripts/Ubuntu_src/make.sh +++ b/build_scripts/Ubuntu_src/make.sh @@ -1,5 +1,7 @@ #!/bin/sh +echo Getting svn revision... +echo svn=`svn up | cut -d\ -f3 | cut -d. -f1` echo This script will @@ -10,10 +12,12 @@ echo - rebuild the source package for the karmic i386 arch. echo - svn number is $svn. Is this correct ? echo echo Type ^C to abort, or type enter to proceed. +read tmp -rm -rf ./retroshare-0.5 -./clean.sh -./makeSourcePackage.sh +echo cleaning... +rm -rf ./retroshare-0.5 2> /dev/null +#./clean.sh >& /dev/null +#./makeSourcePackage.sh sudo PBUILDFOLDER=/var/cache/pbuilder pbuilder-dist lucid i386 build *.dsc cp /var/cache/pbuilder/lucid-i386_result/retroshare_0.5-1_i386.deb ./RetroShare_0.5."$svn"_lucid_i386.deb diff --git a/build_scripts/Ubuntu_src/makeSourcePackage.sh b/build_scripts/Ubuntu_src/makeSourcePackage.sh index 4317223e1..efddb57d6 100755 --- a/build_scripts/Ubuntu_src/makeSourcePackage.sh +++ b/build_scripts/Ubuntu_src/makeSourcePackage.sh @@ -5,6 +5,7 @@ if test -d "RetroShare" ; then exit fi +echo Getting svn revision number... svnnumber=`svn up | cut -d\ -f3 | cut -d. -f1` version=0.5.0."$svnnumber" packages="." @@ -12,24 +13,29 @@ packages="." echo SVN number is $svnnumber echo version is $version -tar zxvf $packages/BaseRetroShareDirs.tgz +echo Extracting base archive... +tar zxvf $packages/BaseRetroShareDirs.tgz 2> /dev/null +echo Checking out latest snapshot in libretroshare... # Ultimately, use the following, but cd retroshare-0.5/src/libretroshare/ #tar zxvf ../../../libretroshare.tgz -svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/libretroshare/src . +svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/libretroshare/src . 2> /dev/null cd ../../.. # +echo Checking out latest snapshot in retroshare-gui... cd retroshare-0.5/src/retroshare-gui/ -svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/retroshare-gui/src . +svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/retroshare-gui/src . 2> /dev/null #tar zxvf ../../../retroshare-gui.tgz cd ../../.. # +echo Checking out latest snapshot in retroshare-nogui... cd retroshare-0.5/src/retroshare-nogui/ -svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/retroshare-nogui/src . -#tar zxvf ../../../retroshare-gui.tgz +svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare/branches/v0.5.0/retroshare-nogui/src . 2> /dev/null +#tar zxvf ../../../retroshare-nogui.tgz cd ../../.. +echo Setting version numbers... # setup version numbers cat retroshare-0.5/src/libretroshare/util/rsversion.h | grep -v SVN_REVISION > /tmp/toto2342 @@ -42,13 +48,14 @@ cp /tmp/toto4463 retroshare-0.5/src/retroshare-gui/util/rsversion.h # Various cleaning +echo Cleaning... find retroshare-0.5 -name ".svn" -exec rm -rf {} \; # remove all svn repositories mv retroshare-0.5/src/retroshare-gui/RetroShare.pro retroshare-0.5/src/retroshare-gui/retroshare-gui.pro ./cleanProFile.sh retroshare-0.5/src/libretroshare/libretroshare.pro ./cleanProFile.sh retroshare-0.5/src/retroshare-gui/retroshare-gui.pro -./cleanProFile.sh retroshare-0.5/src/retroshare-gui/retroshare-nogui.pro +./cleanProFile.sh retroshare-0.5/src/retroshare-nogui/retroshare-nogui.pro echo "DESTDIR = ../../libretroshare/src/lib/" > /tmp/toto75299 cat retroshare-0.5/src/libretroshare/libretroshare.pro /tmp/toto75299 > /tmp/toto752992 @@ -56,11 +63,13 @@ cp /tmp/toto752992 retroshare-0.5/src/libretroshare/libretroshare.pro #cat retroshare-gui-ext.pro >> retroshare-0.5/src/retroshare-gui/retroshare-gui.pro +echo Building orig directory... mkdir retroshare-0.5.orig cp -r retroshare-0.5/src retroshare-0.5.orig # Call debuild to make the source debian package +echo Calling debuild... cat retroshare-0.5/debian/control | sed -e s/XXXXXX/"$version"/g > retroshare-0.5/debian/control.tmp mv -f retroshare-0.5/debian/control.tmp retroshare-0.5/debian/control