[Pkg-mediawiki-commits] r368 - mediawiki/experimental/debian mediawiki-extensions/experimental/debian

[Thorsten Glaser]

Author: tg
Date: 2012-08-08 12:29:45 +0000 (Wed, 08 Aug 2012)
New Revision: 368

Modified:
   mediawiki-extensions/experimental/debian/changelog
   mediawiki/experimental/debian/changelog
   mediawiki/experimental/debian/control
Log:
prepare fusionforge, mediawiki, mediawiki-extensions for upload to unstable (given ack from d-release): contract the changelog entries and update the versioned Breaks/Depends

Modified: mediawiki/experimental/debian/changelog
===================================================================
--- mediawiki/experimental/debian/changelog	2012-08-07 12:38:13 UTC (rev 367)
+++ mediawiki/experimental/debian/changelog	2012-08-08 12:29:45 UTC (rev 368)
@@ -1,33 +1,20 @@
-mediawiki (1:1.19.1-2~exp3) experimental; urgency=low
+mediawiki (1:1.19.1-2) UNRELEASED; urgency=low
 
-  * prevent <table></table> without any <tr /> inside, globally
-  * fix more cases of not checking $wgHtml5
+  [ Thorsten Glaser ]
+  * Prevent <table></table> without any <tr /> inside, globally
+  * Fix more cases of not checking $wgHtml5
   * MW’s ID (XML) sanitiser is there for a reason, use it!
-
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 03 Aug 2012 17:22:02 +0200
-
-mediawiki (1:1.19.1-2~exp2) experimental; urgency=low
-
-  * session_start is another function that needs an explicit ‘@’,
-    so bring back that part of suppress_warnings.patch
-  * prevent <ul></ul> without any <li /> inside in MonoBook
-
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 03 Aug 2012 14:09:38 +0200
-
-mediawiki (1:1.19.1-2~exp1) experimental; urgency=low
-
+  * Prevent <ul></ul> without any <li /> inside in MonoBook
   * Fix invalid XHTML caused by code not honouring $wgHtml5
   * Quell some PHP warnings from sloppy code
   * Do the wfSuppressWarnings patch used with FusionForge right
   * Add myself to Uploaders and quieten lintian a bit
+  * Update versioned Breaks against fusionforge and mw-extensions
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jul 2012 17:31:52 +0200
-
-mediawiki (1:1.19.1-2) UNRELEASED; urgency=low
-
+  [ Jonathan Wiltshire ]
   * Add Recommends on mediawiki-extensions-base and php-wikidiff2
 
- -- Jonathan Wiltshire <jmw at debian.org>  Mon, 18 Jun 2012 19:17:22 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 08 Aug 2012 14:26:37 +0200
 
 mediawiki (1:1.19.1-1) unstable; urgency=low
 

Modified: mediawiki/experimental/debian/control
===================================================================
--- mediawiki/experimental/debian/control	2012-08-07 12:38:13 UTC (rev 367)
+++ mediawiki/experimental/debian/control	2012-08-08 12:29:45 UTC (rev 368)
@@ -16,7 +16,16 @@
 Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, libjs-jquery-tablesorter, ${misc:Depends} 
 Recommends: mysql-server | postgresql-contrib, php5-cli, python, php-wikidiff2,  mediawiki-extensions-base
 Suggests: imagemagick | php5-gd, mediawiki-math, memcached, clamav
-Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1-4~)
+Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1wheezy1~),
+ mediawiki-extensions-base (<< 2.8~),
+ mediawiki-extensions-geshi (<< 2.8~),
+ mediawiki-extensions-ldapauth (<< 2.8~),
+ mediawiki-extensions-openid (<< 2.8~),
+ mediawiki-extensions-confirmedit (<< 2.8~),
+ mediawiki-extensions-fckeditor (<< 2.8~),
+ mediawiki-extensions-collection (<< 2.8~),
+ mediawiki-extensions-graphviz (<< 2.8~),
+ mediawiki-extensions (<< 2.8~)
 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-extensions/experimental/debian/changelog
===================================================================
--- mediawiki-extensions/experimental/debian/changelog	2012-08-07 12:38:13 UTC (rev 367)
+++ mediawiki-extensions/experimental/debian/changelog	2012-08-08 12:29:45 UTC (rev 368)
@@ -1,24 +1,14 @@
-mediawiki-extensions (3~exp3) experimental; urgency=low
+mediawiki-extensions (2.8) UNRELEASED; urgency=low
 
   * Remove dependency of mw-ext-collection on various ECMAscript
     libraries that apparently are available from MW core already
     (as log message for r87847 suggests); enables testing transition
-
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 07 Aug 2012 14:36:10 +0200
-
-mediawiki-extensions (3~exp2) experimental; urgency=low
-
   * Fix paths in RSS_Reader extension
   * Quell those UNIQ‥QINU texts by fixing PageCSS to honour the API
-
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 03 Aug 2012 14:01:29 +0200
-
-mediawiki-extensions (3~exp1) experimental; urgency=low
-
   * Fix content-less ul element in Collection extension
   * Fix invalid XHTML in InputBox extension
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jul 2012 17:07:58 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 08 Aug 2012 14:26:37 +0200
 
 mediawiki-extensions (2.7) unstable; urgency=low