[Pkg-mediawiki-commits] r515 - in mediawiki: branches/wheezy/debian trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2014-02-10 08:37:03 +0000 (Mon, 10 Feb 2014)
New Revision: 515

Modified:
   mediawiki/branches/wheezy/debian/changelog
   mediawiki/branches/wheezy/debian/control
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
Log:
Add ?\226?\128?\156Replaces: mediawiki-extensions-confirmedit?\226?\128?\157, as recommended by Florian Weimer

Modified: mediawiki/branches/wheezy/debian/changelog
===================================================================
--- mediawiki/branches/wheezy/debian/changelog	2014-02-07 14:27:55 UTC (rev 514)
+++ mediawiki/branches/wheezy/debian/changelog	2014-02-10 08:37:03 UTC (rev 515)
@@ -1,5 +1,6 @@
 mediawiki (1:1.19.11+dfsg-1~deb7u1) stable-security; urgency=medium
 
+  [ Thorsten Glaser ]
   * New upstream security fix release (Closes: #729629, #706601):
     - CVE-2014-1610 (bug 60339) remote code exec in Djvu thumbnailer
     - CVE-2013-4568 (bug 58088) Don't normalize U+FF3C to \ in CSS Checks
@@ -28,8 +29,11 @@
   * Update copyright file with things noted by Paul Tagliamonte, thanks!
   * Refresh one patch to make it apply cleanly against 1.19.11
 
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 07 Feb 2014 15:23:11 +0100
+  [ Florian Weimer ]
+  * Add “Replaces: mediawiki-extensions-confirmedit”
 
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 10 Feb 2014 09:36:07 +0100
+
 mediawiki (1:1.19.5-1+deb7u1) stable-security; urgency=low
 
   * CVE-2013-4302: apply patch from upstream to prevent

Modified: mediawiki/branches/wheezy/debian/control
===================================================================
--- mediawiki/branches/wheezy/debian/control	2014-02-07 14:27:55 UTC (rev 514)
+++ mediawiki/branches/wheezy/debian/control	2014-02-10 08:37:03 UTC (rev 515)
@@ -26,6 +26,7 @@
  mediawiki-extensions (<< 2.8~)
 Conflicts: mediawiki-extensions-base (<< 3.5~),
  mediawiki-extensions-confirmedit
+Replaces: mediawiki-extensions-confirmedit
 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

Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2014-02-07 14:27:55 UTC (rev 514)
+++ mediawiki/trunk/debian/changelog	2014-02-10 08:37:03 UTC (rev 515)
@@ -1,3 +1,10 @@
+mediawiki (1:1.19.11+dfsg-2) UNRELEASED; urgency=medium
+
+  [ Florian Weimer ]
+  * Add “Replaces: mediawiki-extensions-confirmedit”
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 10 Feb 2014 09:35:14 +0100
+
 mediawiki (1:1.19.11+dfsg-1) unstable; urgency=medium
 
   * New upstream security fix release:

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2014-02-07 14:27:55 UTC (rev 514)
+++ mediawiki/trunk/debian/control	2014-02-10 08:37:03 UTC (rev 515)
@@ -26,6 +26,7 @@
  mediawiki-extensions (<< 2.8~)
 Conflicts: mediawiki-extensions-base (<< 3.5~),
  mediawiki-extensions-confirmedit
+Replaces: mediawiki-extensions-confirmedit
 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