summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-06-13 10:23:57 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-06-13 10:25:51 (GMT)
commit7359f1a67ef1eeb8511a44019fd723102380c2cf (patch)
tree2d321de5e4f41f782d350c26cc6f61c7c59de5bb /Swift/Packaging/Debian
parentff8c40a4e5a5c50572449d52754639b870dc5981 (diff)
downloadswift-contrib-7359f1a67ef1eeb8511a44019fd723102380c2cf.zip
swift-contrib-7359f1a67ef1eeb8511a44019fd723102380c2cf.tar.bz2
Fix Debian versioning to be strictly increasing.
Diffstat (limited to 'Swift/Packaging/Debian')
-rw-r--r--Swift/Packaging/Debian/debian/changelog4
-rwxr-xr-xSwift/Packaging/Debian/package.sh7
2 files changed, 6 insertions, 5 deletions
diff --git a/Swift/Packaging/Debian/debian/changelog b/Swift/Packaging/Debian/debian/changelog
index 86ee38d..ef172f0 100644
--- a/Swift/Packaging/Debian/debian/changelog
+++ b/Swift/Packaging/Debian/debian/changelog
@@ -1,10 +1,10 @@
-swift (1.0beta2-1) unstable; urgency=low
+swift (1.0~beta2-1) unstable; urgency=low
* Upstream release
-- Remko Tronçon <dev@el-tramo.be> Sat, 26 Sep 2009 11:08:32 +0200
-swift (1.0beta1-1) unstable; urgency=low
+swift (1.0~beta1-1) unstable; urgency=low
* Upstream release
diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh
index 9c9dae1..e6f401f 100755
--- a/Swift/Packaging/Debian/package.sh
+++ b/Swift/Packaging/Debian/package.sh
@@ -2,9 +2,10 @@
export PYTHONPATH=../../../BuildTools/SCons
VERSION=`../../../BuildTools/GetBuildVersion.py swift`
-DIRNAME=swift-$VERSION
+DEBIAN_VERSION=`../../../BuildTools/DebianizeVersion.py $VERSION`
+DIRNAME=swift-$DEBIAN_VERSION
-if [ -z "$VERSION" ]; then
+if [ -z "$DEBIAN_VERSION" ]; then
echo "Unable to determine version"
exit -1
fi
@@ -16,7 +17,7 @@ echo "Checking out a fresh copy ..."
rm -rf $DIRNAME
git clone ../../../.git $DIRNAME
ln -s Swift/Packaging/Debian/debian $DIRNAME/debian
-../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $VERSION
+../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION
echo "Building ..."
cd $DIRNAME