[evolvis-commits] r18561: Begin preparation for MW 1.17.0: Remove patches integrated upstream and refresh what\'s left

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Sep 20 14:22:33 CEST 2012


Author: mirabilos
Date: 2012-09-20 14:22:32 +0200 (Thu, 20 Sep 2012)
New Revision: 18561

Added:
   trunk/mediawiki/
Removed:
   trunk/mediawiki/
   trunk/mediawiki/debian/patches/CVE-2011-0003.patch
   trunk/mediawiki/debian/patches/CVE-2011-0047.patch
   trunk/mediawiki/debian/patches/add_rss_guid.patch
   trunk/mediawiki/debian/patches/backup_documentation.patch
   trunk/mediawiki/debian/patches/debian_specific_config.patch
   trunk/mediawiki/debian/patches/detect_invalid_titles.patch
   trunk/mediawiki/debian/patches/fix_datetime.patch
Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/mimetypes.patch
   trunk/mediawiki/debian/patches/series
   trunk/mediawiki/debian/patches/texvc_location.patch
Log:
Begin preparation for MW 1.17.0: Remove patches integrated upstream and refresh what\'s left

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:46 UTC (rev 18317)
+++ trunk/mediawiki/debian/changelog	2012-09-20 12:22:32 UTC (rev 18561)
@@ -1,3 +1,9 @@
+mediawiki (1:1.17.0-1) UNRELEASED; urgency=low
+
+  * Remove patches integrated upstream in this version
+
+ -- Jonathan Wiltshire <jmw at debian.org>  Sun, 24 Jul 2011 14:43:22 +0100
+
 mediawiki (1:1.15.5-4) UNRELEASED; urgency=low
 
   [ Thorsten Glaser ]

Modified: trunk/mediawiki/debian/patches/mimetypes.patch
===================================================================
--- trunk/mediawiki/debian/patches/mimetypes.patch	2012-04-11 09:16:46 UTC (rev 18317)
+++ trunk/mediawiki/debian/patches/mimetypes.patch	2012-09-20 12:22:32 UTC (rev 18561)
@@ -2,14 +2,15 @@
 ===================================================================
 --- mediawiki-1.15.2.orig/includes/DefaultSettings.php	2010-03-15 12:01:58.000000000 -0500
 +++ mediawiki-1.15.2/includes/DefaultSettings.php	2010-03-15 12:01:58.000000000 -0500
-@@ -350,8 +350,8 @@
- $wgVerifyMimeType= true;
+@@ -825,8 +825,8 @@
+ $wgVerifyMimeType = true;
  
  /** Sets the mime type definition file to use by MimeMagic.php. */
--$wgMimeTypeFile= "includes/mime.types";
+-$wgMimeTypeFile = "includes/mime.types";
++#$wgMimeTypeFile= "includes/mime.types";
 -#$wgMimeTypeFile= "/etc/mime.types";
-+#$wgMimeTypeFile= "includes/mime.types";
-+$wgMimeTypeFile= "/etc/mime.types";
- #$wgMimeTypeFile= NULL; #use built-in defaults only.
++$wgMimeTypeFile = "/etc/mime.types";
+ #$wgMimeTypeFile= null; #use built-in defaults only.
  
  /** Sets the mime type info file to use by MimeMagic.php. */
+

Modified: trunk/mediawiki/debian/patches/series
===================================================================
--- trunk/mediawiki/debian/patches/series	2012-04-11 09:16:46 UTC (rev 18317)
+++ trunk/mediawiki/debian/patches/series	2012-09-20 12:22:32 UTC (rev 18561)
@@ -1,11 +1,4 @@
 texvc_location.patch
 mimetypes.patch
-debian_specific_config.patch
-detect_invalid_titles.patch
-add_rss_guid.patch
-backup_documentation.patch
 suppress_warnings.patch
-CVE-2011-0003.patch
-fix_datetime.patch
-CVE-2011-0047.patch
 fix_invalid_sql.patch

Modified: trunk/mediawiki/debian/patches/texvc_location.patch
===================================================================
--- trunk/mediawiki/debian/patches/texvc_location.patch	2012-04-11 09:16:46 UTC (rev 18317)
+++ trunk/mediawiki/debian/patches/texvc_location.patch	2012-09-20 12:22:32 UTC (rev 18561)
@@ -2,12 +2,12 @@
 ===================================================================
 --- mediawiki-1.15.2.orig/includes/DefaultSettings.php	2010-03-08 16:52:50.000000000 -0600
 +++ mediawiki-1.15.2/includes/DefaultSettings.php	2010-03-15 12:03:01.000000000 -0500
-@@ -1737,7 +1737,7 @@
+@@ -3714,7 +3714,7 @@
   */
  $wgUseTeX = false;
  /** Location of the texvc binary */
--$wgTexvc = './math/texvc';
+-$wgTexvc = $IP . '/math/texvc';
 +$wgTexvc = '/usr/bin/texvc';
- 
- #
- # Profiling / debugging
+ /**
+   * Texvc background color
+   * use LaTeX color format as used in \special function



More information about the evolvis-commits mailing list