[Fusionforge-commits] r10040 - in trunk/gforge: debian packaging/install

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jun 16 17:24:48 CEST 2010


Author: lolando
Date: 2010-06-16 17:24:48 +0200 (Wed, 16 Jun 2010)
New Revision: 10040

Modified:
   trunk/gforge/debian/rules
   trunk/gforge/packaging/install/web-apache2
Log:
Ship generated Apache config files (not used yet)

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-06-16 15:24:30 UTC (rev 10039)
+++ trunk/gforge/debian/rules	2010-06-16 15:24:48 UTC (rev 10040)
@@ -114,6 +114,9 @@
 # Build gettext *.mo files
 	utils/manage-translations.sh build
 
+# Build FHS-compatible Apache config files
+	utils/manage-apache-config.sh
+
 # Preprocess files with DSF-Helper
 	perl $(CURDIR)/deb-specific/dsf-helper.pl
 
@@ -154,8 +157,9 @@
 	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scm*/usr/share/*/plugins/scm*/*/README
 	chmod 755 $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scmcvs/usr/share/*/plugins/scmcvs/sbin/*
 
-# Rename config file
+# Rename config files
 	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/fusionforge/config.ini
+	mv $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf.d-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/gforge/httpd.conf.d
 
 # Remove Windows files
 	rm -rf $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/windows

Modified: trunk/gforge/packaging/install/web-apache2
===================================================================
--- trunk/gforge/packaging/install/web-apache2	2010-06-16 15:24:30 UTC (rev 10039)
+++ trunk/gforge/packaging/install/web-apache2	2010-06-16 15:24:48 UTC (rev 10040)
@@ -1,3 +1,4 @@
 www                                 usr/share/gforge/
 www/index_std.php                   etc/gforge/custom/
 utils/install-apache.sh             usr/share/gforge/bin/
+etc/httpd.conf.d-fhs		    etc/gforge/




More information about the Fusionforge-commits mailing list