[Pkg-mediawiki-devel] Bug#444445: mediawiki1.10: please create default upload directory 'images'

[Tilman Koschnick]

Package: mediawiki1.10
Version: 1.10.2-1
Severity: wishlist
Tags: patch

Hi,

the default upload directory in recent mediawiki versions is called
'images', while the package still installs a directory 'upload'. The
attached patch makes the change to the new name.

WRT upgrading from old versions, README.Debian already explains what to
do, and the old upload directory shouldn't be removed if it contains any
files.

Cheers, Til
-------------- next part --------------
diff -u -r debian.orig/mediawiki1.10.dirs debian/mediawiki1.10.dirs
--- debian.orig/mediawiki1.10.dirs	2007-09-28 16:11:24.000000000 +0200
+++ debian/mediawiki1.10.dirs	2007-09-28 16:13:21.000000000 +0200
@@ -1,4 +1,4 @@
-var/lib/mediawiki1.10/upload
+var/lib/mediawiki1.10/images
 etc/mediawiki1.10
 usr/share/mediawiki1.10/debian-scripts
 usr/share/linda/overrides/
diff -u -r debian.orig/mediawiki1.10.links debian/mediawiki1.10.links
--- debian.orig/mediawiki1.10.links	2007-09-28 16:11:24.000000000 +0200
+++ debian/mediawiki1.10.links	2007-09-28 16:13:35.000000000 +0200
@@ -3,5 +3,5 @@
 var/lib/mediawiki1.10/LocalSettings.php usr/share/mediawiki1.10/LocalSettings.php
 var/lib/mediawiki1.10/AdminSettings.php usr/share/mediawiki1.10/AdminSettings.php
 var/lib/mediawiki1.10/config usr/share/mediawiki1.10/config
-var/lib/mediawiki1.10/upload usr/share/mediawiki1.10/upload
+var/lib/mediawiki1.10/images usr/share/mediawiki1.10/images
 var/lib/mediawiki1.10/extensions usr/share/mediawiki1.10/extensions
diff -u -r debian.orig/mediawiki1.10.postinst debian/mediawiki1.10.postinst
--- debian.orig/mediawiki1.10.postinst	2007-09-28 16:11:24.000000000 +0200
+++ debian/mediawiki1.10.postinst	2007-09-28 16:13:52.000000000 +0200
@@ -49,8 +49,8 @@
 	     fi
 	done
 
-        chown -R www-data:www-data /var/lib/mediawiki1.10/config /var/lib/mediawiki1.10/upload
-        chmod 700 /var/lib/mediawiki1.10/config /var/lib/mediawiki1.10/upload
+        chown -R www-data:www-data /var/lib/mediawiki1.10/config /var/lib/mediawiki1.10/images
+        chmod 700 /var/lib/mediawiki1.10/config /var/lib/mediawiki1.10/images
 
 	# Upgrading if asked to:
 	# Get list of mediawiki installed packages (either 1.7 or 1.9 here):
diff -u -r debian.orig/rules debian/rules
--- debian.orig/rules	2007-09-28 16:11:24.000000000 +0200
+++ debian/rules	2007-09-28 16:13:02.000000000 +0200
@@ -30,7 +30,7 @@
 	chmod a+x debian/mediawiki1.10/usr/share/mediawiki1.10/debian-scripts/*
 	chmod a+x debian/mediawiki1.10/usr/share/mediawiki1.10/maintenance/postgres/compare_schemas.pl
 	chmod a+x debian/mediawiki1.10/usr/share/mediawiki1.10/maintenance/postgres/mediawiki_mysql2postgres.pl
-	find debian/mediawiki1.10/usr/share/mediawiki1.10 -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|upload\|extensions\|config\)" | \
+	find debian/mediawiki1.10/usr/share/mediawiki1.10 -maxdepth 1 -mindepth 1 | grep -v "\(LocalSettings.php\|AdminSettings.php\|debian-scripts\|images\|extensions\|config\)" | \
 	while read i; do \
 		dh_link "`echo "$$i" | sed -e s#debian/mediawiki1.10/##`" \
 		"`echo "$$i" | sed -e s#debian/mediawiki1.10/usr/share/mediawiki1.10/#var/lib/mediawiki1.10/#`"; \