[Pkg-mediawiki-commits] r494 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2013-12-31 10:36:29 +0000 (Tue, 31 Dec 2013)
New Revision: 494

Added:
   mediawiki/trunk/debian/mediawiki.preinst
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/rules
Log:
transition from directories in /var/lib/mediawiki/extensions/
for core extensions to symlinks, since those can dpkg-file-conflict
with each other (*should* fix the RC bug #719208)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-12-31 10:23:30 UTC (rev 493)
+++ mediawiki/trunk/debian/changelog	2013-12-31 10:36:29 UTC (rev 494)
@@ -10,8 +10,10 @@
 
   [ Thorsten Glaser ]
   * Refresh patches against 1.19.9
+  * Handle /var/lib/mediawiki/extensions/* always as symlinks, for
+    both core and extra extensions, with upgrade path (Closes: #719208)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:23:05 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:34:47 +0100
 
 mediawiki (1:1.19.8+dfsg-2.2) unstable; urgency=high
 

Added: mediawiki/trunk/debian/mediawiki.preinst
===================================================================
--- mediawiki/trunk/debian/mediawiki.preinst	                        (rev 0)
+++ mediawiki/trunk/debian/mediawiki.preinst	2013-12-31 10:36:29 UTC (rev 494)
@@ -0,0 +1,45 @@
+#!/bin/sh
+# $Id$
+# From MirOS: contrib/hosted/tg/deb/jupp/debian/jupp.preinst,v 1.5 2011/10/06 08:59:57 tg Exp $
+
+set -e
+
+# This maintainer script can be called the following ways:
+#
+# * new-preinst "install" [$old_version]
+# * new-preinst "upgrade" [$old_version]
+# * old-preinst "abort-upgrade" $new_version
+# Essential packages and Pre-Depends are available. Pre-Depends have
+# been configured once, but may be unpacked or Half-Configured only,
+# or, for "abort-upgrade", Half-Installed if their upgrade failed.
+
+case $1 in
+install|upgrade)
+	# move directories to symlinks (once)
+	if test -z "$2" || \
+	    dpkg --compare-versions "$2" lt '1:1.19.9'; then
+		rm -rf /var/lib/mediawiki/extensions/ConfirmEdit
+		rm -rf /var/lib/mediawiki/extensions/Gadgets
+		rm -rf /var/lib/mediawiki/extensions/Nuke
+		rm -rf /var/lib/mediawiki/extensions/ParserFunctions
+		rm -rf /var/lib/mediawiki/extensions/Renameuser
+		rm -rf /var/lib/mediawiki/extensions/Vector
+		rm -rf /var/lib/mediawiki/extensions/WikiEditor
+	fi
+	;;
+
+abort-upgrade)
+	;;
+
+*)
+	echo >&2 "preinst called with unknown subcommand '$1'"
+	exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0


Property changes on: mediawiki/trunk/debian/mediawiki.preinst
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: mediawiki/trunk/debian/rules
===================================================================
--- mediawiki/trunk/debian/rules	2013-12-31 10:23:30 UTC (rev 493)
+++ mediawiki/trunk/debian/rules	2013-12-31 10:36:29 UTC (rev 494)
@@ -42,6 +42,16 @@
 	# Put debian version for mediawiki version..
 	sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
 			-i debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
+	# Move extensions
+	mv debian/mediawiki/var/lib/mediawiki/extensions/README \
+	    debian/mediawiki/usr/share/doc/mediawiki/README.extensions
+	mv debian/mediawiki/var/lib/mediawiki/extensions \
+	    debian/mediawiki/usr/share/mediawiki/extensions-core
+	mkdir debian/mediawiki/var/lib/mediawiki/extensions
+	for coreextension in debian/mediawiki/usr/share/mediawiki/extensions-core/*; do \
+		dh_link usr/share/mediawiki/extensions-core/"$$coreextension" \
+		    var/lib/mediawiki/extensions/"$$coreextension"; \
+	done
 	# includes/libs is provided by mediawiki-classes
 	rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs