[Fusionforge-commits] r10327 - in branches/Branch_5_0/gforge: debian debian/dsf-in packaging/control

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Aug 19 16:48:23 CEST 2010


Author: lolando
Date: 2010-08-19 16:48:23 +0200 (Thu, 19 Aug 2010)
New Revision: 10327

Modified:
   branches/Branch_5_0/gforge/debian/changelog
   branches/Branch_5_0/gforge/debian/control
   branches/Branch_5_0/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in
   branches/Branch_5_0/gforge/packaging/control/050db-postgresql
Log:
Debian packaging: cope with postgresql-8.4 >= 8.4.4-2 and its init script rename

Modified: branches/Branch_5_0/gforge/debian/changelog
===================================================================
--- branches/Branch_5_0/gforge/debian/changelog	2010-08-18 14:48:59 UTC (rev 10326)
+++ branches/Branch_5_0/gforge/debian/changelog	2010-08-19 14:48:23 UTC (rev 10327)
@@ -1,8 +1,10 @@
 fusionforge (5.0.1+svn10155-1+) UNRELEASED; urgency=low
 
   * Switch to Unix sockets for DB access by default.
+  * Cope with postgresql-8.4 on both sides of 8.4.4-2, where the init
+    script can be called either "postgresql-8.4" or "postgresql".
 
- -- Roland Mas <lolando at debian.org>  Wed, 30 Jun 2010 16:10:58 +0200
+ -- Roland Mas <lolando at debian.org>  Thu, 19 Aug 2010 16:45:53 +0200
 
 fusionforge (5.0.1+svn10155-1) unstable; urgency=low
 

Modified: branches/Branch_5_0/gforge/debian/control
===================================================================
--- branches/Branch_5_0/gforge/debian/control	2010-08-18 14:48:59 UTC (rev 10326)
+++ branches/Branch_5_0/gforge/debian/control	2010-08-19 14:48:23 UTC (rev 10327)
@@ -126,7 +126,7 @@
 
 Package: gforge-db-postgresql
 Architecture: all
-Depends: gforge-common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
+Depends: gforge-common, postgresql (>= 8.1) | postgresql-8.4 | postgresql-8.3 | postgresql-8.2 | postgresql-8.1, perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
 Provides: gforge-db
 Conflicts: gforge-db
 Description: collaborative development tool - database (using PostgreSQL)

Modified: branches/Branch_5_0/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in
===================================================================
--- branches/Branch_5_0/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in	2010-08-18 14:48:59 UTC (rev 10326)
+++ branches/Branch_5_0/gforge/debian/dsf-in/db-postgresql.postinst.dsfh-in	2010-08-19 14:48:23 UTC (rev 10327)
@@ -63,9 +63,14 @@
 	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new ${pg_hba_dir}/pg_hba.conf
 	rm ${pg_hba_dir}/pg_hba.conf. at OLDPACKAGE@-new
 
-	# Make sure the database accepts connections from these new users
-	pg_name=postgresql-$pg_version
-	invoke-rc.d ${pg_name} reload
+	# Reload postgresql to make sure the database accepts connections from the new users
+	# Trying "postgresql" init script...
+	invoke-rc.d postgresql reload || v=$?
+	if [ "$v" = 100 ] ; then
+	    # No "postgresql" init script (for packages < 8.4.4-2)
+	    pg_name=postgresql-$pg_version
+	    invoke-rc.d ${pg_name} reload
+	fi
 
         # Setup our DB
 	/usr/share/@OLDPACKAGE@/bin/install-db.sh configure

Modified: branches/Branch_5_0/gforge/packaging/control/050db-postgresql
===================================================================
--- branches/Branch_5_0/gforge/packaging/control/050db-postgresql	2010-08-18 14:48:59 UTC (rev 10326)
+++ branches/Branch_5_0/gforge/packaging/control/050db-postgresql	2010-08-19 14:48:23 UTC (rev 10327)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -db-postgresql
 Architecture: all
-Depends: @OLDPACKAGE at -common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, postgresql (>= 8.1) | postgresql-8.4 | postgresql-8.3 | postgresql-8.2 | postgresql-8.1, perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
 Provides: @OLDPACKAGE at -db
 Conflicts: @OLDPACKAGE at -db
 Description: collaborative development tool - database (using PostgreSQL)




More information about the Fusionforge-commits mailing list