[evolvis-commits] r18287: Prepared 1.13.0..

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:16:07 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:16:07 +0200 (Wed, 11 Apr 2012)
New Revision: 18287

Removed:
   trunk/mediawiki/debian/mediawiki.linda-override
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/control
   trunk/mediawiki/debian/control.in
   trunk/mediawiki/debian/mediawiki.dirs
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/patches/fix_postgre.patch
   trunk/mediawiki/debian/patches/mimetypes.patch
   trunk/mediawiki/debian/patches/texvc_location.patch
   trunk/mediawiki/debian/rules
   trunk/mediawiki/debian/watch
Log:
Prepared 1.13.0..

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,3 +1,14 @@
+mediawiki (1:1.13.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed watch file. Closes: #490009
+  * Refreshed patches
+  * Bumped standard-version to 3.8.0
+  * Fixed latex-related dependencies in mediawiki-math
+  * Removed obsolete linda override, thanks lintian !
+
+ -- Romain Beauxis <toots at rastageeks.org>  Sun, 17 Aug 2008 11:01:43 +0200
+
 mediawiki (1:1.12.0-2) unstable; urgency=low
 
   * Fixed postgresql dependency

Modified: trunk/mediawiki/debian/control
===================================================================
--- trunk/mediawiki/debian/control	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/control	2012-04-11 09:16:07 UTC (rev 18287)
@@ -5,7 +5,7 @@
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: mediawiki
 Architecture: all
@@ -25,9 +25,9 @@
 
 Package: mediawiki-math
 Architecture: any
-Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
+Depends: ${interpreter:Depends}, texlive-latex-base, ghostscript, imagemagick, ${shlibs:Depends}
 Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
-Recommends: mediawiki, latex-cjk-all, tetex-extra
+Recommends: mediawiki, latex-cjk-all, texlive-latex-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:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/control.in	2012-04-11 09:16:07 UTC (rev 18287)
@@ -5,7 +5,7 @@
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Build-Depends: @cdbs@, ocaml-nox | ocaml, xsltproc, docbook-xml, docbook-xsl, po-debconf
 Homepage: http://www.mediawiki.org/
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 
 Package: mediawiki
 Architecture: all
@@ -25,9 +25,9 @@
 
 Package: mediawiki-math
 Architecture: any
-Depends: ${interpreter:Depends}, tetex-bin | texlive-latex-base, gs-gpl | gs-esp, imagemagick, ${shlibs:Depends}
+Depends: ${interpreter:Depends}, texlive-latex-base, ghostscript, imagemagick, ${shlibs:Depends}
 Replaces: mediawiki1.5-math, mediawiki1.9-math, mediawiki1.10-math
-Recommends: mediawiki, latex-cjk-all, tetex-extra
+Recommends: mediawiki, latex-cjk-all, texlive-latex-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/mediawiki.dirs
===================================================================
--- trunk/mediawiki/debian/mediawiki.dirs	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/mediawiki.dirs	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,3 +1,2 @@
 var/lib/mediawiki/images
 etc/mediawiki
-usr/share/linda/overrides/

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.12.0/config/index.php
+Index: mediawiki-1.13.0/config/index.php
 ===================================================================
---- mediawiki-1.12.0.orig/config/index.php	2008-03-20 23:08:49.000000000 +0100
-+++ mediawiki-1.12.0/config/index.php	2008-03-24 02:31:45.000000000 +0100
-@@ -212,7 +212,7 @@
+--- mediawiki-1.13.0.orig/config/index.php	2008-07-20 16:29:04.000000000 +0200
++++ mediawiki-1.13.0/config/index.php	2008-08-17 11:12:07.000000000 +0200
+@@ -223,7 +223,7 @@
  if( !is_writable( "." ) ) {
  	dieout( "<h2>Can't write config file, aborting</h2>
  
@@ -11,7 +11,7 @@
  	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>
-@@ -1454,16 +1454,7 @@
+@@ -1472,16 +1472,7 @@
  <div class="success-box">
  <p>Installation successful!</p>
  <p>To complete the installation, please do the following:
@@ -29,7 +29,7 @@
  </div>
  EOT;
  	} else {
-@@ -1471,7 +1462,7 @@
+@@ -1489,7 +1480,7 @@
  <div class="success-box">
  <p>
  <span class="success-message">Installation successful!</span>
@@ -38,7 +38,7 @@
  <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>
-@@ -1579,6 +1570,12 @@
+@@ -1630,6 +1621,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.
@@ -51,7 +51,7 @@
  if( defined( 'MW_INSTALL_PATH' ) ) {
  	\$IP = MW_INSTALL_PATH;
  } else {
-@@ -1689,6 +1686,11 @@
+@@ -1724,6 +1721,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  

Modified: trunk/mediawiki/debian/patches/fix_postgre.patch
===================================================================
--- trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/patches/fix_postgre.patch	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.12.0/includes/DatabasePostgres.php
+Index: mediawiki-1.13.0/includes/db/DatabasePostgres.php
 ===================================================================
---- mediawiki-1.12.0.orig/includes/DatabasePostgres.php	2008-03-20 23:08:48.000000000 +0100
-+++ mediawiki-1.12.0/includes/DatabasePostgres.php	2008-03-24 02:30:29.000000000 +0100
-@@ -93,6 +93,44 @@
+--- mediawiki-1.13.0.orig/includes/db/DatabasePostgres.php	2008-07-24 14:42:19.000000000 +0200
++++ mediawiki-1.13.0/includes/db/DatabasePostgres.php	2008-08-17 11:17:12.000000000 +0200
+@@ -89,6 +89,44 @@
  
  	}
  

Modified: trunk/mediawiki/debian/patches/mimetypes.patch
===================================================================
--- trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,15 +1,15 @@
-Index: mediawiki-1.12.0/includes/DefaultSettings.php
+Index: mediawiki-1.13.0/includes/DefaultSettings.php
 ===================================================================
---- mediawiki-1.12.0.orig/includes/DefaultSettings.php	2008-03-24 02:30:29.000000000 +0100
-+++ mediawiki-1.12.0/includes/DefaultSettings.php	2008-03-24 02:30:29.000000000 +0100
-@@ -349,8 +349,8 @@
- /** Sets the mime type definition file to use by MimeMagic.php.
- * @global string $wgMimeTypeFile
- */
+--- mediawiki-1.13.0.orig/includes/DefaultSettings.php	2008-08-17 11:10:34.000000000 +0200
++++ mediawiki-1.13.0/includes/DefaultSettings.php	2008-08-17 11:11:45.000000000 +0200
+@@ -343,8 +343,8 @@
+ $wgVerifyMimeType= true;
+ 
+ /** Sets the mime type definition file to use by MimeMagic.php. */
 -$wgMimeTypeFile= "includes/mime.types";
 -#$wgMimeTypeFile= "/etc/mime.types";
 +#$wgMimeTypeFile= "includes/mime.types";
 +$wgMimeTypeFile= "/etc/mime.types";
  #$wgMimeTypeFile= NULL; #use built-in defaults only.
  
- /** Sets the mime type info file to use by MimeMagic.php.
+ /** Sets the mime type info file to use by MimeMagic.php. */

Modified: trunk/mediawiki/debian/patches/texvc_location.patch
===================================================================
--- trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:07 UTC (rev 18287)
@@ -1,8 +1,8 @@
-Index: mediawiki-1.12.0/includes/DefaultSettings.php
+Index: mediawiki-1.13.0/includes/DefaultSettings.php
 ===================================================================
---- mediawiki-1.12.0.orig/includes/DefaultSettings.php	2008-03-20 23:08:48.000000000 +0100
-+++ mediawiki-1.12.0/includes/DefaultSettings.php	2008-03-24 02:32:07.000000000 +0100
-@@ -1530,7 +1530,7 @@
+--- mediawiki-1.13.0.orig/includes/DefaultSettings.php	2008-08-17 11:10:06.000000000 +0200
++++ mediawiki-1.13.0/includes/DefaultSettings.php	2008-08-17 11:10:24.000000000 +0200
+@@ -1606,7 +1606,7 @@
   */
  $wgUseTeX = false;
  /** Location of the texvc binary */

Modified: trunk/mediawiki/debian/rules
===================================================================
--- trunk/mediawiki/debian/rules	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/rules	2012-04-11 09:16:07 UTC (rev 18287)
@@ -28,7 +28,6 @@
 	chmod a+x debian/mediawiki/usr/share/mediawiki/maintenance/fetchInterwiki.pl
 	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
-	chmod -x debian/mediawiki/usr/share/mediawiki/includes/SpecialProtectedtitles.php
 	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/mediawiki/##`" \
@@ -37,9 +36,8 @@
 	# Remove Makefiles
 	find debian/mediawiki/ -iname makefile -exec rm {} \;
 	# License added to copyright file:
-	rm -rf debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
-	# Add linda override about a class called Licence.php
-	cp $(CURDIR)/debian/mediawiki.linda-override $(CURDIR)/debian/mediawiki/usr/share/linda/overrides/mediawiki
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/icons/COPYING
+	rm -f debian/mediawiki/usr/share/mediawiki/skins/common/images/cyrl/LICENSE
 
 binary-install/mediawiki-math::
 	if [ -x /usr/bin/ocamlopt ]; then\

Modified: trunk/mediawiki/debian/watch
===================================================================
--- trunk/mediawiki/debian/watch	2012-04-11 09:16:06 UTC (rev 18286)
+++ trunk/mediawiki/debian/watch	2012-04-11 09:16:07 UTC (rev 18287)
@@ -4,8 +4,8 @@
 # See uscan(1) for format
 
 # Compulsory line, this is a version 3 file
-version=2
+version=3
 
 # Uncomment to examine a Webserver directory
-http://prdownloads.sourceforge.net/wikipedia/mediawiki-(1\.7\.\d*)\.tar\.gz
+http://www.mediawiki.org/wiki/Download http://download.wikimedia.org/mediawiki/.*/mediawiki-(.*).tar.gz
 



More information about the evolvis-commits mailing list