[Pkg-mysql-commits] r2111 - in mysql-5.5/branches/unstable/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Sun May 20 10:05:17 UTC 2012
Author: periapt
Date: 2012-05-20 10:05:16 +0000 (Sun, 20 May 2012)
New Revision: 2111
Added:
mysql-5.5/branches/unstable/debian/repack.local
mysql-5.5/branches/unstable/debian/repack.stub
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/copyright
mysql-5.5/branches/unstable/debian/patches/spelling.patch
mysql-5.5/branches/unstable/debian/rules
mysql-5.5/branches/unstable/debian/watch
Log:
* New upstream source
* Refreshed patches
* Standardized debian/watch and get-orig-source and made DFSG exclusion
of Docs/mysql.info explicit
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-05-19 07:05:16 UTC (rev 2110)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-05-20 10:05:16 UTC (rev 2111)
@@ -1,4 +1,4 @@
-mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
+mysql-5.5 (5.5.24+dfsg-1) UNRELEASED; urgency=low
* Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
and mysql-server-5.5 off dh_movefiles
@@ -24,6 +24,10 @@
- missing symbols file (cf. #590905)
* Added patch for hyphen/minus sign confusion
* Dropped mailx to Suggests clause (Closes: #535496)
+ * New upstream source
+ * Refreshed patches
+ * Standardized debian/watch and get-orig-source and made DFSG exclusion
+ of Docs/mysql.info explicit
-- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
Modified: mysql-5.5/branches/unstable/debian/copyright
===================================================================
--- mysql-5.5/branches/unstable/debian/copyright 2012-05-19 07:05:16 UTC (rev 2110)
+++ mysql-5.5/branches/unstable/debian/copyright 2012-05-20 10:05:16 UTC (rev 2111)
@@ -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.
.
Modified: mysql-5.5/branches/unstable/debian/patches/spelling.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/spelling.patch 2012-05-19 07:05:16 UTC (rev 2110)
+++ mysql-5.5/branches/unstable/debian/patches/spelling.patch 2012-05-20 10:05:16 UTC (rev 2111)
@@ -1,7 +1,7 @@
Author <nicholas at periapt.co.uk>
Subject: spelling errors
Preceeding -> preceding
-Last-Update: 2012-05-02
+Last-Update: 2012-05-19
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 @@
@@ -40,7 +29,7 @@
# effects like failing 'sync_slave_with_master', crashes of the slave or
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
-@@ -186,7 +186,7 @@
+@@ -221,7 +221,7 @@
SELECT * FROM t7 ORDER BY C1;
# since bug#31552/31609 idempotency is not default any longer. In order
@@ -49,7 +38,7 @@
# temprorarily
set @@global.slave_exec_mode= 'IDEMPOTENT';
-@@ -225,7 +225,7 @@
+@@ -260,7 +260,7 @@
SELECT * FROM t8 ORDER BY a;
# since bug#31552/31609 idempotency is not default any longer. In order
Added: mysql-5.5/branches/unstable/debian/repack.local
===================================================================
--- mysql-5.5/branches/unstable/debian/repack.local (rev 0)
+++ mysql-5.5/branches/unstable/debian/repack.local 2012-05-20 10:05:16 UTC (rev 2111)
@@ -0,0 +1 @@
+rm Docs/mysql.info
Added: mysql-5.5/branches/unstable/debian/repack.stub
===================================================================
--- mysql-5.5/branches/unstable/debian/repack.stub (rev 0)
+++ mysql-5.5/branches/unstable/debian/repack.stub 2012-05-20 10:05:16 UTC (rev 2111)
@@ -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/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-05-19 07:05:16 UTC (rev 2110)
+++ mysql-5.5/branches/unstable/debian/rules 2012-05-20 10:05:16 UTC (rev 2111)
@@ -182,14 +182,10 @@
# Exclusion Package Type
# usr/share/man/ various man
# libmysqlclient_r.so libMclient-dev links
-# usr/share/info don't install
# usr/share/mysql/magic M-server-5.5 example
# usr/bin/mysqlaccess.conf M-client-5.5 example
# usr/lib/mysql/plugin/daemon_example.ini M-server-5.5 example
# usr/share/mysql/my- M-server-5.5 example
-# Note: lintian complains about the upstream supplied info file
-# and we don't have the source to fix it.
-#
# The following exclusions have been inherited from pre short form
# debian/rules days.
# usr/share/mysql/mi_test_all
@@ -200,7 +196,6 @@
dh_install --fail-missing \
-Xusr/share/man/ \
-Xlibmysqlclient_r.so \
- -Xusr/share/info \
-Xusr/share/mysql/magic \
-Xusr/lib/mysql/plugin/daemon_example.ini \
-Xusr/bin/mysqlaccess.conf \
@@ -252,16 +247,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
%:
dh $@ --parallel
Modified: mysql-5.5/branches/unstable/debian/watch
===================================================================
--- mysql-5.5/branches/unstable/debian/watch 2012-05-19 07:05:16 UTC (rev 2110)
+++ mysql-5.5/branches/unstable/debian/watch 2012-05-20 10:05:16 UTC (rev 2111)
@@ -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