[Fusionforge-commits] r8730 - in trunk: . gforge/debian gforge/packaging/control

Roland Mas lolando at libremir.placard.fr.eu.org
Sun Feb 7 18:00:25 CET 2010


Author: lolando
Date: 2010-02-07 18:00:24 +0100 (Sun, 07 Feb 2010)
New Revision: 8730

Modified:
   trunk/Makefile.debian
   trunk/gforge/debian/changelog
   trunk/gforge/debian/rules
   trunk/gforge/packaging/control/000source
Log:
Renamed source package to fusionforge

Modified: trunk/Makefile.debian
===================================================================
--- trunk/Makefile.debian	2010-02-07 15:28:26 UTC (rev 8729)
+++ trunk/Makefile.debian	2010-02-07 17:00:24 UTC (rev 8730)
@@ -1,7 +1,8 @@
 #! /usr/bin/make -f
 
 FUSIONFORGE=FusionForge
-PKGNAME=gforge
+PKGDIR=gforge
+PKGNAME=$(shell head -1 $(PKGDIR)/debian/changelog | sed 's/ .*//')
 PKGLETTER=$(shell echo $(PKGNAME) | cut -c1)
 ORIGIN=debian.fusionforge.org
 BRANCH=$(shell [ "$(shell echo $(basename $(CURDIR)) | sed 's/.*runk.*/trunk/')" = "trunk" ] && echo svn || echo brc)
@@ -26,7 +27,7 @@
 LOCALMIRROR=http://localhost/ubuntu
 UBUNTUOP=$(shell wget -q -S http://localhost/ubuntu -O /dev/null && echo "--mirror $(LOCALMIRROR)" || echo "--mirror http://archive.ubuntu.com/ubuntu") --debootstrap debootstrap
 
-gfversion=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(\(.*\)-[^-]*).*/\1/')
+gfversion=$(shell head -1 $(PKGDIR)/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-)
@@ -134,16 +135,16 @@
 #
 # PHPDOCUMENTOR
 #
-phpdoc: phpdocumentor_get phpdocumentor_unpack $(documentor_path)/$(documentor_vers)/patched $(PKGNAME)/docs/phpdoc/docs # Get phpdocumentor, install phpdocumentor, build $(PKGNAME) phpdoc     #
+phpdoc: phpdocumentor_get phpdocumentor_unpack $(documentor_path)/$(documentor_vers)/patched $(PKGDIR)/docs/phpdoc/docs # Get phpdocumentor, install phpdocumentor, build $(PKGNAME) phpdoc     #
 
 phpdocumentor_get:
 	[ ! -f $(documentor_path)/$(documentor_vers).tar.gz ] && cd $(documentor_path) && wget http://heanet.dl.sourceforge.net/sourceforge/phpdocu/$(documentor_vers).tar.gz || true
 phpdocumentor_unpack:
 	[ ! -d $(documentor_path)/$(documentor_vers) ] && cd $(documentor_path) && tar xvzf $(documentor_vers).tar.gz || true
 $(documentor_path)/$(documentor_vers)/patched:
-	cd $(documentor_path)/ && patch -p2 < $(CURDIR)/$(PKGNAME)/docs/phpdoc/manageclass.patch && touch $(documentor_path)/$(documentor_vers)/patched 
-$(PKGNAME)/docs/phpdoc/docs:
-	cd $(PKGNAME)/docs/phpdoc/ && ./makedoc.sh
+	cd $(documentor_path)/ && patch -p2 < $(CURDIR)/$(PKGDIR)/docs/phpdoc/manageclass.patch && touch $(documentor_path)/$(documentor_vers)/patched 
+$(PKGDIR)/docs/phpdoc/docs:
+	cd $(PKGDIR)/docs/phpdoc/ && ./makedoc.sh
 
 #
 # Build with cowbuilder or pbuilder
@@ -199,8 +200,8 @@
 	$(PBUILDERCMD)
 
 $(BUILDFILES)/$(DSCFILE): $(BUILDFILES)/$(ORIGFILE)
-	cd $(PKGNAME) ; debclean
-	find $(PKGNAME) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -pdumB $(BUILDFILES)/
+	cd $(PKGDIR) ; debclean
+	find $(PKGDIR) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -pdumB $(BUILDFILES)/
 	# Set version for given distrib
 	cd $(BUILDFILES)/$(PKGNAME); dch -b -v $(gfversion)$(MINOR) -D UNRELEASED "This is $(DISTRIB) autobuild"
 	perl -pi -e "s/UNRELEASED/$(DISTRIB)/" $(BUILDFILES)/$(PKGNAME)/debian/changelog
@@ -208,8 +209,8 @@
 	rm -rf $(BUILDFILES)/$(PKGNAME)
 
 $(BUILDFILES)/$(PDSCFILE): $(BUILDFILES)/$(ORIGFILE)
-	cd $(PKGNAME) ; debclean
-	find $(PKGNAME) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -pdumB $(BUILDFILES)/
+	cd $(PKGDIR) ; debclean
+	find $(PKGDIR) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -pdumB $(BUILDFILES)/
 	# Set version for given distrib
 	cd $(BUILDFILES)/$(PKGNAME); dch -b -v $(gfversion)$(MINOR)+p -D UNRELEASED "This is $(DISTRIB) autobuild"
 	perl -pi -e "s/UNRELEASED/$(DISTRIB)/" $(BUILDFILES)/$(PKGNAME)/debian/changelog
@@ -220,8 +221,8 @@
 	cp $(TARBALLS)/$(ORIGFILE) $(BUILDFILES)
 
 $(TARBALLS)/$(ORIGFILE): $(TARBALLS)
-	cd $(PKGNAME) ; debclean
-	find $(PKGNAME) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -o -H ustar | gzip > $(TARBALLS)/$(ORIGFILE)
+	cd $(PKGDIR) ; debclean
+	find $(PKGDIR) -type f -or -type l | grep -v '/CVS/' | grep -v '/.svn/' | grep -v '/.testbox/' | grep -v rpm-specific | grep -v docs/phpdoc/docs | grep -v ^./debian/ | cpio -o -H ustar | gzip > $(TARBALLS)/$(ORIGFILE)
 
 pbuilderenv: $(PBUILDERTGZ) $(PBUILDERTGZ)/base-$(DISTRIB).tgz
 	@echo "Ready for $(DISTRIB)"

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2010-02-07 15:28:26 UTC (rev 8729)
+++ trunk/gforge/debian/changelog	2010-02-07 17:00:24 UTC (rev 8730)
@@ -1,4 +1,10 @@
-gforge (4.8.58-1) experimental; urgency=low
+fusionforge (4.8.55-2) experimental; urgency=low
+
+  * Renamed source package.
+
+ -- Roland Mas <lolando at debian.org>  Sun, 07 Feb 2010 16:21:15 +0100
+
+gforge (4.8.55-1) experimental; urgency=low
   
   [ Christian Bayle ]
   * put debian postinst/prerm/config/.. files in dsf-in dir

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-02-07 15:28:26 UTC (rev 8729)
+++ trunk/gforge/debian/rules	2010-02-07 17:00:24 UTC (rev 8730)
@@ -6,6 +6,7 @@
 # Copyright 2008 to 2009 by Roland Mas and Christian Bayle for the FusionForge package
 
 PACKAGE=gforge
+SRCPACKAGE=fusionforge
 FORGENAME=FusionForge
 
 default:
@@ -38,7 +39,7 @@
 	cp $(CURDIR)/packaging/docs/$(patsubst $(PACKAGE)%,pkgname%,$*) $@
 
 debian/control: $(wildcard packaging/control/*)
-	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | sed 's/@PACKAGE@/$(PACKAGE)/g' > $@
+	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | sed -e 's/@PACKAGE@/$(PACKAGE)/g' -e 's/@SRCPACKAGE@/$(SRCPACKAGE)/g' > $@
 
 debian/po/templates.pot: $(wildcard debian/dsf-in/*.templates.dsfh-in) $(wildcard debian/dsf-helper/*.templates)
 	@debconf-updatepo --podir=debian/dsf-po

Modified: trunk/gforge/packaging/control/000source
===================================================================
--- trunk/gforge/packaging/control/000source	2010-02-07 15:28:26 UTC (rev 8729)
+++ trunk/gforge/packaging/control/000source	2010-02-07 17:00:24 UTC (rev 8730)
@@ -1,4 +1,4 @@
-Source: @PACKAGE@
+Source: @SRCPACKAGE@
 Section: devel
 Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>




More information about the Fusionforge-commits mailing list