r7454 - packages/trunk/freecol/debian

[Vincent Fourmond]

Author: fourmond
Date: 2008-06-22 07:40:53 +0000 (Sun, 22 Jun 2008)
New Revision: 7454

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/new-upstream
   packages/trunk/freecol/debian/watch
Log:
[freecol] New upstream release

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-06-22 01:34:07 UTC (rev 7453)
+++ packages/trunk/freecol/debian/changelog	2008-06-22 07:40:53 UTC (rev 7454)
@@ -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
 

Modified: packages/trunk/freecol/debian/new-upstream
===================================================================
--- packages/trunk/freecol/debian/new-upstream	2008-06-22 01:34:07 UTC (rev 7453)
+++ packages/trunk/freecol/debian/new-upstream	2008-06-22 07:40:53 UTC (rev 7454)
@@ -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 @@
 
 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 @@
 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

Modified: packages/trunk/freecol/debian/watch
===================================================================
--- packages/trunk/freecol/debian/watch	2008-06-22 01:34:07 UTC (rev 7453)
+++ packages/trunk/freecol/debian/watch	2008-06-22 07:40:53 UTC (rev 7454)
@@ -4,4 +4,5 @@
 # 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