[Pkg-mysql-commits] r2063 - in mysql-5.5/branches/experimental/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Thu Apr 12 06:39:48 UTC 2012
tags 663354 pending
thanks
Author: periapt
Date: 2012-04-12 06:39:48 +0000 (Thu, 12 Apr 2012)
New Revision: 2063
Added:
mysql-5.5/branches/experimental/debian/libmysqlclient-dev.lintian-overrides
mysql-5.5/branches/experimental/debian/libmysqlclient18.lintian-overrides
mysql-5.5/branches/experimental/debian/libmysqld-dev.lintian-overrides
mysql-5.5/branches/experimental/debian/libmysqld-pic.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-client.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-server-core-5.5.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-server.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-source-5.5.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-testsuite-5.5.lintian-overrides
Modified:
mysql-5.5/branches/experimental/debian/changelog
mysql-5.5/branches/experimental/debian/control
mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-common.lintian-overrides
mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides
mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
mysql-5.5/branches/experimental/debian/rules
mysql-5.5/branches/experimental/debian/source.lintian-overrides
Log:
* Numerous minor changes to improve lintian cleanliness (Closes: #663354)
- Added dh_lintian lines to debian/rules to ensure that lintian
overrides take effect and removed old commented out lines
- Clarified Hurd procps dependency in debian/control
- Rewrote short description of the libmysqld-pic package to be more accurate
- Depersonalised long description of mysql-client
- Removed dependencies relating to mysql-common-4.1
- Tightened Breaks clauses for mysql-common
- Removed duplicate entry from Replaces clauses for mysql-server-core-5.5
- Rexpressed Conflicts clause as versioned dependency
for mysql-testsuite-5.5
- Added DEP-5 header fields to two patches
- Refreshed and commented all lintian overrides and added override
concerning lack of upstream changelog to all packages
Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/changelog 2012-04-12 06:39:48 UTC (rev 2063)
@@ -48,6 +48,20 @@
* Refreshed patches - and added a new patch to disable a further flurry
of failing tests
* Switched on native AIO in linux builds (Closes: #659565)
+ * Numerous minor changes to improve lintian cleanliness (Closes: #663354)
+ - Added dh_lintian lines to debian/rules to ensure that lintian
+ overrides take effect and removed old commented out lines
+ - Clarified Hurd procps dependency in debian/control
+ - Rewrote short description of the libmysqld-pic package to be more accurate
+ - Depersonalised long description of mysql-client
+ - Removed dependencies relating to mysql-common-4.1
+ - Tightened Breaks clauses for mysql-common
+ - Removed duplicate entry from Replaces clauses for mysql-server-core-5.5
+ - Rexpressed Conflicts clause as versioned dependency
+ for mysql-testsuite-5.5
+ - Added DEP-5 header fields to two patches
+ - Refreshed and commented all lintian overrides and added override
+ concerning lack of upstream changelog to all packages
-- Clint Byrum <clint at ubuntu.com> Tue, 14 Feb 2012 11:48:47 -0800
Modified: mysql-5.5/branches/experimental/debian/control
===================================================================
--- mysql-5.5/branches/experimental/debian/control 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/control 2012-04-12 06:39:48 UTC (rev 2063)
@@ -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: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
+Build-Depends: libtool (>= 1.4.2-7), procps[!hurd-i386], debhelper (>= 8.1.3~), file (>= 3.28), libaio-dev [linux-any], libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
Standards-Version: 3.9.2
Homepage: http://dev.mysql.com/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/mysql-5.5/
@@ -28,7 +28,7 @@
Architecture: any
Section: libdevel
Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends}
-Description: MySQL database development files
+Description: PIC version of MySQL embedded server development files
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
language in the world. The main goals of MySQL are speed, robustness and
@@ -66,10 +66,7 @@
Package: mysql-common
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mysql-common-4.1
-Provides: mysql-common-4.1
-Replaces: mysql-common-4.1
-Breaks: mysql-server-5.1, mysql-client-5.1, mysql-server-core-5.1
+Breaks: mysql-server-5.1 (<< 5.5), mysql-client-5.1 (<< 5.5), mysql-server-core-5.1 (<< 5.5)
Multi-Arch: foreign
Description: MySQL database common files, e.g. /etc/mysql/my.cnf
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -83,7 +80,7 @@
Package: mysql-client-5.5
Architecture: any
Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${source:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
+Provides: virtual-mysql-client, mysql-client
Breaks: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1
Suggests: libterm-readkey-perl
@@ -101,7 +98,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: mysql-server-5.1, mysql-server-5.0, mysql-server-core-5.1
Provides: mysql-server-core
-Replaces: mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-5.0, mysql-server-5.1, mysql-server-core-5.1
+Replaces: mysql-server-core-5.0, mysql-server-core-5.1, mysql-server-5.0, mysql-server-5.1
Description: MySQL database server binaries
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -117,9 +114,9 @@
Recommends: mailx, libhtml-template-perl
Pre-Depends: mysql-common (>= ${source:Version}), adduser (>= 3.40), debconf
Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
-Breaks: mysql-server (<< ${source:Version}), mysql-server-4.1, mysql-server-5.1
+Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1
Provides: virtual-mysql-server
-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0, mysql-server-4.1
+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0
Description: MySQL database server binaries and system database setup
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -151,12 +148,12 @@
This is an empty package that depends on the current "best" version of
mysql-client (currently mysql-client-5.5), as determined by the MySQL
maintainers. Install this package if in doubt about which MySQL version
- you want, as this is the one we consider to be in the best shape.
+ you want, as this is the one considered to be in the best shape by the
+ Maintainers.
Package: mysql-testsuite-5.5
Architecture: any
-Depends: mysql-server, mysql-client, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: mysql-testsuite (<< ${source:Version})
+Depends: mysql-server (= ${source:Version}), mysql-client (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: MySQL testsuite
MySQL is a fast, stable, and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
Added: mysql-5.5/branches/experimental/debian/libmysqlclient-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient-dev.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient-dev.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+libmysqlclient-dev: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/libmysqlclient18.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqlclient18.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqlclient18.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+libmysqlclient18: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/libmysqld-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqld-dev.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqld-dev.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+libmysqld-dev: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/libmysqld-pic.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/libmysqld-pic.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/libmysqld-pic.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+libmysqld-pic: no-upstream-changelog
Modified: mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/mysql-client-5.5.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,5 +1,5 @@
-mysql-client-5.5: package-has-a-duplicate-relation
+# There is a patched bug report to split out innotop - #660087
mysql-client-5.5: wrong-name-for-upstream-changelog usr/share/doc/mysql-client-5.5/changelog.innotop.gz
-mysql-client-5.5: pkg-not-in-package-test innotop
+# Will look at man pages later
+# 2012-03-08 periapt
mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
-mysql-client-5.5: binary-without-manpage usr/bin/mysqltest_embedded
Added: mysql-5.5/branches/experimental/debian/mysql-client.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-client.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-client.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-client: no-upstream-changelog
Modified: mysql-5.5/branches/experimental/debian/mysql-common.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-common.lintian-overrides 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/mysql-common.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,2 +1,2 @@
-script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_init.d_mysql
-script-not-executable ./usr/share/mysql-common/internal-use-only/_etc_mysql_debian-start
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-common: no-upstream-changelog
Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,5 +1,2 @@
-mysql-server-5.5: command-with-path-in-maintainer-script postinst
-mysql-server-5.5: possible-bashism-in-maintainer-script postinst:81 'p{("a".."z","A".."Z",0..9)[int(rand(62))]}'
-mysql-server-5.5: possible-bashism-in-maintainer-script preinst:33 '${cmd/ */}'
-mysql-server-5.5: statically-linked-binary ./usr/bin/mysql_tzinfo_to_sql
-mysql-server-5.5: statically-linked-binary ./usr/sbin/mysqld
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-server-5.5: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/mysql-server-core-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-core-5.5.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-server-core-5.5.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-server-core-5.5: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/mysql-server.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-server.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-server: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/mysql-source-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-source-5.5.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-source-5.5.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
+mysql-source-5.5: no-upstream-changelog
Added: mysql-5.5/branches/experimental/debian/mysql-testsuite-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-testsuite-5.5.lintian-overrides (rev 0)
+++ mysql-5.5/branches/experimental/debian/mysql-testsuite-5.5.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -0,0 +1,2 @@
+# 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/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/patches/38_scripts__mysqld_safe.sh__signals.patch 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,6 +1,12 @@
-From: 38_scripts__mysqld_safe.sh__signals.dpatch by <ch at debian.org>
+Author: Christian Hammers <ch at debian.org>
Subject: Executes /etc/init.d/mysql on signals
+ Note if you check the bug report on mysql.com the patch is accepted
+ as interesting but they were waiting on Christian Hammers to sign an SCA.
+ Meanwhile this bug report fell off in the transition from 5.0 to 5.1.
Bug: http://bugs.mysql.com/bug.php?id=31361
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527623
+Last-Update: 2012-03-07
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
Modified: mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/patches/62_disable_tests.patch 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,3 +1,8 @@
+Author: Clint Byrum <clint at ubuntu.com>
+Subject: Convenient place to disable tests that are currently failing
+Forwarded: not-needed
+Last-Update: 2012-03-07
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,3 +15,5 @@
Modified: mysql-5.5/branches/experimental/debian/rules
===================================================================
--- mysql-5.5/branches/experimental/debian/rules 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/rules 2012-04-12 06:39:48 UTC (rev 2063)
@@ -268,19 +268,7 @@
install -m 0755 debian/additions/echo_stderr $(TMP)/usr/share/mysql/
install -m 0755 debian/additions/debian-start $(TMP)/etc/mysql/
install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
- # lintian overrides
- #mkdir -p $(TMP)/usr/share/lintian/overrides/
- #cp debian/mysql-common.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-common
- #cp debian/mysql-server-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-server-5.5
- #cp debian/mysql-client-5.5.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-client-5.5
- # For 5.0 -> 5.1 transition
- #d=$(TMP)/usr/share/mysql-common/internal-use-only/; \
- #mkdir -p $$d; \
- #cp debian/mysql-server-5.1.mysql.init $$d/_etc_init.d_mysql; \
- #cp debian/mysql-server-5.1.mysql-server.logrotate $$d/_etc_logrotate.d_mysql-server; \
- #cp debian/additions/debian-start $$d/_etc_mysql_debian-start;
-
install -D -m 0644 $(EXPORTED_SOURCE_TARBALL) $(TMP)/usr/src/mysql/`basename $(EXPORTED_SOURCE_TARBALL)`
install -D -m 0644 $(EXPORTED_SOURCE_TARBALL) $(TMP)/usr/src/mysql/`basename $(EXPORTED_SOURCE_TARBALL)`
@@ -304,6 +292,7 @@
dh_installlogcheck -i
dh_installchangelogs -i
dh_link -i
+ dh_lintian -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@ -338,6 +327,7 @@
dh_link -a # .so muss nach .so.1.2.3 installier werden!
dh_compress -a
dh_fixperms -a
+ dh_lintian -a
#dh_makeshlibs -a
dh_makeshlibs -plibmysqlclient18 -V'libmysqlclient18 (>= 5.5.13-1)'
dh_installdeb -a
Modified: mysql-5.5/branches/experimental/debian/source.lintian-overrides
===================================================================
--- mysql-5.5/branches/experimental/debian/source.lintian-overrides 2012-03-31 18:06:09 UTC (rev 2062)
+++ mysql-5.5/branches/experimental/debian/source.lintian-overrides 2012-04-12 06:39:48 UTC (rev 2063)
@@ -1,2 +1,7 @@
-maintainer-script-lacks-debhelper-token debian/mysql-server-5.5.postinst
+# The mysql-server-5.5.postrm script handles
+# what debhelper normally would.
+# This is apparently related to #526464.
maintainer-script-lacks-debhelper-token debian/mysql-server-5.5.postrm
+# Probably best to keep the debhelper version low in
+# case someone needs to backport
+package-needs-versioned-debhelper-build-depends 9
More information about the Pkg-mysql-commits
mailing list