[freecol] 30/125: [freecol] New upstream release

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 7f0d2e34b3c192aa4640d5432ca51d025db2c172
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Jun 22 07:40:53 2008 +0000

    [freecol] New upstream release
---
 debian/changelog    | 10 +++++++---
 debian/new-upstream | 12 ++++++++----
 debian/watch        |  1 +
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2eacf44..0537deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-freecol (0.7.3-5) UNRELEASED; urgency=low
+freecol (0.7.4.dfsg-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Finally add a .dfsg suffix to the version number, to reflect the
+    fact that the upstream tarball is repackaged (since this time I 
+    had forgotten that ;-)...).
+  * Update debian/new-upstream and debian/watch accordingly
 
- -- Vincent Fourmond <fourmond at debian.org>  Fri, 16 May 2008 20:34:38 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 22 Jun 2008 09:21:57 +0200
 
 freecol (0.7.3-4) unstable; urgency=low
 
diff --git a/debian/new-upstream b/debian/new-upstream
index bf3c4c4..bf16cdb 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -14,6 +14,9 @@
 # Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
 #
 
+# If called manually, this file must be called from within the freecol/
+# directory.
+
 version=$2
 filename=$3
 
@@ -21,7 +24,7 @@ dir=`mktemp -d`
 
 curdir=`pwd`
 
-origname=freecol_$version.orig.tar.gz
+origname=freecol_$version".dfsg".orig.tar.gz
 
 echo "Repackaging freecol version $version from $filename"
 echo $filename
@@ -38,8 +41,9 @@ tar xvzf $curdir/$filename
 cd $dir/freecol*
 patch -p0 < $curdir/debian/freecol-dist-targz.diff
 echo $version | ant tarDistBundle
-rm $curdir/$filename
-echo "Moving back dist/freecol-$version-dist-src.tar.gz to $curdir/$origname"
-mv dist/freecol-$version-dist-src.tar.gz $curdir/$origname
+# Do not remove the original file !!!
+# rm $curdir/$filename
+echo "Moving back dist/freecol-$version-dist-src.tar.gz to $curdir/../$origname"
+mv dist/freecol-$version-dist-src.tar.gz $curdir/../$origname
 cd -
 rm -rf $dir
diff --git a/debian/watch b/debian/watch
index b280783..4d52b66 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,5 @@ version=3
 # Don't forget to look into debian/copyright first before packaging
 # a new upstream version !!! The watchfile works, but the downloaded
 # archive should not go to debian - you need to repackage it.
+opts=dversionmangle=s/\.dfsg// \
 http://sf.net/freecol/freecol-(.*)-src\.tar\.gz debian debian/new-upstream 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git