[Fusionforge-commits] r8720 - trunk

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sun Feb 7 02:04:33 CET 2010


Author: cbayle
Date: 2010-02-07 02:04:32 +0100 (Sun, 07 Feb 2010)
New Revision: 8720

Modified:
   trunk/Makefile.debian
Log:
Calculate svn version in a bzr branch


Modified: trunk/Makefile.debian
===================================================================
--- trunk/Makefile.debian	2010-02-07 00:00:15 UTC (rev 8719)
+++ trunk/Makefile.debian	2010-02-07 01:04:32 UTC (rev 8720)
@@ -29,8 +29,13 @@
 gfversion=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(\(.*\)-[^-]*).*/\1/')
 in_svn_repo:= $(wildcard .svn/) 
 ifeq ($(strip $(in_svn_repo)),) 
+in_bzr_repo:= $(shell bzr info | grep parent | cut -d: -f2-)
+ifeq ($(strip $(in_bzr_repo)),)
 	svnrev=unknown
 else
+	svnrev=$(shell LANG=C svn info $(in_bzr_repo) | grep Revision | cut -d: -f2| sed 's/ //g')
+endif
+else
 	svnrev=$(shell LANG=C svn info | grep Revision | cut -d: -f2| sed 's/ //g')
 endif
 




More information about the Fusionforge-commits mailing list