[Fusionforge-commits] r15765 - in branches/Branch_5_1/src: debian plugins/mediawiki/debian

Thorsten Glaser mirabilos at fusionforge.org
Wed Jun 13 16:47:54 CEST 2012


Author: mirabilos
Date: 2012-06-13 16:47:53 +0200 (Wed, 13 Jun 2012)
New Revision: 15765

Modified:
   branches/Branch_5_1/src/debian/changelog
   branches/Branch_5_1/src/plugins/mediawiki/debian/plugin-mediawiki.postinst
Log:
replay commit 11527 from lolando fixing the mediawiki postinst
and solve conflict

Modified: branches/Branch_5_1/src/debian/changelog
===================================================================
--- branches/Branch_5_1/src/debian/changelog	2012-06-13 12:42:01 UTC (rev 15764)
+++ branches/Branch_5_1/src/debian/changelog	2012-06-13 14:47:53 UTC (rev 15765)
@@ -1,3 +1,10 @@
+fusionforge (5.1.1-9) UNRELEASED; urgency=low
+
+  * Reinstate code running the Mediawiki SQL initialisation code from the
+    package's postinst.
+
+ -- Roland Mas <lolando at debian.org>  Fri, 01 Jun 2012 11:04:11 +0200
+
 fusionforge (5.1.1-8) unstable; urgency=low
 
   * Fixes from the 5.1 upstream branch.

Modified: branches/Branch_5_1/src/plugins/mediawiki/debian/plugin-mediawiki.postinst
===================================================================
--- branches/Branch_5_1/src/plugins/mediawiki/debian/plugin-mediawiki.postinst	2012-06-13 12:42:01 UTC (rev 15764)
+++ branches/Branch_5_1/src/plugins/mediawiki/debian/plugin-mediawiki.postinst	2012-06-13 14:47:53 UTC (rev 15765)
@@ -18,6 +18,12 @@
 	;;
     
     configure)
+	# Run plugin specific db upgrade
+	if [ -f /usr/share/@OLDPACKAGE@/plugins/@PLUGSHORTNAME@/bin/db-upgrade.pl ]
+	then
+		/usr/share/@OLDPACKAGE@/plugins/@PLUGSHORTNAME@/bin/db-upgrade.pl
+	fi
+	/usr/share/@OLDPACKAGE@/bin/register-plugin $(echo @PLUGSHORTNAME@ | sed 's/-//g') "@PLUGLONGNAME@"
 	upgrade_mediawikis
 	;;
     




More information about the Fusionforge-commits mailing list