[evolvis-commits] r18272: Finished basic work. Package compile. Did not do *any* subsequent testings (not even installed)...

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:15:44 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:15:43 +0200 (Wed, 11 Apr 2012)
New Revision: 18272

Added:
   trunk/mediawiki/debian/mediawiki-math.install
   trunk/mediawiki/debian/mediawiki-math.manpages
   trunk/mediawiki/debian/mediawiki.config
   trunk/mediawiki/debian/mediawiki.dirs
   trunk/mediawiki/debian/mediawiki.docs
   trunk/mediawiki/debian/mediawiki.examples
   trunk/mediawiki/debian/mediawiki.install
   trunk/mediawiki/debian/mediawiki.linda-override
   trunk/mediawiki/debian/mediawiki.links
   trunk/mediawiki/debian/mediawiki.postinst
   trunk/mediawiki/debian/mediawiki.postrm
Removed:
   trunk/mediawiki/debian/mediawiki1.10-math.install
   trunk/mediawiki/debian/mediawiki1.10-math.manpages
   trunk/mediawiki/debian/mediawiki1.10.config
   trunk/mediawiki/debian/mediawiki1.10.dirs
   trunk/mediawiki/debian/mediawiki1.10.docs
   trunk/mediawiki/debian/mediawiki1.10.examples
   trunk/mediawiki/debian/mediawiki1.10.install
   trunk/mediawiki/debian/mediawiki1.10.linda-override
   trunk/mediawiki/debian/mediawiki1.10.links
   trunk/mediawiki/debian/mediawiki1.10.postinst
   trunk/mediawiki/debian/mediawiki1.10.postrm
Modified:
   trunk/mediawiki/debian/README.Debian
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   trunk/mediawiki/debian/etc/apache.conf
   trunk/mediawiki/debian/etc/cherokee.conf
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/po/ar.po
   trunk/mediawiki/debian/po/ca.po
   trunk/mediawiki/debian/po/cs.po
   trunk/mediawiki/debian/po/de.po
   trunk/mediawiki/debian/po/es.po
   trunk/mediawiki/debian/po/eu.po
   trunk/mediawiki/debian/po/fr.po
   trunk/mediawiki/debian/po/gl.po
   trunk/mediawiki/debian/po/it.po
   trunk/mediawiki/debian/po/ja.po
   trunk/mediawiki/debian/po/ml.po
   trunk/mediawiki/debian/po/nl.po
   trunk/mediawiki/debian/po/pt.po
   trunk/mediawiki/debian/po/pt_BR.po
   trunk/mediawiki/debian/po/ru.po
   trunk/mediawiki/debian/po/sk.po
   trunk/mediawiki/debian/po/sv.po
   trunk/mediawiki/debian/po/ta.po
   trunk/mediawiki/debian/po/templates.pot
   trunk/mediawiki/debian/po/vi.po
   trunk/mediawiki/debian/rules
   trunk/mediawiki/debian/templates
Log:
Finished basic work. Package compile. Did not do *any* subsequent testings (not even installed)...

Modified: trunk/mediawiki/debian/README.Debian
===================================================================
--- trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/README.Debian	2012-04-11 09:15:43 UTC (rev 18272)
@@ -4,21 +4,25 @@
 
 Optional features:
 	- Image thumbnailing :
-	  Install 'php4-gd2' or 'imagemagick' to use this feature.
+	  Install 'php5-gd2' or 'imagemagick' to use this feature.
 	- LaTeX-compatible math equations rendering :
 	  Install 'tetex-bin', 'imagemagick' and a Ghostscript interpreter
 	    ('gs-gpl' or 'gs-esp') to use this feature.
 	  To be able to render non-ASCII characters, also install 'cjk-latex'.
-	  Uncomment the following line in '/etc/mediawiki1.10/LocalSettings.php' :
+	  Uncomment the following line in '/etc/mediawiki/LocalSettings.php' :
 		$wgUseTeX = true;
 
 Configuration:
 	The configuration uses an easy web-based system ; just go to this URL :
 		http://www.myserver.org/mediawiki/config/index.php
 		(replace by your own servername)
+	  You may of course configure your webserver to serve this URL. A default 
+	  configuration can be found in /etc/mediawiki/. Apache and cherokee users
+	  may have linked this in their configuration automatically if they asked
+	  the installer to do so.
 	Then just copy the generated config to the real system location :
-		mv /var/lib/mediawiki1.10/config/LocalSettings.php \
-		 /etc/mediawiki1.10
+		mv /var/lib/mediawiki/config/LocalSettings.php \
+		 /etc/mediawiki
 	Warning: to make this work, we have to define MW_INSTALL_PATH. This is done automatically in this package.
 	However, you may change this later if you plan to set up multisite wikis.
 	After being configured, you should begin your surf on your new wiki using this url:
@@ -32,7 +36,7 @@
 	sql account be granted only SELECT/INSERT/DELETE/UPDATE on your mediawiki database, and an additional
 	account used for maintenance with additional CREATE/DROP/ALTER rights.
 		To use this feature, you only need to setup an additional account in the database and provide
-	the new credentials into /etc/mediawiki1.10/AdminSettings.php (/usr/share/doc/mediawiki1.10/examples contains
+	the new credentials into /etc/mediawiki/AdminSettings.php (/usr/share/doc/mediawiki/examples contains
 	an example). Then don't forget to lower rights of the primary account.
   2) file upload check:
 		You can activate file upload virus checking by installing the 'clamav' package and setting the
@@ -43,30 +47,30 @@
 	A rapid sketch of what you need to do is as follow:
 	1) Dump your database to a text file.
 		mysqldump --add-drop-table -u <user> -p <my-database> > /path/to/file.sql
-	2) Copy the configuration files from /etc/mediawiki1.x to /var/lib/mediawiki1.10 and make them writable for
+	2) Copy the configuration files from /etc/mediawiki1.x to /var/lib/mediawiki and make them writable for
 	     your webserver user -- usualy www-data.
-		cp /var/lib/mediawiki1.x/LocalSettings.php /var/lib/mediawiki1.10
-		cp /var/mediawiki1.x/AdminSettings.php /var/lib/mediawiki1.10 (if exists)
-	3) change your working path to /var/lib/mediawiki1.10:
-		cd /var/lib/mediawiki1.10
+		cp /var/lib/mediawiki1.x/LocalSettings.php /var/lib/mediawiki
+		cp /var/mediawiki1.x/AdminSettings.php /var/lib/mediawiki (if exists)
+	3) change your working path to /var/lib/mediawiki:
+		cd /var/lib/mediawiki
 	4) Add the following line at the begining of your LocalSettings.php if it does not exist:
-		define(MW_INSTALL_PATH,"/var/lib/mediawiki1.10");
+		define(MW_INSTALL_PATH,"/var/lib/mediawiki");
 	5) Execute the update script:
 		php maintenance/update.php
 	   This shall need a proper php5 binary, as provided in php5-cli
 	6) Execute the rebuildall script:
 		php maintenance/rebuildall.php
 	7) Copy the old upload directory (this location has been switched to /images, according to upstream):
-		cp -rf /var/lib/mediawiki1.x/upload/* /var/lib/mediawiki1.10/images/
-	8) Move the updated configuration files to /etc/mediawiki1.10 with secured rights, and make symlinks to it:
-		mv /var/lib/mediawiki1.10/LocalSettings.php /etc/mediawiki1.10
-		ln -s /etc/mediawiki1.10/LocalSettings /var/lib/mediawiki1.10/
-		mv /var/lib/mediawiki1.10/AdminSettings.php /etc/mediawiki1.10 (if exists)
-		ln -s /etc/mediawiki1.10/AdminSettings /var/lib/mediawiki1.10/ (You can do this even if the file does not exists)
-		chmod 640 /etc/mediawiki1.10/LocalSettings.php 
-		chmod 640 /etc/mediawiki1.10/AdminSettings.php (if exists)
-		chown root:adm /etc/mediawiki1.10/LocalSettings.php 
-		chown root:adm /etc/mediawiki1.10/AdminSettings.php (if exists)
+		cp -rf /var/lib/mediawiki1.x/upload/* /var/lib/mediawiki/images/
+	8) Move the updated configuration files to /etc/mediawiki with secured rights, and make symlinks to it:
+		mv /var/lib/mediawiki/LocalSettings.php /etc/mediawiki
+		ln -s /etc/mediawiki/LocalSettings /var/lib/mediawiki/
+		mv /var/lib/mediawiki/AdminSettings.php /etc/mediawiki (if exists)
+		ln -s /etc/mediawiki/AdminSettings /var/lib/mediawiki/ (You can do this even if the file does not exists)
+		chmod 640 /etc/mediawiki/LocalSettings.php 
+		chmod 640 /etc/mediawiki/AdminSettings.php (if exists)
+		chown root:adm /etc/mediawiki/LocalSettings.php 
+		chown root:adm /etc/mediawiki/AdminSettings.php (if exists)
 
 Configuring apache and MySQL:
 	A good how-to to correctly setup the application used by mediawiki can be found there:

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,7 +1,10 @@
-mediawiki (1:1.11-1) unstable; urgency=low
+mediawiki (1:1.11.0-1) unstable; urgency=low
 
   * Removed mediawikiX versioned packages
+  * Updated to mediawiki 1.11
   * Removed automatic upgrade script
+  * Updated README.Debian (Closes: #442311, #442302)
+  * Changed default upload directory (Closes: #444445)
 
  -- Romain Beauxis <toots at rastageeks.org>  Sun, 21 Oct 2007 20:54:00 +0200
 

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/control	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,4 +1,4 @@
-Source: mediawiki1.10
+Source: mediawiki
 Section: web
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
@@ -6,11 +6,11 @@
 Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Standards-Version: 3.7.2
 
-Package: mediawiki1.10
+Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-cli, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-8.1
-Suggests: php5-gd | imagemagick, mediawiki1.10-math, memcached, clamav
+Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing
@@ -24,11 +24,11 @@
  .
   Homepage: http://www.mediawiki.org/
 
-Package: mediawiki1.10-math
+Package: mediawiki-math
 Architecture: any
 Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
 Replaces: mediawiki1.5-math, mediawiki1.9-math
-Recommends: mediawiki1.10, latex-cjk-all, tetex-extra
+Recommends: mediawiki, latex-cjk-all, tetex-extra
 Description: math rendering plugin for MediaWiki
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing

Modified: trunk/mediawiki/debian/control.in
===================================================================
--- trunk/mediawiki/debian/control.in	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,4 +1,4 @@
-Source: mediawiki1.10
+Source: mediawiki
 Section: web
 Priority: optional
 Maintainer: Mediawiki Maintenance Team <pkg-mediawiki-devel at lists.alioth.debian.org>
@@ -6,11 +6,11 @@
 Build-Depends: @cdbs@, ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Standards-Version: 3.7.2
 
-Package: mediawiki1.10
+Package: mediawiki
 Architecture: all
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-cli, mime-support, ${misc:Depends} 
 Recommends: mysql-server | postgresql-8.1
-Suggests: php5-gd | imagemagick, mediawiki1.10-math, memcached, clamav
+Suggests: php5-gd | imagemagick, mediawiki-math, memcached, clamav
 Description: website engine for collaborative work
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing
@@ -24,11 +24,11 @@
  .
   Homepage: http://www.mediawiki.org/
 
-Package: mediawiki1.10-math
+Package: mediawiki-math
 Architecture: any
 Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
 Replaces: mediawiki1.5-math, mediawiki1.9-math
-Recommends: mediawiki1.10, latex-cjk-all, tetex-extra
+Recommends: mediawiki, latex-cjk-all, tetex-extra
 Description: math rendering plugin for MediaWiki
  MediaWiki is a wiki engine (a program for creating a collaboratively
  edited website). It is designed to handle heavy websites containing

Modified: trunk/mediawiki/debian/etc/apache.conf
===================================================================
--- trunk/mediawiki/debian/etc/apache.conf	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/etc/apache.conf	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,8 +1,8 @@
 # Uncomment this to add an alias.
 # This does not work properly with virtual hosts..
-#Alias /mediawiki /var/lib/mediawiki1.10
+#Alias /mediawiki /var/lib/mediawiki
 
-<Directory /var/lib/mediawiki1.10/>
+<Directory /var/lib/mediawiki/>
 	Options +FollowSymLinks
 	AllowOverride All
 	order allow,deny
@@ -10,11 +10,11 @@
 </Directory>
 
 # some directories must be protected
-<Directory /var/lib/mediawiki1.10/config>
+<Directory /var/lib/mediawiki/config>
 	Options -FollowSymLinks
 	AllowOverride None
 </Directory>
-<Directory /var/lib/mediawiki1.10/upload>
+<Directory /var/lib/mediawiki/upload>
 	Options -FollowSymLinks
 	AllowOverride None
 </Directory>

Modified: trunk/mediawiki/debian/etc/cherokee.conf
===================================================================
--- trunk/mediawiki/debian/etc/cherokee.conf	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/etc/cherokee.conf	2012-04-11 09:15:43 UTC (rev 18272)
@@ -4,6 +4,6 @@
 ##
 Directory /mediawiki {
           Handler common
-          DocumentRoot /var/lib/mediawiki1.10/
+          DocumentRoot /var/lib/mediawiki/
 }
  

Added: trunk/mediawiki/debian/mediawiki-math.install
===================================================================
--- trunk/mediawiki/debian/mediawiki-math.install	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki-math.install	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1 @@
+math/texvc usr/bin

Added: trunk/mediawiki/debian/mediawiki-math.manpages
===================================================================
--- trunk/mediawiki/debian/mediawiki-math.manpages	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki-math.manpages	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1 @@
+debian/texvc.1

Added: trunk/mediawiki/debian/mediawiki.config
===================================================================
--- trunk/mediawiki/debian/mediawiki.config	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.config	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# Debconf config script for mediawiki
+
+set -e
+
+# Source debconf library
+. /usr/share/debconf/confmodule
+
+db_input medium mediawiki/webserver || true
+db_go
+
+db_stop
+
+exit 0 

Added: trunk/mediawiki/debian/mediawiki.dirs
===================================================================
--- trunk/mediawiki/debian/mediawiki.dirs	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.dirs	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,4 @@
+var/lib/mediawiki/images
+etc/mediawiki
+usr/share/mediawiki/debian-scripts
+usr/share/linda/overrides/

Added: trunk/mediawiki/debian/mediawiki.docs
===================================================================
--- trunk/mediawiki/debian/mediawiki.docs	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.docs	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,5 @@
+docs
+RELEASE-NOTES
+FAQ
+HISTORY
+UPGRADE

Added: trunk/mediawiki/debian/mediawiki.examples
===================================================================
--- trunk/mediawiki/debian/mediawiki.examples	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.examples	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1 @@
+AdminSettings.sample

Added: trunk/mediawiki/debian/mediawiki.install
===================================================================
--- trunk/mediawiki/debian/mediawiki.install	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.install	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,3 @@
+*.php *.phtml includes index.php install-utils.inc languages maintenance skins usr/share/mediawiki
+config extensions var/lib/mediawiki
+debian/scripts/* usr/share/mediawiki/debian-scripts

Added: trunk/mediawiki/debian/mediawiki.linda-override
===================================================================
--- trunk/mediawiki/debian/mediawiki.linda-override	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.linda-override	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,2 @@
+Tag: extra-license-file
+Data: usr/share/mediawiki/includes/Licenses.php

Added: trunk/mediawiki/debian/mediawiki.links
===================================================================
--- trunk/mediawiki/debian/mediawiki.links	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.links	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,7 @@
+etc/mediawiki/LocalSettings.php var/lib/mediawiki/LocalSettings.php 
+etc/mediawiki/AdminSettings.php var/lib/mediawiki/AdminSettings.php 
+var/lib/mediawiki/LocalSettings.php usr/share/mediawiki/LocalSettings.php
+var/lib/mediawiki/AdminSettings.php usr/share/mediawiki/AdminSettings.php
+var/lib/mediawiki/config usr/share/mediawiki/config
+var/lib/mediawiki/images usr/share/mediawiki/images
+var/lib/mediawiki/extensions usr/share/mediawiki/extensions

Added: trunk/mediawiki/debian/mediawiki.postinst
===================================================================
--- trunk/mediawiki/debian/mediawiki.postinst	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.postinst	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,71 @@
+#! /bin/sh
+# postinst script for mediawiki
+#
+# see: dh_installdeb(1)
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+case "$1" in
+    configure)
+
+        db_get mediawiki/webserver || true
+	webserver=$RET
+
+	webserver=`echo $webserver|sed -e 's/,  */ /g'`
+
+	for i in $webserver; do
+	    if [ "$webserver" != "cherokee" ]; then
+		if [ ! -d /etc/$i/conf.d/ ]; then
+			install -d -m755 /etc/$i/conf.d/
+		fi
+		if [ ! -e /etc/$i/conf.d/mediawiki.conf ]; then
+			ln -s /etc/mediawiki/apache.conf \
+			/etc/$i/conf.d/mediawiki.conf
+			if [ -f /etc/init.d/$i ]; then
+				if which invoke-rc.d >/dev/null 2>&1; then
+                			invoke-rc.d $i reload
+        			else
+                			/etc/init.d/$i reload
+        			fi
+			fi
+		fi
+	     else
+		if [ ! -d /etc/cherokee/sites-available/ ]; then
+			install -d -m755 /etc/cherokee/sites-available/
+		fi
+		if [ ! -e /etc/cherokee/sites-available/mediawiki ]; then
+			ln -s /etc/mediawiki/cherokee.conf \
+			/etc/cherokee/sites-available/mediawiki
+			if [ -f /etc/init.d/$i ]; then
+				if which invoke-rc.d >/dev/null 2>&1; then
+                			invoke-rc.d $i reload
+        			else
+                			/etc/init.d/$i reload
+        			fi	
+			fi
+		fi
+	     fi
+	done
+
+        chown -R www-data:www-data /var/lib/mediawiki/config /var/lib/mediawiki/images
+        chmod 700 /var/lib/mediawiki/config /var/lib/mediawiki/images
+
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

Added: trunk/mediawiki/debian/mediawiki.postrm
===================================================================
--- trunk/mediawiki/debian/mediawiki.postrm	                        (rev 0)
+++ trunk/mediawiki/debian/mediawiki.postrm	2012-04-11 09:15:43 UTC (rev 18272)
@@ -0,0 +1,23 @@
+#! /bin/sh
+# postrm script for mediawiki
+#
+# see: dh_installdeb(1)
+
+set -e
+
+if [ -f /usr/share/debconf/confmodule ]; then
+. /usr/share/debconf/confmodule 
+fi
+
+case "$1" in
+    purge)
+	rm -rf /etc/mediawiki /var/lib/mediawiki /etc/apache*/conf.d/mediawiki.conf  /etc/cherokee/sites-available/mediawiki
+    ;;
+    *)
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,49 +1,54 @@
-diff -urN mediawiki-1.9.1.orig/config/index.php mediawiki-1.9.1/config/index.php
---- mediawiki-1.9.1.orig/config/index.php	2007-02-04 16:51:17.000000000 +0100
-+++ mediawiki-1.9.1/config/index.php	2007-02-04 17:02:53.000000000 +0100
-@@ -200,6 +200,7 @@
+--- mediawiki-1.11.0/config/index.php	2007-08-22 17:05:30.000000000 +0200
++++ mediawiki-1.11.0.debian/config/index.php	2007-10-21 21:28:34.000000000 +0200
+@@ -213,6 +213,7 @@
  	dieout( "<h2>Can't write config file, aborting</h2>
  
  	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
-+	- /var/lib/mediawiki1.10/config for normal install, custom for multisite - 
++	- /var/lib/mediawiki/config for normal install, custom for multisite - 
  	writable by the web server. Once configuration is done you'll move the created
  	<tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
  	then remove the <tt>config</tt> subdirectory entirely.</p>
-@@ -1253,18 +1254,11 @@
+@@ -1436,16 +1437,7 @@
+ <div class="success-box">
  <p>Installation successful!</p>
  <p>To complete the installation, please do the following:
- <ol>
+-<ol>
 -	<li>Download config/LocalSettings.php with your FTP client or file manager</li>
 -	<li>Upload it to the parent directory</li>
 -	<li>Delete config/LocalSettings.php</li>
--	<li>Start using <a href='../index.php'>your wiki</a>!
-+<li> Move <tt>/config/LocalSettings.php</tt> to <tt>/etc/mediawiki1.10/LocalSettings.php</tt> for normal install, root of your install for multisite, with rights 640</li>
- </ol>
+-	<li>Start using <a href='../$script'>your wiki</a>!
+-</ol>
 -<p>If you are in a shared hosting environment, do <strong>not</strong> just move LocalSettings.php
 -remotely. LocalSettings.php is currently owned by the user your webserver is running under,
 -which means that anyone on the same server can read your database password! Downloading
 -it and uploading it again will hopefully change the ownership to a user ID specific to you.</p>
++<p>Move <tt>/config/LocalSettings.php</tt> to <tt>/etc/mediawiki/LocalSettings.php</tt> for normal install, root of your install for multisite, with rights 640</p>
+ </div>
  EOT;
  	} else {
--		echo "<p><span style='font-weight:bold;color:green;font-size:110%'>Installation successful!</span> Move the <tt>config/LocalSettings.php</tt> file into the parent directory, then follow
-+		echo "<p><span style='font-weight:bold;color:green;font-size:110%'>Installation successful!</span> Move the <tt>config/LocalSettings.php</tt> file to <tt>/etc/mediawiki1.10/LocalSettings.php</tt> for normal install, root of your install for multisite, with rights 640, then follow
- 			<strong><a href='../index.php'>this link</a></strong> to your wiki.</p>\n";
- 	}
- }
-@@ -1362,6 +1356,12 @@
+@@ -1453,7 +1445,7 @@
+ <div class="success-box">
+ <p>
+ <span class="success-message">Installation successful!</span>
+-Move the <tt>config/LocalSettings.php</tt> file to the parent directory, then follow
++Move the <tt>config/LocalSettings.php</tt> file to /etc/mediawiki, then follow
+ <a href="../$script"> this link</a> to your wiki.</p>
+ <p>You should change file permissions for <tt>LocalSettings.php</tt> as required to
+ prevent other users on the server reading passwords and altering configuration data.</p>
+@@ -1554,6 +1546,12 @@
  
  # If you customize your file layout, set \$IP to the directory that contains
  # the other MediaWiki files. It will be used as a base to locate files.
 +
 +# We define this to allow the configuration file to be explicitly 
-+# located in /etc/mediawiki1.10.
++# located in /etc/mediawiki.
 +# Change this if you are setting up multisite wikis on your server.
-+define('MW_INSTALL_PATH','/var/lib/mediawiki1.10');
++define('MW_INSTALL_PATH','/var/lib/mediawiki');
 +
  if( defined( 'MW_INSTALL_PATH' ) ) {
  	\$IP = MW_INSTALL_PATH;
  } else {
-@@ -1467,6 +1467,11 @@
+@@ -1664,6 +1662,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  

Modified: trunk/mediawiki/debian/po/ar.po
===================================================================
--- trunk/mediawiki/debian/po/ar.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ar.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,4 +1,4 @@
-# translation of mediawiki1.10.po to Arabic
+# translation of mediawiki.po to Arabic
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -15,7 +15,7 @@
 # Ossama M. Khayat <okhayat at yahoo.com>, 2005, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10\n"
+"Project-Id-Version: mediawiki\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-13 12:40+0300\n"
@@ -59,10 +59,10 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
-"يمكن ترقية التثبيت آلياً. تستخدم الحزمة الجديدة /var/lib/mediawiki1.10 لقاعدة "
+"يمكن ترقية التثبيت آلياً. تستخدم الحزمة الجديدة /var/lib/mediawiki لقاعدة "
 "بيانات ويكي. تحتاج قاعدة البيانات القديمة كذلك إلى التحديث."
 
 #. Type: select
@@ -71,12 +71,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "إن اخترت القيام بترقية MediaWiki آلياً، سيتم عمل نسخة احتياطية من قاعدة "
 "البيانات، ومن ثم ترقيتها، وتجهيز ملف تهيئة جديد للنسخة الجديدة. بدلاً من ذلك، "
-"يمكنك تنفيذ هذه العملية لاحقاً بتنفيذ الأمر '/usr/share/mediawiki1.10/debian-"
+"يمكنك تنفيذ هذه العملية لاحقاً بتنفيذ الأمر '/usr/share/mediawiki/debian-"
 "scripts/upgrade-mediawiki'."
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/ca.po
===================================================================
--- trunk/mediawiki/debian/po/ca.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ca.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -59,7 +59,7 @@
 #| "upgrade."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "La nova versió del paquet utilitza /var/lib/mediawiki1.9 per a emmagatzemar "
@@ -79,7 +79,7 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Podeu fer aquesta operació automàticament: es farà una còpia de seguretat de "

Modified: trunk/mediawiki/debian/po/cs.po
===================================================================
--- trunk/mediawiki/debian/po/cs.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/cs.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -57,11 +57,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Starší instalace může být automaticky aktualizována. Nová verze balíku "
-"používá pro databázi wiki stránek adresář /var/lib/mediawiki1.10. Původní "
+"používá pro databázi wiki stránek adresář /var/lib/mediawiki. Původní "
 "databáze se také musí aktualizovat."
 
 #. Type: select
@@ -70,12 +70,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Zvolíte-li automatickou aktualizaci MediaWiki, bude databáze zazálohována, "
 "aktualizována a připraví se nový konfigurační soubor. Alternativně to můžete "
-"provést i později příkazem /usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"provést i později příkazem /usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki."
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/de.po
===================================================================
--- trunk/mediawiki/debian/po/de.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/de.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,11 +1,11 @@
-# Translation of mediawiki1.10 debconf templates to German
+# Translation of mediawiki debconf templates to German
 # Copyright (C) Kai Weber <kai.weber at glorybox.de>, 2005.
 # Copyright (C) Helge Kreutzmann <debian at helgefjell.de>, 2007.
-# This file is distributed under the same license as the mediawiki1.10 package.
+# This file is distributed under the same license as the mediawiki package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10 1.7.1-12\n"
+"Project-Id-Version: mediawiki 1.7.1-12\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-12 21:00+0200\n"
@@ -48,11 +48,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Ein automatisches Upgrade der Installation ist möglich. Die neue "
-"Paketversion verwendet /var/lib/mediawiki1.10 für die Wiki-Dateien. Die alte "
+"Paketversion verwendet /var/lib/mediawiki für die Wiki-Dateien. Die alte "
 "Datenbank muss auch aktualisiert werden."
 
 #. Type: select
@@ -61,13 +61,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Falls Sie das Upgrade automatisch durchführen lassen wollen, wird eine "
 "Sicherungskopie Ihrer Datenbank erstellt, das Upgrade durchgeführt und eine "
 "neue Konfigurationsdatei vorbereitet. Alternativ können Sie das Upgrade "
-"später mit dem Befehl »/usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"später mit dem Befehl »/usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki« durchführen."
 
 #. Type: string
@@ -126,16 +126,16 @@
 
 #~ msgid ""
 #~ "A previous bug in the mediawiki package forced configuration files to be "
-#~ "stored in /var/lib/mediawiki1.10."
+#~ "stored in /var/lib/mediawiki."
 #~ msgstr ""
 #~ "Es gab einen Fehler in älteren Versionen der Pakete, der dazu führte, das "
-#~ "Konfigurationsdateien sich zwingend in /var/lib/mediawiki1.10 befanden."
+#~ "Konfigurationsdateien sich zwingend in /var/lib/mediawiki befanden."
 
 #~ msgid ""
-#~ "These files have been moved back to /etc/mediawiki1.10 and a backup was "
+#~ "These files have been moved back to /etc/mediawiki and a backup was "
 #~ "also made in that directory."
 #~ msgstr ""
-#~ "Diese Dateien wurden nach /etc/mediawiki1.10 verschoben und eine "
+#~ "Diese Dateien wurden nach /etc/mediawiki verschoben und eine "
 #~ "Sicherungskopie dieses Verzeichnisses wurde durchgeführt."
 
 #~ msgid "You are upgrading from mediawiki1.5."
@@ -143,11 +143,11 @@
 
 #~ msgid ""
 #~ "This package will install its files in a new location:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "Then you need to upgrade your old mediawiki1.5."
 #~ msgstr ""
 #~ "Dieses Paket wird seine Dateien an dem neuen Ort installieren:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "Sie müssen dann ein Upgrade Ihres alten Mediawiki1.5 durchführen."
 
 #~ msgid "If you don't know any account, the root user is sufficient."
@@ -158,13 +158,13 @@
 
 #~ msgid ""
 #~ "This is now solved, and your configuration files can now be found at /etc/"
-#~ "mediawiki1.10. A backup has been made in case this failed, located in /"
-#~ "etc/mediawiki1.10 too."
+#~ "mediawiki. A backup has been made in case this failed, located in /"
+#~ "etc/mediawiki too."
 #~ msgstr ""
 #~ "Dies ist jetzt behoben und Ihre Konfigurationsdateien können jetzt unter /"
-#~ "etc/mediawiki1.10 gefunden werden. Eine Sicherungskopie wurde für den "
+#~ "etc/mediawiki gefunden werden. Eine Sicherungskopie wurde für den "
 #~ "Fall erstellt, dass ein Fehler passierte. Diese befindet sich auch in /"
-#~ "etc/mediawiki1.10."
+#~ "etc/mediawiki."
 
 #~ msgid "apache, apache-ssl, apache2"
 #~ msgstr "Apache, Apache-ssl, Apache2"

Modified: trunk/mediawiki/debian/po/es.po
===================================================================
--- trunk/mediawiki/debian/po/es.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/es.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,4 +1,4 @@
-# mediawiki1.10 po-debconf translation to Spanish
+# mediawiki po-debconf translation to Spanish
 # Copyright (C) 2006 Software in the Public Interest, SPI Inc.
 # This file is distributed under the same license as the mediawiki17 package.
 #
@@ -34,7 +34,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10 1.7.1-5 \n"
+"Project-Id-Version: mediawiki 1.7.1-5 \n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-13 22:40+0200\n"
@@ -79,11 +79,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Esta instalación puede actualizarse de forma automática. La nueva versión "
-"del paquete utiliza «var/lib/mediawiki1.10» para la base de datos del Wiki. "
+"del paquete utiliza «var/lib/mediawiki» para la base de datos del Wiki. "
 "También debe actualizarse la base de datos antigua."
 
 #. Type: select
@@ -92,13 +92,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Se hará una copia de seguridad de su base de datos, se actualizará, y se "
 "preparará un nuevo fichero de configuración si escoje actualizar MediaWiki "
 "de forma automática. También puede utilizar este programa más adelante "
-"ejecutando la orden «/usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"ejecutando la orden «/usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki»."
 
 #. Type: string
@@ -157,17 +157,17 @@
 
 #~ msgid ""
 #~ "A previous bug in the mediawiki package forced configuration files to be "
-#~ "stored in /var/lib/mediawiki1.10."
+#~ "stored in /var/lib/mediawiki."
 #~ msgstr ""
 #~ "Había una errata en versiones previas del paquete mediawiki que hacía que "
 #~ "los ficheros de configuración se almacenarán por error en «/var/lib/"
-#~ "mediawiki1.10»."
+#~ "mediawiki»."
 
 #~ msgid ""
-#~ "These files have been moved back to /etc/mediawiki1.10 and a backup was "
+#~ "These files have been moved back to /etc/mediawiki and a backup was "
 #~ "also made in that directory."
 #~ msgstr ""
-#~ "Se han movido los ficheros a «/etc/mediawiki1.10» y también se ha hecho "
+#~ "Se han movido los ficheros a «/etc/mediawiki» y también se ha hecho "
 #~ "una copia de seguridad en este directorio."
 
 #~ msgid "You are upgrading from mediawiki1.5."
@@ -175,11 +175,11 @@
 
 #~ msgid ""
 #~ "This package will install its files in a new location:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "Then you need to upgrade your old mediawiki1.5."
 #~ msgstr ""
 #~ "Este paquete instalará sus ficheros en una nueva ubicación:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "Una vez hecho esto deberá actualizar su antiguo mediawiki1.5."
 
 #~ msgid "If you don't know any account, the root user is sufficient."
@@ -191,10 +191,10 @@
 
 #~ msgid ""
 #~ "This is now solved, and your configuration files can now be found at /etc/"
-#~ "mediawiki1.10. A backup has been made in case this failed, located in /"
-#~ "etc/mediawiki1.10 too."
+#~ "mediawiki. A backup has been made in case this failed, located in /"
+#~ "etc/mediawiki too."
 #~ msgstr ""
 #~ "Ya se ha resuelto ese problema y debería tener sus ficheros de "
-#~ "configuración en «/etc/mediawiki1.10». Se ha realizado una copia de "
+#~ "configuración en «/etc/mediawiki». Se ha realizado una copia de "
 #~ "seguridad por si acaso esto fallara, que también está disponible en «/etc/"
-#~ "mediawiki1.10»."
+#~ "mediawiki»."

Modified: trunk/mediawiki/debian/po/eu.po
===================================================================
--- trunk/mediawiki/debian/po/eu.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/eu.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,11 +1,11 @@
-# translation of mediawiki1.10-eu.po to Euskara
+# translation of mediawiki-eu.po to Euskara
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Piarres Beobide <pi at beobide.net>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10-eu\n"
+"Project-Id-Version: mediawiki-eu\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-05-31 22:56+0200\n"
@@ -54,15 +54,15 @@
 #, fuzzy
 #| msgid ""
 #| "This installation can be upgraded automatically. The new package version  "
-#| "uses /var/lib/mediawiki1.10 for the wiki files. The old database also "
+#| "uses /var/lib/mediawiki for the wiki files. The old database also "
 #| "needs to be updated."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Instalazio automatikoki bertsio-berritu daiteke. Pakete berriaren bertsioak /"
-"var/lib/mediawiki1.10 erabiltzen du wiki fitxategietarako.  Datubase zaharra "
+"var/lib/mediawiki erabiltzen du wiki fitxategietarako.  Datubase zaharra "
 "ere eguneratu behar da"
 
 #. Type: select
@@ -71,12 +71,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Hau automatikoki egin daiteke: Datubasearen babeskopia bat egin, bertsio "
 "berritu eta konfigurazio berria prestatuko da. Bestela,  beranduago egin "
-"dezakezu hau abiaraziz: /usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"dezakezu hau abiaraziz: /usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki1.5."
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/fr.po
===================================================================
--- trunk/mediawiki/debian/po/fr.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/fr.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,6 +1,6 @@
 # translation of fr.po to
 # Copyright (C) 2007 Gabriel Laurent <lixin-anyuan at freesurf.ch>
-# This file is distributed under the same license as the mediawiki1.10 package.
+# This file is distributed under the same license as the mediawiki package.
 #
 msgid ""
 msgstr ""
@@ -48,11 +48,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Elle peut être mise à niveau automatiquement. Le nouveau paquet utilise /var/"
-"lib/mediawiki1.10 pour la base de données du wiki. Celle-ci doit être mise à "
+"lib/mediawiki pour la base de données du wiki. Celle-ci doit être mise à "
 "jour. "
 
 #. Type: select
@@ -61,14 +61,14 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Si vous choisissez d'effectuer la mise à niveau automatiquement, la base de "
 "données sera sauvegardée, mise à niveau et un nouveau fichier de "
 "configuration sera créé pour la nouvelle version. Vous pouvez également "
 "choisir d'utiliser ce script plus tard, avec la commande « /usr/share/"
-"mediawiki1.10/debian-scripts/upgrade-mediawiki »."
+"mediawiki/debian-scripts/upgrade-mediawiki »."
 
 #. Type: string
 #. Description

Modified: trunk/mediawiki/debian/po/gl.po
===================================================================
--- trunk/mediawiki/debian/po/gl.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/gl.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,10 +1,10 @@
-# Galician translation of mediawiki1.10's debconf templates
-# This file is distributed under the same license as the mediawiki1.10 package.
+# Galician translation of mediawiki's debconf templates
+# This file is distributed under the same license as the mediawiki package.
 # Jacobo Tarrio <jtarrio at debian.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10\n"
+"Project-Id-Version: mediawiki\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-12 23:54+0200\n"
@@ -47,11 +47,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Pódese actualizar automaticamente esta instalación. A nova versión do "
-"paquete emprega /var/lib/mediawiki1.10 para os ficheiros do wiki. Tamén é "
+"paquete emprega /var/lib/mediawiki para os ficheiros do wiki. Tamén é "
 "preciso actualizar a base de datos antiga."
 
 #. Type: select
@@ -60,12 +60,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Se elixe actualizar MediaWiki automaticamente, hase copiar e actualizar a "
 "base de datos, e tamén se ha preparar un novo ficheiro de configuración. De "
-"xeito alternativo, pode facelo despois coa orde \"/usr/share/mediawiki1.10/"
+"xeito alternativo, pode facelo despois coa orde \"/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki\"."
 
 #. Type: string
@@ -124,14 +124,14 @@
 
 #~ msgid ""
 #~ "A previous bug in the mediawiki package forced configuration files to be "
-#~ "stored in /var/lib/mediawiki1.10."
+#~ "stored in /var/lib/mediawiki."
 #~ msgstr ""
 #~ "Un erro anterior no paquete mediawiki obrigou a gravar os ficheiros de "
-#~ "configuración en /var/lib/mediawiki1.10."
+#~ "configuración en /var/lib/mediawiki."
 
 #~ msgid ""
-#~ "These files have been moved back to /etc/mediawiki1.10 and a backup was "
+#~ "These files have been moved back to /etc/mediawiki and a backup was "
 #~ "also made in that directory."
 #~ msgstr ""
-#~ "Trasladáronse eses ficheiros a /etc/mediawiki1.10 e tamén se fixo unha "
+#~ "Trasladáronse eses ficheiros a /etc/mediawiki e tamén se fixo unha "
 #~ "copia de seguridade nese directorio."

Modified: trunk/mediawiki/debian/po/it.po
===================================================================
--- trunk/mediawiki/debian/po/it.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/it.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,11 +1,11 @@
-# Italian (it) translation of debconf templates for mediawiki1.10
+# Italian (it) translation of debconf templates for mediawiki
 # Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mediawiki1.10 package.
+# This file is distributed under the same license as the mediawiki package.
 # Luca Monducci <luca.mo at tiscali.it>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10 italian debconf templates\n"
+"Project-Id-Version: mediawiki italian debconf templates\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-23 11:52+0200\n"
@@ -47,11 +47,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Questa installazione può essere aggiornata automaticamente. La nuova "
-"versione del pacchetto usa /var/lib/mediawiki1.10 per i file del wiki. "
+"versione del pacchetto usa /var/lib/mediawiki per i file del wiki. "
 "Inoltre deve essere aggiornato anche il vecchio database."
 
 #. Type: select
@@ -60,13 +60,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Scegliendo di aggiornare MediaWiki automaticamente, prima viene fatto il "
 "backup e poi l'aggiornamento del database inoltre viene preparato un nuovo "
 "file di configurazione. In alternativa è possibile effettuare "
-"l'aggiornamento in seguito utilizzando il comando \"/usr/share/mediawiki1.10/"
+"l'aggiornamento in seguito utilizzando il comando \"/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki\"."
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/ja.po
===================================================================
--- trunk/mediawiki/debian/po/ja.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ja.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -48,7 +48,7 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 
@@ -59,7 +59,7 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "このパッケージでは、アップグレードを自動的に行うスクリプトが提供されていま"

Modified: trunk/mediawiki/debian/po/ml.po
===================================================================
--- trunk/mediawiki/debian/po/ml.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ml.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -55,7 +55,7 @@
 #| "upgrade."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "പുതിയ പാക്കേജ് ലക്കം വിക്കി ‍ഡാറ്റാബേസിനു വേണ്ടി  /var/lib/mediawiki1.7 ഉപയോഗിക്കുന്നു."
@@ -74,7 +74,7 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "ഈ പ്രവര്‍ത്തനം സ്വതേ ചെയ്യാവുന്നതാണ്: ഡാറ്റാബേസ് പകര്‍പ്പ് സൂക്ഷിക്കുകയും, പുതുക്കുകയും, പുതിയ "

Modified: trunk/mediawiki/debian/po/nl.po
===================================================================
--- trunk/mediawiki/debian/po/nl.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/nl.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -53,15 +53,15 @@
 #, fuzzy
 #| msgid ""
 #| "This installation can be upgraded automatically. The new package version  "
-#| "uses /var/lib/mediawiki1.10 for the wiki files. The old database also "
+#| "uses /var/lib/mediawiki for the wiki files. The old database also "
 #| "needs to be updated."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Deze installatie kan automatisch opgewaardeerd worden. Het nieuwe pakket "
-"gebruikt /var/lib/mediawiki1.10 voor de wiki-bestanden. De oude database "
+"gebruikt /var/lib/mediawiki voor de wiki-bestanden. De oude database "
 "dient ook opgewaardeerd te worden."
 
 #. Type: select
@@ -70,13 +70,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Als u deze operatie automatisch laat uitvoeren wordt er een reservekopie van "
 "uw database gemaakt, vervolgens wordt de database opgewaardeerd en er wordt "
 "een nieuw configuratiebestand aangemaakt voor de nieuwe versie. U kunt ook "
-"later doen via het commando '/usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"later doen via het commando '/usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki'."
 
 #. Type: string
@@ -147,16 +147,16 @@
 
 #~ msgid ""
 #~ "A previous bug in the mediawiki package forced configuration files to be "
-#~ "stored in /var/lib/mediawiki1.10."
+#~ "stored in /var/lib/mediawiki."
 #~ msgstr ""
 #~ "Eerdere pakketten hadden een bug waardoor de configuratiebestanden in /"
-#~ "var/lib/mediawiki1.10 werden opgeslagen."
+#~ "var/lib/mediawiki werden opgeslagen."
 
 #~ msgid ""
-#~ "These files have been moved back to /etc/mediawiki1.10 and a backup was "
+#~ "These files have been moved back to /etc/mediawiki and a backup was "
 #~ "also made in that directory."
 #~ msgstr ""
-#~ "Deze bestanden zijn teruggeplaatst naar /etc/mediawiki1.10 en er is een "
+#~ "Deze bestanden zijn teruggeplaatst naar /etc/mediawiki en er is een "
 #~ "reservekopie gemaakt in diezelfde map."
 
 #~ msgid "You are upgrading from mediawiki1.5."
@@ -164,11 +164,11 @@
 
 #~ msgid ""
 #~ "This package will install its files in a new location:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "Then you need to upgrade your old mediawiki1.5."
 #~ msgstr ""
 #~ "Dit pakket installeert zijn bestanden in een nieuwe locatie:\n"
-#~ " /var/lib/mediawiki1.10\n"
+#~ " /var/lib/mediawiki\n"
 #~ "U dient vervolgens uw oude mediawiki1.5 op te waarderen."
 
 #~ msgid "If you don't know any account, the root user is sufficient."
@@ -180,9 +180,9 @@
 
 #~ msgid ""
 #~ "This is now solved, and your configuration files can now be found at /etc/"
-#~ "mediawiki1.10. A backup has been made in case this failed, located in /"
-#~ "etc/mediawiki1.10 too."
+#~ "mediawiki. A backup has been made in case this failed, located in /"
+#~ "etc/mediawiki too."
 #~ msgstr ""
 #~ "Deze bug is nu opgelost en uw configuratiebestanden vindt u in /etc/"
-#~ "mediawiki1.10 . Voor de zekerheid is er een reservekopie gemaakt ,  u "
-#~ "vindt deze in /etc/mediawiki1.10 ."
+#~ "mediawiki . Voor de zekerheid is er een reservekopie gemaakt ,  u "
+#~ "vindt deze in /etc/mediawiki ."

Modified: trunk/mediawiki/debian/po/pt.po
===================================================================
--- trunk/mediawiki/debian/po/pt.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/pt.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -1,10 +1,10 @@
-# Portuguese translation for mediawiki1.10 debconf messages.
+# Portuguese translation for mediawiki debconf messages.
 # This file is distributed under the same license as the mediawiki package.
 # Luísa Lourenço <kikentai at gmail.com>, 2006
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10\n"
+"Project-Id-Version: mediawiki\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-04-30 23:40+0100\n"
@@ -47,11 +47,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Esta instalação pode ser actualizada automaticamente. A nova versão do "
-"pacote usa o /var/lib/mediawiki1.10 para os ficheiros da wiki. A base de "
+"pacote usa o /var/lib/mediawiki para os ficheiros da wiki. A base de "
 "dados antiga também precisa de ser actualizada."
 
 #. Type: select
@@ -60,13 +60,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Se escolher actualizar o MediaWiki automaticamente, a base de dados será "
 "salvaguardada, actualizada, e um novo ficheiro de configuração será "
 "preparado. Alternativamente, poderá efectuá-la mais tarde com o comando '/"
-"usr/share/mediawiki1.10/debian-scripts/upgrade-mediawiki'."
+"usr/share/mediawiki/debian-scripts/upgrade-mediawiki'."
 
 #. Type: string
 #. Description

Modified: trunk/mediawiki/debian/po/pt_BR.po
===================================================================
--- trunk/mediawiki/debian/po/pt_BR.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/pt_BR.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -56,7 +56,7 @@
 #| "upgrade."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "A nova versão do pacote usa /var/lib/mediawiki1.9 para a base de dados do "
@@ -76,7 +76,7 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Esta operação pode ser feita automaticamente: a base de dados será copiada, "

Modified: trunk/mediawiki/debian/po/ru.po
===================================================================
--- trunk/mediawiki/debian/po/ru.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ru.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -49,11 +49,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "При установке может быть выполнено автоматическое обновление. В новой версии "
-"пакета для wiki-файлов используется каталог /var/lib/mediawiki1.10. Старую "
+"пакета для wiki-файлов используется каталог /var/lib/mediawiki. Старую "
 "базу данных также необходимо обновить."
 
 #. Type: select
@@ -62,13 +62,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Если вы выберете автоматическое обновление MediaWiki, будет выполнено "
 "резервное копирование базы данных, обновление и подготовка нового файла "
 "конфигурации. Или же вы можете сделать это позднее с помощью команды '/usr/"
-"share/mediawiki1.10/debian-scripts/upgrade-mediawiki'."
+"share/mediawiki/debian-scripts/upgrade-mediawiki'."
 
 #. Type: string
 #. Description

Modified: trunk/mediawiki/debian/po/sk.po
===================================================================
--- trunk/mediawiki/debian/po/sk.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/sk.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -45,11 +45,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Je možné vykonať automatický upgradetejto inštalácie. Nová verzia balíka "
-"používa /var/lib/mediawiki1.10 pre súbory wiki. Je tiež potrebné "
+"používa /var/lib/mediawiki pre súbory wiki. Je tiež potrebné "
 "aktualizovať starú databázu."
 
 #. Type: select
@@ -58,12 +58,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Ak si vyberiete automatický upgrade MediaWiki, databáza bude zálohovaná, "
 "vykoná sa upgrade, a pripraví sa nový konfiguračný súbor. Môžete to tiež "
-"urobiť neskôr pomocou príkazu '/usr/share/mediawiki1.10/debian-scripts/"
+"urobiť neskôr pomocou príkazu '/usr/share/mediawiki/debian-scripts/"
 "upgrade-mediawiki'."
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/sv.po
===================================================================
--- trunk/mediawiki/debian/po/sv.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/sv.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -58,15 +58,15 @@
 #, fuzzy
 #| msgid ""
 #| "This installation can be upgraded automatically. The new package version  "
-#| "uses /var/lib/mediawiki1.10 for the wiki files. The old database also "
+#| "uses /var/lib/mediawiki for the wiki files. The old database also "
 #| "needs to be updated."
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Den här installationen kan uppgraderas automatiskt. Den nya paketversionen "
-"använder /var/lib/mediawiki1.10 för wikifilerna. Den gamla databasen behöver "
+"använder /var/lib/mediawiki för wikifilerna. Den gamla databasen behöver "
 "också uppdateras."
 
 #. Type: select
@@ -75,13 +75,13 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Om du väljer att automatiskt uppgradera MediaWiki kommer databasen att "
 "säkerhetskopieras, uppgraderas och en ny konfigurationsfil kommer att "
 "förberedas. Alternativt kan du genomföra den senare med kommandot \"/usr/"
-"share/mediawiki1.10/debian-scripts/upgrade-mediawiki\"."
+"share/mediawiki/debian-scripts/upgrade-mediawiki\"."
 
 #. Type: string
 #. Description

Modified: trunk/mediawiki/debian/po/ta.po
===================================================================
--- trunk/mediawiki/debian/po/ta.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/ta.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -48,11 +48,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "இந்த நிறுவலை தானியங்கியாக மேம்படுத்த இயலும். புதிய பொதி பதிப்பு விகி கோப்புகளுக்கு /"
-"var/lib/mediawiki1.10 ஐ பயன்படுத்துகிறது.பழைய தரவுத்தளமும் புதிப்பிக்க பட வேண்டும்"
+"var/lib/mediawiki ஐ பயன்படுத்துகிறது.பழைய தரவுத்தளமும் புதிப்பிக்க பட வேண்டும்"
 
 #. Type: select
 #. Description
@@ -60,12 +60,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "தானியங்கியாக மேம்படுத்தலை தேர்ந்தெடுத்தால் தரவுத்தளம் காப்பு பிரதி எடுக்கப்பட்டு, "
 "மேம்படுத்தப்பட்டு, புதிய வடிவமைப்பு கோப்பும் உருவாகப்படும். மாறாக நீங்கள் பின்னால் அதை ''/"
-"usr/share/mediawiki1.10/'debian-scripts/upgrade-mediawiki' கட்டளை மூலம் "
+"usr/share/mediawiki/'debian-scripts/upgrade-mediawiki' கட்டளை மூலம் "
 "செய்யலாம். "
 
 #. Type: string

Modified: trunk/mediawiki/debian/po/templates.pot
===================================================================
--- trunk/mediawiki/debian/po/templates.pot	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/templates.pot	2012-04-11 09:15:43 UTC (rev 18272)
@@ -47,7 +47,7 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 
@@ -57,7 +57,7 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 

Modified: trunk/mediawiki/debian/po/vi.po
===================================================================
--- trunk/mediawiki/debian/po/vi.po	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/po/vi.po	2012-04-11 09:15:43 UTC (rev 18272)
@@ -4,7 +4,7 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mediawiki1.10\n"
+"Project-Id-Version: mediawiki\n"
 "Report-Msgid-Bugs-To: pkg-mediawiki-devel at lists.alioth.debian.org\n"
 "POT-Creation-Date: 2007-06-12 18:25+0200\n"
 "PO-Revision-Date: 2007-06-14 16:36+0930\n"
@@ -48,11 +48,11 @@
 #: ../templates:3001
 msgid ""
 "This installation can be upgraded automatically. The new package version "
-"uses /var/lib/mediawiki1.10 for the wiki files. The old database also needs "
+"uses /var/lib/mediawiki for the wiki files. The old database also needs "
 "to be updated."
 msgstr ""
 "Bản cài đặt này có thể tự động được nâng cấp. Phiên bản gói mới dùng « /var/"
-"lib/mediawiki1.10 » cho các tập tin wiki. Cơ sở dữ liệu cũ cũng cần phải "
+"lib/mediawiki » cho các tập tin wiki. Cơ sở dữ liệu cũ cũng cần phải "
 "được cập nhật."
 
 #. Type: select
@@ -61,12 +61,12 @@
 msgid ""
 "If you choose to upgrade MediaWiki automatically, the database will be "
 "backed up, upgraded, and a new configuration file will be prepared. "
-"Alternatively, you can perform it later with the '/usr/share/mediawiki1.10/"
+"Alternatively, you can perform it later with the '/usr/share/mediawiki/"
 "debian-scripts/upgrade-mediawiki' command."
 msgstr ""
 "Nếu bạn chọn nâng cấp MediaWiki một cách tự động, cơ sở dữ liệu sẽ được sao "
 "lưu và nâng cấp, và tập tin cấu hình mới được chuẩn bị. Hoặc bạn có thể nâng "
-"cấp về sau, bằng lệnh « /usr/share/mediawiki1.10/debian-scripts/upgrade-"
+"cấp về sau, bằng lệnh « /usr/share/mediawiki/debian-scripts/upgrade-"
 "mediawiki »."
 
 #. Type: string

Modified: trunk/mediawiki/debian/rules
===================================================================
--- trunk/mediawiki/debian/rules	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/rules	2012-04-11 09:15:43 UTC (rev 18272)
@@ -9,10 +9,10 @@
 #   DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 # Then check manually if everything's ok
 
-DEB_DH_SHLIBDEPS_ARGS :=  -Xdebian/mediawiki1.10-math/usr/bin/texvc.bc
+DEB_DH_SHLIBDEPS_ARGS :=  -Xdebian/mediawiki-math/usr/bin/texvc.bc
 
 
-build/mediawiki1.10-math:: $(MANPAGES)
+build/mediawiki-math:: $(MANPAGES)
 	if [ -x /usr/bin/ocamlopt ]; then\
 		make -C math texvc;\
 	else\
@@ -23,38 +23,37 @@
 %.1: %.xml
 	xsltproc -nonet -o $@ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
 
-binary-install/mediawiki1.10::
-	cp -rf $(CURDIR)/debian/etc/* $(CURDIR)/debian/mediawiki1.10/etc/mediawiki1.10
-	chmod a+x debian/mediawiki1.10/usr/share/mediawiki1.10/maintenance/fetchInterwiki.pl
-	chmod a+x debian/mediawiki1.10/usr/share/mediawiki1.10/maintenance/delete-idle-wiki-users.pl
-	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\)" | \
+binary-install/mediawiki::
+	cp -rf $(CURDIR)/debian/etc/* $(CURDIR)/debian/mediawiki/etc/mediawiki
+	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/fetchInterwiki.pl
+	chmod a+x debian/mediawiki/usr/share/mediawiki/debian-scripts/*
+	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/compare_schemas.pl
+	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/postgres/mediawiki_mysql2postgres.pl
+	find debian/mediawiki/usr/share/mediawiki -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/#`"; \
+		dh_link "`echo "$$i" | sed -e s#debian/mediawiki/##`" \
+		"`echo "$$i" | sed -e s#debian/mediawiki/usr/share/mediawiki/#var/lib/mediawiki/#`"; \
 	done
 	# Remove Makefiles
-	find debian/mediawiki1.10/ -iname makefile -exec rm {} \;
+	find debian/mediawiki/ -iname makefile -exec rm {} \;
 	# License added to copyright file:
-	rm -rf debian/mediawiki1.10/usr/share/mediawiki1.10/skins/common/images/icons/COPYING
+	rm -rf debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
 	# Add linda override about a class called Licence.php
-	cp $(CURDIR)/debian/mediawiki1.10.linda-override $(CURDIR)/debian/mediawiki1.10/usr/share/linda/overrides/mediawiki1.10
+	cp $(CURDIR)/debian/mediawiki.linda-override $(CURDIR)/debian/mediawiki/usr/share/linda/overrides/mediawiki
 
-binary-install/mediawiki1.10-math::
+binary-install/mediawiki-math::
 	if [ -x /usr/bin/ocamlopt ]; then\
-		echo "interpreter:Depends=" >> debian/mediawiki1.10-math.substvars;\
+		echo "interpreter:Depends=" >> debian/mediawiki-math.substvars;\
 	else\
-		echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki1.10-math.substvars;\
+		echo "interpreter:Depends=ocaml-base-nox" >> debian/mediawiki-math.substvars;\
 	fi
 
 
-binary-predeb/mediawiki1.10::
-	find debian/mediawiki1.10 -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
+binary-predeb/mediawiki::
+	find debian/mediawiki -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
 
-binary-predeb/mediawiki1.10-math::
-	find debian/mediawiki1.10-math -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
+binary-predeb/mediawiki-math::
+	find debian/mediawiki-math -depth \( -name ".cvsignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
 
 clean::
 	rm -f $(MANPAGES)

Modified: trunk/mediawiki/debian/templates
===================================================================
--- trunk/mediawiki/debian/templates	2012-04-11 09:15:42 UTC (rev 18271)
+++ trunk/mediawiki/debian/templates	2012-04-11 09:15:43 UTC (rev 18272)
@@ -7,7 +7,7 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: mediawiki1.10/webserver
+Template: mediawiki/webserver
 Type: multiselect
 Choices: apache, apache-ssl, apache2, cherokee
 Default: apache2
@@ -15,37 +15,3 @@
  Please select the web server(s) that should be configured
  automatically for MediaWiki.
 
-Template: mediawiki1.10/upgrade
-Type: select
-Choices: ${list}
-Default: none
-_Description: Perform upgrade from:
- An older version of MediaWiki is installed.
- .
- This installation can be upgraded automatically. The new package version
- uses /var/lib/mediawiki1.10 for the wiki files.
- The old database also needs to be updated.
- .
- If you choose to upgrade MediaWiki automatically, the database will
- be backed up, upgraded, and a new configuration file will be
- prepared. Alternatively, you can perform it later with the
- '/usr/share/mediawiki1.10/debian-scripts/upgrade-mediawiki' command.
-
-Template: mediawiki1.10/upgrade-adminuser
-Type: string
-Default: root
-_Description: MediaWiki database administrative user:
- Please provide a MySQL account that has administrative access to the
- old MediaWiki database.
- .
- When in doubt, the MySQL root account can be used.
- .
- An AdminSettings.php file will be generated unless the root account is
- specified.
-
-Template: mediawiki1.10/upgrade-adminpass
-Type: password
-Default:
-_Description: MediaWiki database administrative password:
- Please specify the password of the MySQL account with administrative
- access to the old MediaWiki database.



More information about the evolvis-commits mailing list