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

Christian Bayle cbayle at libremir.placard.fr.eu.org
Wed Apr 28 00:34:20 CEST 2010


Author: cbayle
Date: 2010-04-28 00:34:20 +0200 (Wed, 28 Apr 2010)
New Revision: 9623

Modified:
   trunk/gforge/debian/control
   trunk/gforge/debian/rules
   trunk/gforge/packaging/control/Makefile
Log:
Look for packaging files in plugin tree


Modified: trunk/gforge/debian/control
===================================================================
--- trunk/gforge/debian/control	2010-04-27 22:32:12 UTC (rev 9622)
+++ trunk/gforge/debian/control	2010-04-27 22:34:20 UTC (rev 9623)
@@ -347,18 +347,6 @@
  each FusionForge project to have its own Arch repository, and gives
  some control over it to the project's administrator.
 
-Package: gforge-plugin-mediawiki
-Architecture: all
-Depends: gforge-common (>= 4.8), gforge-db-postgresql (>= 4.8) | gforge-db, gforge-web-apache2 (>= 4.8) | gforge-web, mediawiki (>= 1:1.15~), php5-cli, ${misc:Depends}
-Description: Mediawiki plugin for FusionForge
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin allows each project to embed Mediawiki under a tab.
-
 Package: gforge-plugin-extratabs
 Architecture: all
 Depends: gforge-common (>= 4.6.99), gforge-db-postgresql (>= 4.6.99) | gforge-db, gforge-web-apache2 (>= 4.6.99) | gforge-web, ${misc:Depends}
@@ -412,3 +400,15 @@
  This plugin allows each project to display a list of significant
  contributions, along with their authors.
 
+Package: gforge-plugin-mediawiki
+Architecture: all
+Depends: gforge-common (>= 4.8), gforge-db-postgresql (>= 4.8) | gforge-db, gforge-web-apache2 (>= 4.8) | gforge-web, mediawiki (>= 1:1.15~), php5-cli, ${misc:Depends}
+Description: Mediawiki plugin for FusionForge
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin allows each project to embed Mediawiki under a tab.
+

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-04-27 22:32:12 UTC (rev 9622)
+++ trunk/gforge/debian/rules	2010-04-27 22:34:20 UTC (rev 9623)
@@ -18,18 +18,44 @@
 include /usr/share/dpatch/dpatch.make
 
 CRONDFILES=$(patsubst packaging/cron.d/%,debian/$(OLDPACKAGE)-%.cron.d,$(wildcard packaging/cron.d/[a-z]*))
+PCRONDFILES=$(patsubst %,debian/$(OLDPACKAGE)-%.cron.d,$(word 5,$(subst /, ,$(wildcard plugins/*/packaging/cron.d/[a-z]*)))) 
+
 DIRSFILES=$(patsubst packaging/dirs/%,debian/$(OLDPACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
+PDIRSFILES=$(patsubst %,debian/$(OLDPACKAGE)-%.dirs,$(word 5,$(subst /, ,$(wildcard plugins/*/packaging/dirs/[a-z]*))))
+
 LINKSFILES=$(patsubst packaging/links/%,debian/$(OLDPACKAGE)-%.links,$(wildcard packaging/links/[a-z]*))
+PLINKSFILES=$(patsubst %,debian/$(OLDPACKAGE)-%.links,$(word 5,$(subst /, ,$(wildcard plugins/*/packaging/links/[a-z]*))))
+
 INSTALLFILES=$(patsubst packaging/install/%,debian/$(OLDPACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
+PINSTALLFILES=$(patsubst %,debian/$(OLDPACKAGE)-%.install,$(word 5,$(subst /, ,$(wildcard plugins/*/packaging/install/[a-z]*))))
+
 DOCSFILES=$(patsubst packaging/docs/oldpkgname%,debian/$(OLDPACKAGE)%.docs,$(wildcard packaging/docs/oldpkgname*)) $(patsubst packaging/docs/pkgname%,debian/$(PACKAGE)%.docs,$(wildcard packaging/docs/pkgname*))
+PDOCSFILES=$(patsubst %,debian/$(OLDPACKAGE)-%.docs,$(word 5,$(subst /, ,$(wildcard plugins/*/packaging/docs/[a-z]*))))
+
 POFILES=$(patsubst debian/dsf-po/%,debian/po/%,$(wildcard debian/dsf-po/*) debian/po/POTFILES.in)
 
+testpat:
+	@echo "CRONDFILES=$(CRONDFILES)"
+	@echo "DIRSFILES=$(DIRSFILES)"
+	@echo "LINKSFILES=$(LINKSFILES)"
+	@echo "INSTALLFILES=$(INSTALLFILES)"
+	@echo "DOCSFILES=$(DOCSFILES)"
+	@echo ""
+	@echo "PCRONDFILES=$(PCRONDFILES)"
+	@echo "PDIRSFILES=$(PDIRSFILES)"
+	@echo "PLINKSFILES=$(PLINKSFILES)"
+	@echo "PINSTALLFILES=$(PINSTALLFILES)"
+	@echo "PDOCSFILES=$(PDOCSFILES)"
+
 remove-binary-files:
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
 
 .PHONY: conffiles
 conffiles: $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) debian/control
 
+debian/$(OLDPACKAGE)-plugin-%.cron.d:
+	sed -e 's/\$$FFUSER/$(OLDPACKAGE)/g' $(wildcard plugins/*/packaging/cron.d/plugin-$*) > $@
+
 debian/$(OLDPACKAGE)-%.cron.d:
 	(cat $(CURDIR)/packaging/cron.d/00phpcron ; sed -e 's/\$$FFUSER/$(OLDPACKAGE)/g' $(CURDIR)/packaging/cron.d/$*) > $@
 
@@ -47,8 +73,8 @@
 debian/$(PACKAGE)-%.docs:
 	cp $(CURDIR)/packaging/docs/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_REPLACE) > $@
+debian/control: $(wildcard packaging/control/*) $(wildcard plugins/*/packaging/control/[0-9][0-9][0-9]*) 
+	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* $(CURDIR)/plugins/*/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_REPLACE) > $@
 
 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/Makefile
===================================================================
--- trunk/gforge/packaging/control/Makefile	2010-04-27 22:32:12 UTC (rev 9622)
+++ trunk/gforge/packaging/control/Makefile	2010-04-27 22:34:20 UTC (rev 9623)
@@ -5,5 +5,5 @@
 
 SED_REPLACE=sed -e 's/@PACKAGE@/$(PACKAGE)/g' -e 's/@SRCPACKAGE@/$(SRCPACKAGE)/g' -e 's/@OLDPACKAGE@/$(OLDPACKAGE)/g' -e 's/@FORGENAME@/$(FORGENAME)/g'
 
-../../debian/control: $(wildcard *)
-	ls [0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | $(SED_REPLACE) > $@
+../../debian/control: $(wildcard *) $(wildcard ../../../gforge/plugins/*/packaging/control/*)
+	ls [0-9][0-9][0-9]* ../../../gforge/plugins/*/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 AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | $(SED_REPLACE) > $@




More information about the Fusionforge-commits mailing list