[Pkg-mediawiki-commits] r495 - mediawiki/trunk/debian

[Thorsten Glaser]

Author: tg
Date: 2013-12-31 10:38:13 +0000 (Tue, 31 Dec 2013)
New Revision: 495

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/control
Log:
this needs a coordinated upload between core and extensions


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-12-31 10:36:29 UTC (rev 494)
+++ mediawiki/trunk/debian/changelog	2013-12-31 10:38:13 UTC (rev 495)
@@ -1,4 +1,4 @@
-mediawiki (1:1.19.9+dfsg-1) UNRELEASED; urgency=low
+mediawiki (1:1.19.9+dfsg-1) unstable; urgency=medium
 
   [ Jonathan Wiltshire ]
   * Re-work debian/rule:get-orig-source:
@@ -13,7 +13,7 @@
   * Handle /var/lib/mediawiki/extensions/* always as symlinks, for
     both core and extra extensions, with upgrade path (Closes: #719208)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:34:47 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 31 Dec 2013 11:37:38 +0100
 
 mediawiki (1:1.19.8+dfsg-2.2) unstable; urgency=high
 

Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2013-12-31 10:36:29 UTC (rev 494)
+++ mediawiki/trunk/debian/control	2013-12-31 10:38:13 UTC (rev 495)
@@ -17,15 +17,15 @@
 Recommends: mysql-server | postgresql-contrib, php5-cli, python, php-wikidiff2, mediawiki-extensions-base
 Suggests: imagemagick | php5-gd, mediawiki-extensions-math, memcached, clamav
 Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
- 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,
  mediawiki-extensions-collection (<< 2.8~),
  mediawiki-extensions-graphviz (<< 2.8~),
  mediawiki-extensions (<< 2.8~)
+Conflicts: mediawiki-extensions-base (<< 3.5~),
+ 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