[Fusionforge-commits] r7572 - in trunk: . gforge/debian

Roland Mas lolando at libremir.placard.fr.eu.org
Mon May 4 21:35:57 CEST 2009


Author: lolando
Date: 2009-05-04 21:35:57 +0200 (Mon, 04 May 2009)
New Revision: 7572

Modified:
   trunk/
   trunk/gforge/debian/changelog
   trunk/gforge/debian/rules
Log:
Merged from 4.8: syntax fix for -db-postgresql crontab, some debian/rules cleanup


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560,7568,7570-7571


Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-05-04 19:22:15 UTC (rev 7571)
+++ trunk/gforge/debian/changelog	2009-05-04 19:35:57 UTC (rev 7572)
@@ -17,8 +17,10 @@
   * New upstream snapshot.
   * install-chroot.sh: do not fail if device nodes can't be created (such
     as when operating in a vserver).
+  * Fixed crontab syntax for -db-postgresql (cron doesn't interpolate the
+    user column itself).
 
- -- Roland Mas <lolando at debian.org>  Mon, 04 May 2009 15:05:23 +0200
+ -- Roland Mas <lolando at debian.org>  Mon, 04 May 2009 21:08:26 +0200
 
 gforge (4.8~rc1-1) experimental; urgency=low
 

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2009-05-04 19:22:15 UTC (rev 7571)
+++ trunk/gforge/debian/rules	2009-05-04 19:35:57 UTC (rev 7572)
@@ -2,7 +2,8 @@
 # debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess (sample file)
 # Copyright 2000 to 2002 by Roland Mas and Christian Bayle for the Sourceforge package
-# Copyright 2002 to 2003 by Roland Mas and Christian Bayle for the Gforge package
+# Copyright 2002 to 2008 by Roland Mas and Christian Bayle for the Gforge package
+# Copyright 2008 to 2009 by Roland Mas and Christian Bayle for the FusionForge package
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -10,8 +11,7 @@
 PACKAGE=gforge
 include /usr/share/dpatch/dpatch.make
 
-# This one should be declared like other when it will be unified with rpm
-CRONFILESLIST=debian/$(PACKAGE)-lists-mailman.cron.d debian/$(PACKAGE)-web-apache2.cron.d debian/$(PACKAGE)-db-postgresql.cron.d debian/$(PACKAGE)-dns-bind9.cron.d debian/$(PACKAGE)-plugin-scmcvs.cron.d debian/$(PACKAGE)-ftp-proftpd.cron.d debian/$(PACKAGE)-shell-postgresql.cron.d debian/$(PACKAGE)-plugin-scmsvn.cron.d
+CRONFILESLIST=$(patsubst packaging/cron.d/%,debian/$(PACKAGE)-%.cron.d,$(wildcard packaging/cron.d/[a-z]*))
 DIRSFILESLIST=$(patsubst packaging/dirs/%,debian/$(PACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
 INSTALLFILESLIST=$(patsubst packaging/install/%,debian/$(PACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
 
@@ -21,10 +21,6 @@
 	@echo $(INSTALLFILESLIST)
 
 remove-binary-files:
-	# Remove files in contrib, especially binaries that break dpkg-source
-#	find contrib/ -name CVS -prune -not -name CVS -or -type f | xargs rm -f
-	# Also a few images
-#	rm -f www/themes/gforge/images/es_*
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
 
 cronfiles: $(CRONFILESLIST)
@@ -37,13 +33,7 @@
 
 debian/$(PACKAGE)-%.cron.d:
 	@echo "Creating $@"
-	@if [ "$@" = "debian/$(PACKAGE)-db-postgresql.cron.d" ] ; then \
-	cat $(CURDIR)/packaging/cron.d/00phpcron > $@ ; \
-	cat $(CURDIR)/packaging/cron.d/db-postgresql >> $@ ; \
-	else \
-		echo "copy $(CURDIR)/packaging/cron.d/$* to $@" ; \
-		cp $(CURDIR)/packaging/cron.d/$* $@ ; \
-	fi
+	sed -e 's/\$$FFUSER/gforge/g' $(CURDIR)/packaging/cron.d/$* > $@
 
 debian/$(PACKAGE)-%.dirs:
 	@echo "Creating $@"




More information about the Fusionforge-commits mailing list