[evolvis-commits] r12264: Switching to ucf for management of config files

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:32:07 CET 2011


Author: mirabilos
Date: 2011-02-28 01:32:07 +0100 (Mon, 28 Feb 2011)
New Revision: 12264

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-nsspgsql.sh
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.config
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.postinst
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.prerm
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.config.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.prerm.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
Log:
Switching to ucf for management of config files

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-nsspgsql.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-nsspgsql.sh	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/deb-specific/install-nsspgsql.sh	2011-02-28 00:32:07 UTC (rev 12264)
@@ -85,9 +85,7 @@
 
 # Purge /etc/nss-pgsql.conf
 purge_libnss_pgsql(){
-    cp -a /etc/nss-pgsql.conf /etc/nss-pgsql.conf.gforge-new
-    perl -pi -e "s/^# Next line added by GForge install\n/#SF#/g" /etc/nss-pgsql.conf.gforge-new
-    perl -pi -e "s/^#SF#.*\n//g" /etc/nss-pgsql.conf.gforge-new
+    echo -n > /etc/nss-pgsql.conf.gforge-new
 }
 
 # Modify /etc/nsswitch.conf

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 00:32:07 UTC (rev 12264)
@@ -8,8 +8,10 @@
   * Use Unix domain sockets for NSS-pgsql too.
   * gforge-shell-postgresql now depends on libnss-pgsql2 rather than the
     old libnss-pgsql1.
+  * Switch to using ucf for management of config files, instead of
+    home-grown scripts and functions.
 
- -- Roland Mas <lolando at debian.org>  Sat, 01 Dec 2007 19:58:12 +0100
+ -- Roland Mas <lolando at debian.org>  Sat, 01 Dec 2007 20:26:43 +0100
 
 gforge (4.6.99+svn6225-1) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/control	2011-02-28 00:32:07 UTC (rev 12264)
@@ -12,7 +12,7 @@
 Package: gforge
 Architecture: all
 Conflicts: sourceforge, gforge-cvs, gforge-common (<< ${source:Version})
-Depends: debconf (>= 1.0.32) | debconf-2.0, gforge-common (=${source:Version}), gforge-web-apache2 | gforge-web, gforge-db, gforge-mta-exim4 | gforge-mta, gforge-shell-postgresql | gforge-shell, gforge-ftp, gforge-lists
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, gforge-common (=${source:Version}), gforge-web-apache2 | gforge-web, gforge-db, gforge-mta-exim4 | gforge-mta, gforge-shell-postgresql | gforge-shell, gforge-ftp, gforge-lists
 Recommends: gforge-plugin-scm
 Description: collaborative development tool - meta-package
  GForge provides many tools to aid collaboration in a
@@ -25,7 +25,7 @@
 
 Package: gforge-common
 Architecture: all
-Depends: debconf (>= 1.0.32) | debconf-2.0, cpio, lockfile-progs, adduser, php5-cli, python
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, python
 Conflicts: sourceforge, gforge-plugin-scmcvs (<< 4.1), gforge-plugin-scmsvn (<< 4.1), gforge-plugin-scmccase (<< 4.1), gforge-theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files
  GForge provides many tools to aid collaboration in a
@@ -52,7 +52,7 @@
 
 Package: gforge-web-apache2
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, cronolog, python, ssl-cert
+Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert
 Recommends: libphp-jpgraph, locales | locales-all
 Provides: gforge-web
 Conflicts: gforge-web
@@ -75,7 +75,7 @@
 
 Package: gforge-db-postgresql
 Architecture: all
-Depends: gforge-common, postgresql-8.2 | postgresql, perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, php5-cli
+Depends: gforge-common, postgresql-8.2 | postgresql, perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli
 Provides: gforge-db
 Conflicts: gforge-db
 Description: collaborative development tool - database (using PostgreSQL)
@@ -90,7 +90,7 @@
 
 Package: gforge-mta-exim4
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, exim4, exim4-daemon-heavy
+Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, exim4, exim4-daemon-heavy
 Provides: gforge-mta
 Conflicts: gforge-mta
 Description: collaborative development tool - mail tools (using Exim 4)
@@ -105,7 +105,7 @@
 
 Package: gforge-mta-postfix
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, postfix, postfix-pgsql
+Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, postfix, postfix-pgsql
 Provides: gforge-mta
 Conflicts: gforge-mta
 Description: collaborative development tool - mail tools (using Postfix)
@@ -120,7 +120,7 @@
 
 Package: gforge-mta-courier
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, courier-mta
+Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, courier-mta
 Provides: gforge-mta
 Conflicts: gforge-mta
 Description: collaborative development tool - mail tools (using Courier)
@@ -135,7 +135,7 @@
 
 Package: gforge-shell-postgresql
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ssh, libnss-pgsql2
+Depends: gforge-common, gforge-db-postgresql, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, ssh, libnss-pgsql2
 Provides: gforge-shell
 Conflicts: gforge-shell
 Description: collaborative development tool - shell accounts (using PostgreSQL)
@@ -150,7 +150,7 @@
 
 Package: gforge-ftp-proftpd
 Architecture: all
-Depends: gforge-common, gforge-shell, proftpd, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, php5-cli
+Depends: gforge-common, gforge-shell, proftpd, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli
 Provides: gforge-ftp
 Conflicts: gforge-ftp
 Description: collaborative development tool - FTP management (using ProFTPd)
@@ -164,7 +164,7 @@
 
 Package: gforge-dns-bind9
 Architecture: all
-Depends: gforge-common, gforge-db, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, bind9 
+Depends: gforge-common, gforge-db, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, bind9 
 Provides: gforge-dns
 Conflicts: gforge-dns
 Description: collaborative development tool - DNS management (using Bind9)
@@ -178,7 +178,7 @@
 
 Package: gforge-lists-mailman
 Architecture: all
-Depends: gforge-common, gforge-db, gforge-mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, mailman (>= 2.1-3)
+Depends: gforge-common, gforge-db, gforge-mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, mailman (>= 2.1-3)
 Provides: gforge-lists
 Conflicts: gforge-lists
 Description: collaborative development tool - mailing-lists (using Mailman)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.config
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.config	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.config	2011-02-28 00:32:07 UTC (rev 12264)
@@ -1,6 +1,8 @@
 patch_apache_propose () {
 	for flavour in $* ; do
-		[ -e /etc/php5/$flavour/php.ini ] && propose_update_install /etc/php5/$flavour/php.ini || true
+		[ -e /etc/php5/$flavour/php.ini ] && ucf /etc/php5/$flavour/php.ini.gforge-new /etc/php5/$flavour/php.ini || true
+		rm /etc/php5/$flavour/php.ini.gforge-new
 	done
-	[ -e /etc/php5/cgi/php.ini ] && propose_update_install /etc/php5/cgi/php.ini || true
+	[ -e /etc/php5/cgi/php.ini ] && ucf /etc/php5/cgi/php.ini.gforge-new /etc/php5/cgi/php.ini || true
+	rm /etc/php5/cgi/php.ini.gforge-new
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.postinst
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.postinst	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.postinst	2011-02-28 00:32:07 UTC (rev 12264)
@@ -1,6 +1,8 @@
 patch_apache_replace () {
 	for flavour in $* ; do
-		[ -e /etc/php5/$flavour/php.ini ] && replace_file /etc/php5/$flavour/php.ini || true
+		[ -e /etc/php5/$flavour/php.ini ] && ucf /etc/php5/$flavour/php.ini.gforge-new /etc/php5/$flavour/php.ini || true
+		rm /etc/php5/$flavour/php.ini.gforge-new
 	done
-	[ -e /etc/php5/cgi/php.ini ] && replace_file /etc/php5/cgi/php.ini || true
+	[ -e /etc/php5/cgi/php.ini ] && ucf /etc/php5/cgi/php.ini.gforge-new /etc/php5/cgi/php.ini || true
+	rm /etc/php5/cgi/php.ini.gforge-new
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.prerm
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.prerm	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/dsf-helper/patch-apache.prerm	2011-02-28 00:32:07 UTC (rev 12264)
@@ -1,4 +1,6 @@
 unpatch_apache(){
 	/usr/lib/gforge/bin/install-apache.sh purge-files
-	propose_update_remove /etc/apache/httpd.conf
+	ucf /etc/apache/httpd.conf.gforge-new /etc/apache/httpd.conf
+	rm /etc/apache/httpd.conf.gforge-new
+	ucf --purge /etc/apache/httpd.conf
 }

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -51,7 +51,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 case "$1" in
     configure)
@@ -61,7 +60,8 @@
 
         # Patch DB configuration files
 	/usr/lib/gforge/bin/install-db.sh configure-files
-	propose_update_install ${pg_hba_dir}/pg_hba.conf
+	ucf ${pg_hba_dir}/pg_hba.conf.gforge-new ${pg_hba_dir}/pg_hba.conf
+	rm ${pg_hba_dir}/pg_hba.conf.gforge-new
 
         # Setup our DB
 	/usr/lib/gforge/bin/install-db.sh configure

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -43,14 +43,15 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
         # Unpatch DB configuration files
 	/usr/lib/gforge/bin/install-db.sh purge-files
-	propose_update_remove ${pg_hba_dir}/pg_hba.conf
+	ucf ${pg_hba_dir}/pg_hba.conf.gforge-new ${pg_hba_dir}/pg_hba.conf
+	rm ${pg_hba_dir}/pg_hba.conf.gforge-new
+	ucf --purge ${pg_hba_dir}/pg_hba.conf
 
         # DB config removal
 	/usr/lib/gforge/bin/install-db.sh purge

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -13,5 +12,6 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-propose_update_install /etc/bind/named.conf
+ucf /etc/bind/named.conf.gforge-new /etc/bind/named.conf
+rm /etc/bind/named.conf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,7 +25,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
 	# I don't know why I have to do this but somthing locks
@@ -36,7 +35,8 @@
 
 	# Patch Bind configuration files
 	/usr/lib/gforge/bin/install-dns.sh configure-files
-	propose_update_install /etc/bind/named.conf
+	ucf /etc/bind/named.conf.gforge-new /etc/bind/named.conf
+	rm /etc/bind/named.conf.gforge-new
 
 	# Create the DNS zone
 	/usr/lib/gforge/bin/install-dns.sh configure

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -18,14 +18,15 @@
 	
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Bind configuration files
 	/usr/lib/gforge/bin/install-dns.sh purge-files
-	propose_update_remove /etc/bind/named.conf
+	ucf /etc/bind/named.conf.gforge-new /etc/bind/named.conf
+	rm /etc/bind/named.conf.gforge-new
+	ucf --purge /etc/bind/named.conf
 	
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
-
-propose_update_install /etc/proftpd/proftpd.conf
+ucf /etc/proftpd/proftpd.conf.gforge-new /etc/proftpd/proftpd.conf
+rm /etc/proftpd/proftpd.conf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,7 +25,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
     	# I don't know why I have to do this but somthing locks
@@ -36,7 +35,8 @@
 
         # Patch Proftpd configuration files
 	/usr/lib/gforge/bin/install-ftp.sh configure-files
-	replace_file /etc/proftpd/proftpd.conf
+	ucf /etc/proftpd/proftpd.conf.gforge-new /etc/proftpd/proftpd.conf
+	rm /etc/proftpd/proftpd.conf.gforge-new
 
         # Setup our FTP
 	/usr/lib/gforge/bin/install-ftp.sh configure 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,14 +17,15 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Proftpd configuration files
 	/usr/lib/gforge/bin/install-ftp.sh purge-files
-	propose_update_remove /etc/proftpd/proftpd.conf
+	ucf /etc/proftpd/proftpd.conf.gforge-new /etc/proftpd/proftpd.conf
+	rm /etc/proftpd/proftpd.conf.gforge-new
+	ucf --purge /etc/proftpd/proftpd.conf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -14,7 +13,10 @@
 #DSFHELPER:common-variables#
 #DSFHELPER:ldap-variables#
 
-propose_update_install /etc/libnss-ldap.conf
-propose_update_install /etc/nsswitch.conf
-propose_update_install /etc/ldap/slapd.conf
+ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+rm /etc/libnss-ldap.conf.gforge-new
+rm /etc/nsswitch.conf.gforge-new
+rm /etc/ldap/slapd.conf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,7 +25,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
     	db_stop
@@ -33,9 +32,12 @@
 
         # Patch Slapd configuration files creation .gforge-new ones
 	/usr/lib/gforge/bin/install-ldap.sh configure-files
-	replace_file /etc/libnss-ldap.conf
-	replace_file /etc/nsswitch.conf
-	replace_file /etc/ldap/slapd.conf
+	ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+	rm /etc/libnss-ldap.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
+	rm /etc/ldap/slapd.conf.gforge-new
 
         # Setup our LDAP
 	err=0

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,16 +17,21 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
         # Unpatch Slapd configuration files
 	/usr/lib/gforge/bin/install-ldap.sh purge-files
-	propose_update_remove /etc/libnss-ldap.conf
-	propose_update_remove /etc/nsswitch.conf
-	propose_update_remove /etc/ldap/slapd.conf
+	ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+	rm /etc/libnss-ldap.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
+	rm /etc/ldap/slapd.conf.gforge-new
+	ucf --purge /etc/libnss-ldap.conf
+	ucf --purge /etc/nsswitch.conf
+	ucf --purge /etc/ldap/slapd.conf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -14,6 +13,8 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-propose_update_install /etc/aliases
-propose_update_install /etc/exim/exim.conf
+ucf /etc/aliases.gforge-new /etc/aliases
+ucf /etc/exim/exim.conf.gforge-new /etc/exim/exim.conf
+rm /etc/aliases.gforge-new
+rm /etc/exim/exim.conf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,15 +25,16 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
 
 	/usr/sbin/gforge-config
         # Patch Exim configuration files
 	/usr/lib/gforge/bin/install-exim.sh configure-files
-	replace_file /etc/aliases
-	replace_file /etc/exim/exim.conf
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/exim/exim.conf.gforge-new /etc/exim/exim.conf
+	rm /etc/aliases.gforge-new
+	rm /etc/exim/exim.conf.gforge-new
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,15 +17,18 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Exim configuration files
 	/usr/lib/gforge/bin/install-exim.sh purge-files
-	propose_update_remove /etc/aliases
-	propose_update_remove /etc/exim/exim.conf
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/exim/exim.conf.gforge-new /etc/exim/exim.conf
+	rm /etc/aliases.gforge-new
+	rm /etc/exim/exim.conf.gforge-new
+	ucf --purge /etc/aliases
+	ucf --purge /etc/exim/exim.conf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -14,10 +13,14 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-propose_update_install /etc/aliases
-propose_update_install /etc/exim4/exim4.conf
-propose_update_install /etc/exim4/exim4.conf.template
-propose_update_install /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+ucf /etc/aliases.gforge-new /etc/aliases
+ucf /etc/exim4/exim4.conf.gforge-new /etc/exim4/exim4.conf
+ucf /etc/exim4/exim4.conf.template.gforge-new /etc/exim4/exim4.conf.template
+ucf /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+rm /etc/aliases.gforge-new
+rm /etc/exim4/exim4.conf.gforge-new
+rm /etc/exim4/exim4.conf.template.gforge-new
+rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new
 db_stop
 
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,17 +25,20 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
 
 	/usr/sbin/gforge-config
         # Patch Exim configuration files
 	/usr/lib/gforge/bin/install-exim4.sh configure-files
-	replace_file /etc/aliases
-	replace_file /etc/exim4/exim4.conf
-	replace_file /etc/exim4/exim4.conf.template
-	replace_file /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/exim4/exim4.conf.gforge-new /etc/exim4/exim4.conf
+	ucf /etc/exim4/exim4.conf.template.gforge-new /etc/exim4/exim4.conf.template
+	ucf /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/aliases.gforge-new
+	rm /etc/exim4/exim4.conf.gforge-new
+	rm /etc/exim4/exim4.conf.template.gforge-new
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,17 +17,24 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Exim configuration files
 	/usr/lib/gforge/bin/install-exim4.sh purge-files
-	propose_update_remove /etc/aliases
-	propose_update_remove /etc/exim4/exim4.conf
-	propose_update_remove /etc/exim4/exim4.conf.template
-	propose_update_remove /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/exim4/exim4.conf.gforge-new /etc/exim4/exim4.conf
+	ucf /etc/exim4/exim4.conf.template.gforge-new /etc/exim4/exim4.conf.template
+	ucf /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/aliases.gforge-new
+	rm /etc/exim4/exim4.conf.gforge-new
+	rm /etc/exim4/exim4.conf.template.gforge-new
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs.gforge-new
+	ucf --purge /etc/aliases
+	ucf --purge /etc/exim4/exim4.conf
+	ucf --purge /etc/exim4/exim4.conf.template
+	ucf --purge /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -14,6 +13,8 @@
 #DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 
-propose_update_install /etc/aliases
-propose_update_install /etc/postfix/main.cf
+ucf /etc/aliases.gforge-new /etc/aliases
+ucf /etc/postfix/main.cf.gforge-new /etc/postfix/main.cf
+rm /etc/aliases.gforge-new
+rm /etc/postfix/main.cf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,15 +25,16 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
 	/usr/sbin/gforge-config
 
         # Patch Postfix configuration files
 	/usr/lib/gforge/bin/install-postfix.sh configure-files
-	replace_file /etc/aliases
-	replace_file /etc/postfix/main.cf
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/postfix/main.cf.gforge-new /etc/postfix/main.cf
+	rm /etc/aliases.gforge-new
+	rm /etc/postfix/main.cf.gforge-new
 	/usr/lib/gforge/bin/install-postfix.sh configure
     ;;
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,15 +17,18 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Postfix configuration files
 	/usr/lib/gforge/bin/install-postfix.sh purge-files
-	propose_update_remove /etc/aliases
-	propose_update_remove /etc/postfix/main.cf
+	ucf /etc/aliases.gforge-new /etc/aliases
+	ucf /etc/postfix/main.cf.gforge-new /etc/postfix/main.cf
+	rm /etc/aliases.gforge-new
+	rm /etc/postfix/main.cf.gforge-new
+	ucf --purge /etc/aliases
+	ucf --purge /etc/postfix/main.cf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -12,7 +11,10 @@
 #DSFHELPER:get-pw-from-debconf#
 #DSFHELPER:ldap-variables#
 
-propose_update_install /etc/libnss-ldap.conf
-propose_update_install /etc/nsswitch.conf
-propose_update_install /etc/ldap/slapd.conf
+ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+rm /etc/libnss-ldap.conf.gforge-new
+rm /etc/nsswitch.conf.gforge-new
+rm /etc/ldap/slapd.conf.gforge-new
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,7 +25,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
     	db_stop
@@ -33,9 +32,12 @@
 
         # Patch Slapd configuration files
 	/usr/lib/gforge/bin/install-ldap.sh configure-files
-	replace_file /etc/libnss-ldap.conf
-	replace_file /etc/nsswitch.conf
-	replace_file /etc/ldap/slapd.conf
+	ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+	rm /etc/libnss-ldap.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
+	rm /etc/ldap/slapd.conf.gforge-new
 
 	# Install the chroot environment
 	/usr/lib/gforge/bin/install-chroot.sh configure

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,16 +17,21 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
         # Unpatch Slapd configuration files
 	/usr/lib/gforge/bin/install-ldap.sh purge-files
-	propose_update_remove /etc/libnss-ldap.conf
-	propose_update_remove /etc/nsswitch.conf
-	propose_update_remove /etc/ldap/slapd.conf
+	ucf /etc/libnss-ldap.conf.gforge-new /etc/libnss-ldap.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	ucf /etc/ldap/slapd.conf.gforge-new /etc/ldap/slapd.conf
+	rm /etc/libnss-ldap.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
+	rm /etc/ldap/slapd.conf.gforge-new
+	ucf --purge /etc/libnss-ldap.conf
+	ucf --purge /etc/nsswitch.conf
+	ucf --purge /etc/ldap/slapd.conf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.config.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.config.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.config.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -3,7 +3,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 
 create_mainconffile
@@ -11,10 +10,4 @@
 
 #DSFHELPER:get-pw-from-debconf#
 
-if [ ! -f /etc/nss-pgsql.conf ] 
-then
-	touch /etc/nss-pgsql.conf
-fi
-propose_update_install /etc/nss-pgsql.conf
-propose_update_install /etc/nsswitch.conf
 db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,21 +25,19 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     configure)
 	/usr/sbin/gforge-config
 
-        # Patch Slapd configuration files
+        # Patch NSS configuration files
 	/usr/lib/gforge/bin/install-nsspgsql.sh configure-files
-	replace_file /etc/nss-pgsql.conf
-	replace_file /etc/nsswitch.conf
+	ucf /etc/nss-pgsql.conf.gforge-new /etc/nss-pgsql.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	rm /etc/nss-pgsql.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
 
 	# Install the chroot environment
 	/usr/lib/gforge/bin/install-chroot.sh configure
-	
-        # Setup our LDAP
-	/usr/lib/gforge/bin/install-nsspgsql.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.prerm.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.prerm.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.prerm.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -17,15 +17,18 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 case "$1" in
     remove)
 	db_title "Unconfiguring Gforge"
 
         # Unpatch Slapd configuration files
 	/usr/lib/gforge/bin/install-nsspgsql.sh purge-files
-	propose_update_remove /etc/libnss-pgsql.conf
-	propose_update_remove /etc/nsswitch.conf
+	ucf /etc/nss-pgsql.conf.gforge-new /etc/nss-pgsql.conf
+	ucf /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
+	rm /etc/nss-pgsql.conf.gforge-new
+	rm /etc/nsswitch.conf.gforge-new
+	ucf --purge /etc/libnss-pgsql.conf
+	ucf --purge /etc/nsswitch.conf
 
 	# Clean debconf after ourselves
 	db_stop

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2011-02-28 00:32:05 UTC (rev 12263)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2011-02-28 00:32:07 UTC (rev 12264)
@@ -25,7 +25,6 @@
 
 . /usr/share/debconf/confmodule
 
-#DSFHELPER:replace-files#
 #DSFHELPER:handle-mainconffile#
 #DSFHELPER:patch-apache#
 



More information about the evolvis-commits mailing list