[Fusionforge-commits] r7570 - branches/Branch_4_8/gforge/debian

[Roland Mas]

Author: lolando
Date: 2009-05-04 21:11:56 +0200 (Mon, 04 May 2009)
New Revision: 7570

Modified:
   branches/Branch_4_8/gforge/debian/changelog
   branches/Branch_4_8/gforge/debian/rules
Log:
Fixed crontab syntax for -db-postgresql

Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2009-05-04 16:39:15 UTC (rev 7569)
+++ branches/Branch_4_8/gforge/debian/changelog	2009-05-04 19:11:56 UTC (rev 7570)
@@ -3,8 +3,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: branches/Branch_4_8/gforge/debian/rules
===================================================================
--- branches/Branch_4_8/gforge/debian/rules	2009-05-04 16:39:15 UTC (rev 7569)
+++ branches/Branch_4_8/gforge/debian/rules	2009-05-04 19:11:56 UTC (rev 7570)
@@ -36,14 +36,7 @@
 conffiles: cronfiles dirsfiles installfiles
 
 debian/$(PACKAGE)-%.cron.d:
-	@echo "Creating $@"
-	@if [ "$@" = "debian/$(PACKAGE)-db-postgresql.cron.d" ] ; then \
-	cat $(CURDIR)/cron.d/00phpcron > $@ ; \
-	cat $(CURDIR)/cron.d/db-postgresql >> $@ ; \
-	else \
-		echo "copy $(CURDIR)/cron.d/$* to $@" ; \
-		cp $(CURDIR)/cron.d/$* $@ ; \
-	fi
+	sed -e 's/\$$FFUSER/gforge/g' $(CURDIR)/cron.d/$* > $@
 
 debian/$(PACKAGE)-%.dirs:
 	@echo "Creating $@"