[Pkg-mysql-commits] r2193 - mysql-5.5/branches/wheezy/debian

[Nicholas Bamber]

Author: periapt
Date: 2012-09-16 14:59:30 +0000 (Sun, 16 Sep 2012)
New Revision: 2193

Modified:
   mysql-5.5/branches/wheezy/debian/changelog
   mysql-5.5/branches/wheezy/debian/control
   mysql-5.5/branches/wheezy/debian/rules
Log:
Restored zlib1g-dev (>= 1:1.1.3-5) as a build dependency
and made the use of system libz explicit in debian/rules

Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog	2012-09-15 21:10:54 UTC (rev 2192)
+++ mysql-5.5/branches/wheezy/debian/changelog	2012-09-16 14:59:30 UTC (rev 2193)
@@ -3,6 +3,8 @@
   * Danish debconf translation (Closes: #684566)
   * Loosened versioned dependency between mysql-server-5.5 and
     mysql-server-core-5.5, hopefully (Closes: #686803)
+  * Restored zlib1g-dev (>= 1:1.1.3-5) as a build dependency
+    and made the use of system libz explicit in debian/rules
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 09 Sep 2012 09:36:01 +0100
 

Modified: mysql-5.5/branches/wheezy/debian/control
===================================================================
--- mysql-5.5/branches/wheezy/debian/control	2012-09-15 21:10:54 UTC (rev 2192)
+++ mysql-5.5/branches/wheezy/debian/control	2012-09-16 14:59:30 UTC (rev 2193)
@@ -4,7 +4,7 @@
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <norbert at tretkowski.de>,
  Clint Byrum <clint at ubuntu.com>, Nicholas Bamber <nicholas at periapt.co.uk>
-Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
+Build-Depends: debhelper (>= 8.1.3~), libaio-dev[linux-any], libncurses5-dev (>= 5.0-6), perl, libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, gcc-4.4 [any-i386], g++-4.4 [any-i386]
 Standards-Version: 3.9.3
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/

Modified: mysql-5.5/branches/wheezy/debian/rules
===================================================================
--- mysql-5.5/branches/wheezy/debian/rules	2012-09-15 21:10:54 UTC (rev 2192)
+++ mysql-5.5/branches/wheezy/debian/rules	2012-09-16 14:59:30 UTC (rev 2193)
@@ -104,6 +104,7 @@
 		$(USE_STATIC_MYSQLD) \
 		$(USE_LINUX_NATIVE_AIO) \
 		-DWITH_SSL=bundled \
+		-DWITH_ZLIB=system \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-linux-gnu" \