[Fusionforge-commits] r12323 - in trunk/src: debian/dsf-in packaging/install

Christian Bayle cbayle at fusionforge.org
Sat Feb 19 15:51:08 CET 2011


Author: cbayle
Date: 2011-02-19 15:51:07 +0100 (Sat, 19 Feb 2011)
New Revision: 12323

Modified:
   trunk/src/debian/dsf-in/common.postinst
   trunk/src/debian/dsf-in/config.sgml
   trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
   trunk/src/debian/dsf-in/dns-bind9.postinst
   trunk/src/debian/dsf-in/ftp-proftpd.postinst
   trunk/src/debian/dsf-in/lists-mailman.postinst
   trunk/src/debian/dsf-in/mta-exim4.postinst
   trunk/src/debian/dsf-in/mta-postfix.postinst
   trunk/src/debian/dsf-in/shell-postgresql.postinst
   trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
   trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
   trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/src/packaging/install/common
Log:
Remove use of fusionforge-config


Modified: trunk/src/debian/dsf-in/common.postinst
===================================================================
--- trunk/src/debian/dsf-in/common.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/common.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -87,7 +87,6 @@
 	    PATH=$PATH:/usr/share/gforge/bin migrate-to-ini-files.sh
 	fi 
 
-	@PACKAGE at -config
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/src/debian/dsf-in/config.sgml
===================================================================
--- trunk/src/debian/dsf-in/config.sgml	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/config.sgml	2011-02-19 14:51:07 UTC (rev 12323)
@@ -65,6 +65,7 @@
       files derived from standard fill-in-the-blank templates (found
       in /usr/share/@PACKAGE@/templates).  The values used to fill in
       the blanks are taken from /etc/@PACKAGE@/@PACKAGE at .conf.
+      @PACKAGE at -config HAS BEEN REMOVED AND IS NOT ANYMORE REQUIRED
     </para>
 
   </refsect1>

Modified: trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/db-postgresql.postinst.dsfh-in	2011-02-19 14:51:07 UTC (rev 12323)
@@ -56,8 +56,6 @@
     configure)
 	add_onevar_mainconfile default_trove_cat 18
 
-	@PACKAGE at -config
-
         # Patch DB configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure-files
 	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf

Modified: trunk/src/debian/dsf-in/dns-bind9.postinst
===================================================================
--- trunk/src/debian/dsf-in/dns-bind9.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/dns-bind9.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-	@PACKAGE at -config
-
 	# Patch Bind configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-dns.sh configure-files
 	ucf --debconf-ok /etc/bind/named.conf. at OLDPACKAGE@-new /etc/bind/named.conf

Modified: trunk/src/debian/dsf-in/ftp-proftpd.postinst
===================================================================
--- trunk/src/debian/dsf-in/ftp-proftpd.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/ftp-proftpd.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-	@PACKAGE at -config
-
         # Patch Proftpd configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-ftp.sh configure-files
 	if [ -f /etc/proftpd/proftpd.conf. at OLDPACKAGE@-new ]

Modified: trunk/src/debian/dsf-in/lists-mailman.postinst
===================================================================
--- trunk/src/debian/dsf-in/lists-mailman.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/lists-mailman.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-	@PACKAGE at -config
-	
 	echo "Fixing past damage in mailing-lists..."
 	if [ -z "$2" ] || dpkg --compare-versions $2 le 3rc2-4 ; then
 	    /usr/share/@OLDPACKAGE@/bin/fix-mailing-lists.pl

Modified: trunk/src/debian/dsf-in/mta-exim4.postinst
===================================================================
--- trunk/src/debian/dsf-in/mta-exim4.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/mta-exim4.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-
-	@PACKAGE at -config
         # Patch Exim configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-exim4.sh configure-files
 	if [ -f /etc/aliases. at OLDPACKAGE@-new ]

Modified: trunk/src/debian/dsf-in/mta-postfix.postinst
===================================================================
--- trunk/src/debian/dsf-in/mta-postfix.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/mta-postfix.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-	@PACKAGE at -config
-
         # Patch Postfix configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-postfix.sh configure-files
 	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases

Modified: trunk/src/debian/dsf-in/shell-postgresql.postinst
===================================================================
--- trunk/src/debian/dsf-in/shell-postgresql.postinst	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/shell-postgresql.postinst	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-	@PACKAGE at -config
-
         # Patch NSS configuration files
 	/usr/share/@OLDPACKAGE@/bin/install-nsspgsql.sh configure-files
 	ucf --debconf-ok /etc/nss-pgsql.conf. at OLDPACKAGE@-new /etc/nss-pgsql.conf

Modified: trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postinst.dsfh-in	2011-02-19 14:51:07 UTC (rev 12323)
@@ -27,8 +27,6 @@
 
 case "$1" in
     configure)
-        @PACKAGE at -config
-
 	db_stop
         # Setup our Apache
 	touch /var/lib/@OLDPACKAGE@/etc/templates/httpd.vhosts  && \

Modified: trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/web-apache2-vhosts.postrm.dsfh-in	2011-02-19 14:51:07 UTC (rev 12323)
@@ -18,7 +18,6 @@
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	@PACKAGE at -config
         # Make Apache see these new changes
 	invoke-rc.d apache2 reload || true
 	;;

Modified: trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/debian/dsf-in/web-apache2.postinst.dsfh-in	2011-02-19 14:51:07 UTC (rev 12323)
@@ -51,8 +51,6 @@
 	    ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/@OLDPACKAGE@/ssl-cert.key
 	fi
 	
-        #fusionforge-config
-
 	for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
 	    if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
 		cp /usr/share/gforge/etc/httpd.conf.d-fhs/$i /etc/gforge/httpd.conf.d/$i

Modified: trunk/src/packaging/install/common
===================================================================
--- trunk/src/packaging/install/common	2011-02-19 14:38:01 UTC (rev 12322)
+++ trunk/src/packaging/install/common	2011-02-19 14:51:07 UTC (rev 12323)
@@ -6,7 +6,6 @@
 deb-specific/install-chroot.sh         usr/share/@OLDPACKAGE@/bin/
 deb-specific/install-ssh.sh            usr/share/@OLDPACKAGE@/bin/
 utils/fill-in-the-blanks.pl            usr/share/@OLDPACKAGE@/bin/
-deb-specific/@PACKAGE at -config          usr/sbin/
 utils/include.pl                       usr/share/@OLDPACKAGE@/lib/
 utils/forge_get_config                 usr/share/@OLDPACKAGE@/bin/
 utils/migrate-to-ini-files.sh	       usr/share/@OLDPACKAGE@/bin/




More information about the Fusionforge-commits mailing list