Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338343 )
Change subject: Merge tag 'debian/1%1.27.1-3' into xenial
......................................................................
Merge tag 'debian/1%1.27.1-3' into xenial
mediawiki Debian release 1:1.27.1-3
Change-Id: I18b8f9b82a145a0ab6d7841564eb33bf67f1d9fb
---
M debian/changelog
M debian/control
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian
refs/changes/43/338343/1
diff --git a/debian/changelog b/debian/changelog
index 7caa499..e56501b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-<<<<<<< HEAD (9c53dd Update for xenial)
-mediawiki (1:1.27.1-2ppa2~xenial1) xenial; urgency=medium
+mediawiki (1:1.27.1-3ppa1~xenial1) xenial; urgency=medium
* Rebuild for xenial
+ * Drop default-mysql-server recommendation
- -- Kunal Mehta <lego...@member.fsf.org> Sat, 17 Sep 2016 16:47:47 -0700
-=======
+ -- Kunal Mehta <lego...@member.fsf.org> Fri, 17 Feb 2017 04:25:10 -0800
+
mediawiki (1:1.27.1-3) unstable; urgency=medium
* Ensure mediawiki depends upon the same version of mediawiki-classes
@@ -19,7 +19,12 @@
* Add Provides for extensions now included in this one (Closes: #845281)
-- Kunal Mehta <lego...@member.fsf.org> Tue, 13 Sep 2016 04:17:42 -0700
->>>>>>> BRANCH (e356c5 Mark changelog as released)
+
+mediawiki (1:1.27.1-2ppa2~xenial1) xenial; urgency=medium
+
+ * Rebuild for xenial
+
+ -- Kunal Mehta <lego...@member.fsf.org> Sat, 17 Sep 2016 16:47:47 -0700
mediawiki (1:1.27.1-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index 63a74d7..69ff21f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@
Package: mediawiki
Architecture: all
Depends: apache2 | httpd, php, php-mysql | php-pgsql | php-sqlite3 |
php-mysqlnd, php-common (>= 5.5.0+dfsg-10~), php-mbstring, php-xml,
mime-support, mediawiki-classes (= ${binary:Version}), ${misc:Depends}
-Recommends: default-mysql-server | virtual-mysql-server | postgresql-contrib,
php-cli, php-intl, php-curl, php-wikidiff2, python
+Recommends: virtual-mysql-server | postgresql-contrib, php-cli, php-intl,
php-curl, php-wikidiff2, python
Suggests: imagemagick | php-gd, memcached, clamav, php-apcu, hhvm
Breaks: fusionforge-plugin-mediawiki (<< 5.2~rc1+1~),
mediawiki-extensions-ldapauth (<< 2.8~),
--
To view, visit https://gerrit.wikimedia.org/r/338343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18b8f9b82a145a0ab6d7841564eb33bf67f1d9fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: xenial
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
