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

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


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

Modified:
   trunk/
   trunk/gforge/debian/rules
Log:
Merged from 4.8: Re-added common part to crontabs


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,7568,7570-7571

   + /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,7573


Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2009-05-04 19:47:41 UTC (rev 7573)
+++ trunk/gforge/debian/rules	2009-05-04 19:57:06 UTC (rev 7574)
@@ -33,7 +33,7 @@
 
 debian/$(PACKAGE)-%.cron.d:
 	@echo "Creating $@"
-	sed -e 's/\$$FFUSER/gforge/g' $(CURDIR)/packaging/cron.d/$* > $@
+	(cat $(CURDIR)/packaging/cron.d/00phpcron ; sed -e 's/\$$FFUSER/gforge/g' $(CURDIR)/packaging/cron.d/$*) > $@
 
 debian/$(PACKAGE)-%.dirs:
 	@echo "Creating $@"




More information about the Fusionforge-commits mailing list