summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 15:57:50 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 15:57:50 (GMT)
commited0dbffeb8a3b36965d359c8a689bdb41372e481 (patch)
treed0fd5ff47f95516346832c08c4511740817b762c /Swift/Packaging/Debian/package.sh
parentc20ecae7c569befc8c970f839ce9e14410c118fb (diff)
parente45f1cc4ef85ea32b8307f25d22737906a87672c (diff)
downloadswift-ed0dbffeb8a3b36965d359c8a689bdb41372e481.zip
swift-ed0dbffeb8a3b36965d359c8a689bdb41372e481.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: More Debian packaging tweaks.
Diffstat (limited to 'Swift/Packaging/Debian/package.sh')
-rwxr-xr-xSwift/Packaging/Debian/package.sh21
1 files changed, 15 insertions, 6 deletions
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index f9d809a..c395d25 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -21,21 +21,30 @@ rm -rf swift-im-*
echo "Checking out a fresh copy ..."
rm -rf $DIRNAME
git clone ../../../.git $DIRNAME
-find $DIRNAME/3rdParty/Boost/src -type f | grep -v uuid | xargs rm -f
-find $DIRNAME/3rdParty/SCons -delete
-find $DIRNAME/3rdParty/DocBook -delete
+
+# Clean out 3rdParty
+find $DIRNAME/3rdParty -type f | grep -v uuid | grep -v SConscript | xargs rm -f
+find $DIRNAME/3rdParty -depth -empty -type d -exec rmdir {} \;
+rm -rf $DIRNAME/3rdParty/SCons
+
+# Fork local Boost UUID copy
# FIXME: This shouldn't be necessary, but SCons isn't picking up the generated headers for compilation
mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost
cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost
+# Create orig tarball for debuild
+tar czf swift-im_$DEBIAN_VERSION.orig.tar.gz --exclude=$DIRNAME/.git $DIRNAME
+
+# Initialize debian files
ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
cat $DIRNAME/debian/control.in | sed -e "s/%SWIFTEN_SOVERSION%/$SWIFTEN_SOVERSION/g" > $DIRNAME/debian/control
mv $DIRNAME/debian/libswiften.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION.install
mv $DIRNAME/debian/libswiften-dev.install $DIRNAME/debian/libswiften$SWIFTEN_SOVERSION-dev.install
-echo "Building ..."
+# Build
cd $DIRNAME
set +e
-dpkg-buildpackage -S -rfakeroot -i -I
-dpkg-buildpackage -b -rfakeroot -i -I
+debuild -i -I
+#dpkg-buildpackage -S -rfakeroot -i -I
+#dpkg-buildpackage -b -rfakeroot -i -I