[Pkg-mediawiki-commits] r390 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2012-10-09 12:24:58 +0000 (Tue, 09 Oct 2012)
New Revision: 390

Modified:
   mediawiki/trunk/debian/control
   mediawiki/trunk/debian/patches/bz29635.patch
Log:
allow MySQL users to choose either PHP5 client library (Closes: #689758) while here


Modified: mediawiki/trunk/debian/control
===================================================================
--- mediawiki/trunk/debian/control	2012-10-09 12:18:24 UTC (rev 389)
+++ mediawiki/trunk/debian/control	2012-10-09 12:24:58 UTC (rev 390)
@@ -13,7 +13,7 @@
 
 Package: mediawiki
 Architecture: all
-Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, ${misc:Depends}
+Depends: apache2 | httpd, php5, php5-mysql | php5-pgsql | php5-sqlite | php5-mysqlnd, mime-support, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-cookie, libjs-jquery-form, ${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+1~),

Modified: mediawiki/trunk/debian/patches/bz29635.patch
===================================================================
--- mediawiki/trunk/debian/patches/bz29635.patch	2012-10-09 12:18:24 UTC (rev 389)
+++ mediawiki/trunk/debian/patches/bz29635.patch	2012-10-09 12:24:58 UTC (rev 390)
@@ -62,4 +62,3 @@
  	protected function renameTable( $old, $new ) {
  		if ( $this->db->tableExists( $old ) ) {
  			$this->output( "Renaming table $old to $new\n" );
-5~
\ No newline at end of file