From 5f2ab0cb7f309313732fe347c5af0be4b1680970 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Sun, 7 Feb 2010 17:00:24 +0000 Subject: [PATCH] Renamed source package to fusionforge --- Makefile.debian | 25 +++++++++++++------------ gforge/debian/changelog | 8 +++++++- gforge/debian/rules | 3 ++- gforge/packaging/control/000source | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Makefile.debian b/Makefile.debian index b3554da267..7e9ef35823 100644 --- a/Makefile.debian +++ b/Makefile.debian @@ -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 @@ UBULIST=$(UBUNTULIST) $(UBUNTULISTP) 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 @@ orig: $(TARBALLS)/$(ORIGFILE) # Make FUSIONFORGE orig file # # 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 @@ $(BUILDRESULT)/$(PCHANGEFILE): $(BUILDFILES)/$(PDSCFILE) $(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 @@ $(BUILDFILES)/$(DSCFILE): $(BUILDFILES)/$(ORIGFILE) 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 @@ $(BUILDFILES)/$(ORIGFILE): $(TARBALLS)/$(ORIGFILE) 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)" diff --git a/gforge/debian/changelog b/gforge/debian/changelog index cd39e0b4f6..f15fbe346b 100644 --- a/gforge/debian/changelog +++ b/gforge/debian/changelog @@ -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 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 diff --git a/gforge/debian/rules b/gforge/debian/rules index 26b0304377..2a5b76fb56 100755 --- a/gforge/debian/rules +++ b/gforge/debian/rules @@ -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 @@ debian/%.docs: 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 diff --git a/gforge/packaging/control/000source b/gforge/packaging/control/000source index 3ef52f1b8c..7f06a097be 100644 --- a/gforge/packaging/control/000source +++ b/gforge/packaging/control/000source @@ -1,4 +1,4 @@ -Source: @PACKAGE@ +Source: @SRCPACKAGE@ Section: devel Priority: optional Maintainer: Roland Mas -- 2.30.2