diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/changelog mysql-5.5-5.5.23+dfsg/debian/changelog --- mysql-5.5-5.5.23/debian/changelog 2012-05-08 05:59:19.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/changelog 2012-05-21 22:21:04.000000000 +0100 @@ -1,3 +1,14 @@ +mysql-5.5 (5.5.23+dfsg-1) UNRELEASED; urgency=low + + * Revert having libssl-dev as a build dependency and changed + WITH_SSL option to 'bundled' from 'yes' (Closes: #590905) + and (Closes: #673865) + * Standardized debian/watch and get-orig-source and made DFSG exclusion + of Docs/mysql.info explicit (Closes: #673528) + * Located and installed upstream changelog + + -- Nicholas Bamber <nicho...@periapt.co.uk> Fri, 18 May 2012 17:36:37 +0100 + mysql-5.5 (5.5.23-2) unstable; urgency=low * Stopped overriding the -j build parameter (Closes: #512964) diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/control mysql-5.5-5.5.23+dfsg/debian/control --- mysql-5.5-5.5.23/debian/control 2012-05-07 19:33:17.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/control 2012-05-21 21:45:03.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Debian MySQL Maintainers <pkg-mysql-ma...@lists.alioth.debian.org> Uploaders: Norbert Tretkowski <norb...@tretkowski.de>, Clint Byrum <cl...@ubuntu.com>, Nicholas Bamber <nicho...@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, libssl-dev +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 Standards-Version: 3.9.3 Homepage: http://dev.mysql.com/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/ diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/copyright mysql-5.5-5.5.23+dfsg/debian/copyright --- mysql-5.5-5.5.23/debian/copyright 2012-04-17 07:32:05.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/copyright 2012-05-20 14:37:08.000000000 +0100 @@ -2,7 +2,11 @@ Upstream-Name: MySQL 5.5 Upstream-Contact: http://bugs.mysql.com/ Source: http://dev.mysql.com/downloads/mysql/5.5.html -Comments: originally produced by a modified version of licensecheck2dep5 +Comments: + The file Docs/mysql.info is removed from the upstream source + because it is incompatible with the Debian Free Software Guidelines. + . + Originally produced by a modified version of licensecheck2dep5 from CDBS by Clint Byrum <cl...@ubuntu.com>. Hand modified to reduce redundancy in the output and add appropriate license text. . @@ -146,6 +150,7 @@ support-files/mysqld_multi.server.sh support-files/mysql-log-rotate.sh support-files/mysql.server-sys5.sh + Docs/* Copyright: UNKNOWN Comment: These files fall under the blanket license specified in the file COPYING and README diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/patches/94_spelling.patch mysql-5.5-5.5.23+dfsg/debian/patches/94_spelling.patch --- mysql-5.5-5.5.23/debian/patches/94_spelling.patch 2012-05-03 17:53:24.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/patches/94_spelling.patch 2012-05-20 14:06:35.000000000 +0100 @@ -1,7 +1,7 @@ Author <nicho...@periapt.co.uk> Subject: spelling errors Preceeding -> preceding -Last-Update: 2012-05-02 +Last-Update: 2012-05-20 Forwarded: no --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -14,17 +14,6 @@ "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", "This handle is already connected. Use a separate handle for each connection.", "Authentication plugin '%s' cannot be loaded: %s", ---- a/Docs/mysql.info -+++ b/Docs/mysql.info -@@ -233132,7 +233132,7 @@ - - * Error: `2056' (`CR_STMT_CLOSED') - -- Message: Statement closed indirectly because of a preceeding %s() -+ Message: Statement closed indirectly because of a preceding %s() - call - - * Error: `2057' (`CR_NEW_STMT_METADATA') --- a/mysql-test/extra/rpl_tests/rpl_ddl.test +++ b/mysql-test/extra/rpl_tests/rpl_ddl.test @@ -98,8 +98,8 @@ diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/rules mysql-5.5-5.5.23+dfsg/debian/rules --- mysql-5.5-5.5.23/debian/rules 2012-05-05 13:32:23.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/rules 2012-05-21 22:21:55.000000000 +0100 @@ -99,7 +99,7 @@ -DWITH_LIBEDIT=OFF \ $(USE_STATIC_MYSQLD) \ $(USE_LINUX_NATIVE_AIO) \ - -DWITH_SSL=yes \ + -DWITH_SSL=bundled \ -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ -DSYSTEM_TYPE="debian-linux-gnu" \ @@ -198,6 +198,9 @@ dh_movefiles dh_install +override_dh_installchangelogs: + dh_installchangelogs Docs/ChangeLog + override_dh_installlogrotate-arch: dh_installlogrotate --name mysql-server if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \ @@ -219,16 +222,7 @@ binary: binary-indep binary-arch get-orig-source: - @wget -nv -T10 -t3 \ - -O /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz \ - http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @tar xfz /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz -C /tmp - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/Docs - @rm -rf /tmp/mysql-$(DEB_UPSTREAM_VERSION)/debian - @mv /tmp/mysql-$(DEB_UPSTREAM_VERSION) /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @cd /tmp ; tar czf $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig - @rm -f /tmp/mysql-$(DEB_UPSTREAM_VERSION).tar.gz - @rm -rf /tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig + uscan --force-download --verbose --download-current-version %: dh $@ --parallel diff -Nru --exclude mysql.info --exclude 'repack.*' --exclude '*.lintian-overrides' mysql-5.5-5.5.23/debian/watch mysql-5.5-5.5.23+dfsg/debian/watch --- mysql-5.5-5.5.23/debian/watch 2011-06-23 21:06:32.000000000 +0100 +++ mysql-5.5-5.5.23+dfsg/debian/watch 2012-05-20 14:04:10.000000000 +0100 @@ -1,3 +1,9 @@ +# This watch file depends on repack.sh being in your PATH. +# See http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD version=3 -opts="uversionmangle=s/-(rc|beta)/$1/" \ - ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/www.mysql.com/Downloads/MySQL-5.5/mysql-([\d\.]*(?:-beta|-rc)?).tar.gz debian +opts=dversionmangle=s/\+dfsg\d*$// \ + http://mysql.linux.cz/Downloads/MySQL-5.5/mysql-([\d\.]+).tar.gz \ + debian sh debian/repack.stub +opts=dversionmangle=s/\+dfsg\d*$// \ + http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/mysql-([\d\.]+).tar.gz \ + debian sh debian/repack.stub
The attached file is my latest proposed fix for mysql-5.5. For clarity
it excludes files added (repacking stuff) or removed ( a non-DFSG file
and lintian overrides). I am still testing it in other ways.
