[Pkg-mysql-commits] r2114 - in mysql-5.5/branches/wheezy/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Sun May 20 20:08:11 UTC 2012
tags 673528 pending
thanks
Author: periapt
Date: 2012-05-20 20:08:11 +0000 (Sun, 20 May 2012)
New Revision: 2114
Added:
mysql-5.5/branches/wheezy/debian/repack.local
mysql-5.5/branches/wheezy/debian/repack.stub
Removed:
mysql-5.5/branches/wheezy/debian/libmysqlclient-dev.lintian-overrides
mysql-5.5/branches/wheezy/debian/libmysqlclient18.lintian-overrides
mysql-5.5/branches/wheezy/debian/libmysqld-dev.lintian-overrides
mysql-5.5/branches/wheezy/debian/libmysqld-pic.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-client.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-common.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-server-5.5.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-server-core-5.5.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-server.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-source-5.5.lintian-overrides
mysql-5.5/branches/wheezy/debian/mysql-testsuite-5.5.lintian-overrides
Modified:
mysql-5.5/branches/wheezy/debian/changelog
mysql-5.5/branches/wheezy/debian/copyright
mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
mysql-5.5/branches/wheezy/debian/rules
mysql-5.5/branches/wheezy/debian/watch
Log:
* Standardized debian/watch and get-orig-source and made DFSG exclusion
of Docs/mysql.info explicit (Closes: #673528)
* Located and installed upstream changelog
Modified: mysql-5.5/branches/wheezy/debian/changelog
===================================================================
--- mysql-5.5/branches/wheezy/debian/changelog 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/changelog 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,10 +1,13 @@
-mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
+mysql-5.5 (5.5.23+dfsg-1) UNRELEASED; urgency=low
* Changes to prevent certain failures to build from scratch
when building against MySQL 5.5 (Closes: #590905)
- Patched mysql_config so that it no longer mandates -lssl -lcrypto
- Added libwrap0-dev as a dependency of libmysqld-dev, libmysqld-pic
- Added libaio-dev as a Linux dependency of libmysqld-dev, libmysqld-pic
+ * 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 <nicholas at periapt.co.uk> Fri, 18 May 2012 17:36:37 +0100
Modified: mysql-5.5/branches/wheezy/debian/copyright
===================================================================
--- mysql-5.5/branches/wheezy/debian/copyright 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/copyright 2012-05-20 20:08:11 UTC (rev 2114)
@@ -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 <clint at 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
Deleted: mysql-5.5/branches/wheezy/debian/libmysqlclient-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/libmysqlclient-dev.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/libmysqlclient-dev.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqlclient-dev: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/libmysqlclient18.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/libmysqlclient18.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/libmysqlclient18.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqlclient18: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/libmysqld-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/libmysqld-dev.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/libmysqld-dev.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqld-dev: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/libmysqld-pic.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/libmysqld-pic.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/libmysqld-pic.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqld-pic: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-client.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-client.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-client.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-client: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-common.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-common.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-common.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-common: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-server-5.5.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-server-5.5.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server-5.5: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-server-core-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-server-core-5.5.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-server-core-5.5.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server-core-5.5: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-server.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-server.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-server.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-server: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-source-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-source-5.5.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-source-5.5.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-source-5.5: no-upstream-changelog
Deleted: mysql-5.5/branches/wheezy/debian/mysql-testsuite-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/wheezy/debian/mysql-testsuite-5.5.lintian-overrides 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/mysql-testsuite-5.5.lintian-overrides 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-testsuite-5.5: no-upstream-changelog
Modified: mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch
===================================================================
--- mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/patches/94_spelling.patch 2012-05-20 20:08:11 UTC (rev 2114)
@@ -1,7 +1,7 @@
Author <nicholas at 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 @@
Copied: mysql-5.5/branches/wheezy/debian/repack.local (from rev 2111, mysql-5.5/branches/unstable/debian/repack.local)
===================================================================
--- mysql-5.5/branches/wheezy/debian/repack.local (rev 0)
+++ mysql-5.5/branches/wheezy/debian/repack.local 2012-05-20 20:08:11 UTC (rev 2114)
@@ -0,0 +1 @@
+rm Docs/mysql.info
Copied: mysql-5.5/branches/wheezy/debian/repack.stub (from rev 2111, mysql-5.5/branches/unstable/debian/repack.stub)
===================================================================
--- mysql-5.5/branches/wheezy/debian/repack.stub (rev 0)
+++ mysql-5.5/branches/wheezy/debian/repack.stub 2012-05-20 20:08:11 UTC (rev 2114)
@@ -0,0 +1,82 @@
+#!/bin/sh
+
+: <<=cut
+=pod
+
+=head1 NAME
+
+repack.stub - script to repack upstream tarballs from uscan
+
+=head1 INSTRUCTIONS
+
+put this in debian/repack.stub and add "debian sh debian/repack.stub" to
+the end of the line in debian/watch. you will also need to add a version
+mangle to debian/watch.
+
+then create a debian/repack.local. this is a shell script that is
+sourced under "set -e", so be careful to check returns codes.
+
+=head1 FUNCTIONS
+
+=over 4
+
+=item rm
+
+rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item mv
+
+mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
+
+=item requires_version
+
+requires_version is there for future usage for requiring certain versions of the script
+
+=back
+
+=head1 VARIABLES
+
+=over 4
+
+=item SUFFIX
+
+defaults to +dfsg
+
+what to append to the upstream version
+
+=item RM_OPTS
+
+defaults to -vrf
+
+options to pass to rm
+
+=item MANIFEST
+
+defaults to 0, set to 1 to turn on.
+
+this will manipulate MANIFEST files in CPAN tarballs.
+
+=item UP_BASE
+
+this is the directory where the upstream source is.
+
+=back
+
+=cut
+
+if [ -z "$REPACK_SH" ]; then
+ if [ -f ../../scripts/repack.sh ]; then
+ REPACK_SH=../../scripts/repack.sh
+ fi
+ if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
+ REPACK_SH=$(which repack.sh)
+ fi
+fi
+
+if [ ! -f "$REPACK_SH" ]; then
+ echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
+ echo "You can get it from http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
+ exit 1
+fi
+
+exec "$REPACK_SH" "$@"
Modified: mysql-5.5/branches/wheezy/debian/rules
===================================================================
--- mysql-5.5/branches/wheezy/debian/rules 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/rules 2012-05-20 20:08:11 UTC (rev 2114)
@@ -182,7 +182,7 @@
# Patch mysql_config inline rather using quilt because the latter
# seems not to work, though I don't know why. Comments hold
# but not the real bit of work. The source is scripts/mysql_config.sh.
- sed -i -e's/-lssl -lcrypto //' debian/libmysql*/usr/bin/mysql_config*
+ sed -i -e's/-lssl -lcrypto //' $(TMP)/usr/bin/mysql_config*
# mysql-client
install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
@@ -204,6 +204,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 \
@@ -225,16 +228,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
Modified: mysql-5.5/branches/wheezy/debian/watch
===================================================================
--- mysql-5.5/branches/wheezy/debian/watch 2012-05-20 13:02:20 UTC (rev 2113)
+++ mysql-5.5/branches/wheezy/debian/watch 2012-05-20 20:08:11 UTC (rev 2114)
@@ -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
More information about the Pkg-mysql-commits
mailing list