[Fusionforge-commits] r8761 - in branches/Branch_4_8: . gforge/debian

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Feb 9 19:40:02 CET 2010


Author: lolando
Date: 2010-02-09 19:40:01 +0100 (Tue, 09 Feb 2010)
New Revision: 8761

Modified:
   branches/Branch_4_8/Makefile.debian
   branches/Branch_4_8/gforge/debian/changelog
Log:
Backported from trunk: Fixed version detection when generating orig.tar.gz

Modified: branches/Branch_4_8/Makefile.debian
===================================================================
--- branches/Branch_4_8/Makefile.debian	2010-02-09 18:32:59 UTC (rev 8760)
+++ branches/Branch_4_8/Makefile.debian	2010-02-09 18:40:01 UTC (rev 8761)
@@ -24,8 +24,7 @@
 # Try if a local mirror is available
 UBUNTUOP=$(shell wget -q -S http://localhost/ubuntu -O /dev/null && echo "--mirror http://localhost/ubuntu" || echo "--mirror http://archive.ubuntu.com/ubuntu") --debootstrap debootstrap
 
-gfversion=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(\(.[^+-]*\).*).*/\1/')
-gfminor=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(.[^+-]*[+-]\(.*\)).*/\1/')
+gfversion=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(\(.*\)-[^-]*).*/\1/')
 svnrev=$(shell LANG=C svn info | grep Revision | cut -d: -f2| sed 's/ //g')
 
 

Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2010-02-09 18:32:59 UTC (rev 8760)
+++ branches/Branch_4_8/gforge/debian/changelog	2010-02-09 18:40:01 UTC (rev 8761)
@@ -1,9 +1,9 @@
-gforge (4.8.2+svn8760-1) unstable; urgency=low
+gforge (4.8.2+svn8761-1) unstable; urgency=low
 
   * New upstream snapshot from the 4.8 branch.
   * Includes fix for Docman bug (closes: #550318).
 
- -- Roland Mas <lolando at debian.org>  Tue, 09 Feb 2010 19:30:57 +0100
+ -- Roland Mas <lolando at debian.org>  Tue, 09 Feb 2010 19:38:52 +0100
 
 gforge (4.8.2-2) unstable; urgency=low
 




More information about the Fusionforge-commits mailing list