[Fusionforge-commits] r9694 - trunk

Olaf Lenz olenz at libremir.placard.fr.eu.org
Fri May 7 16:07:45 CEST 2010


Author: olenz
Date: 2010-05-07 16:07:44 +0200 (Fri, 07 May 2010)
New Revision: 9694

Modified:
   trunk/Makefile
   trunk/Makefile.debian
Log:
Removed ignoring setup and README.setup from tarball: setup is useful for manual installation!
Added git for package building in debian

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-05-06 20:16:31 UTC (rev 9693)
+++ trunk/Makefile	2010-05-07 14:07:44 UTC (rev 9694)
@@ -47,7 +47,7 @@
 
 buildtar:
 	rm -fr /tmp/$(VERSION)
-	cd gforge; find . -type f -or -type l | grep -v '/.svn/' | grep -v '^./debian' | grep -v '^./deb-specific' | grep -v '^./rpm-specific' | grep -v '^./contrib' | grep -v '^./gforge.spec' | grep -v '^./README.setup' | grep -v '^./setup' | cpio -pdumB --quiet /tmp/$(VERSION)
+	cd gforge; find . -type f -or -type l | grep -v '/.svn/' | grep -v '^./debian' | grep -v '^./deb-specific' | grep -v '^./rpm-specific' | grep -v '^./contrib' | grep -v '^./fusionforge.spec' | cpio -pdumB --quiet /tmp/$(VERSION)
 	cd /tmp/$(VERSION); utils/manage-translations.sh build
 	cd /tmp/; tar jcf $(BUILDRESULT)/$(VERSION).tar.bz2 $(VERSION)
 	rm -fr /tmp/$(VERSION)

Modified: trunk/Makefile.debian
===================================================================
--- trunk/Makefile.debian	2010-05-06 20:16:31 UTC (rev 9693)
+++ trunk/Makefile.debian	2010-05-07 14:07:44 UTC (rev 9694)
@@ -76,13 +76,18 @@
 ifeq ($(strip $(in_svn_repo)),) 
 in_bzr_repo:= $(wildcard .bzr/)
 ifeq ($(strip $(in_bzr_repo)),)
+in_git_repo:= $(wildcard .git/)
+ifeq ($(strip $(in_git_repo)),)
 	svnrev=unknown
 else
+	svnrev=git$(shell git describe --always)
+endif # git
+else
 	svnrev=bzr$(shell bzr revno)
-endif
+endif # bzr
 else
 	svnrev=$(shell LANG=C svn info 2>&1 | grep Revision | cut -d: -f2| sed 's/ //g')
-endif
+endif # svn
 
 MINOR=-1
 MINOR=-$(BRANCH)$(svnrev)+$(XDISTRIB)




More information about the Fusionforge-commits mailing list