[Pkg-mysql-commits] r2105 - mysql-5.5/branches/unstable/debian
Nicholas Bamber
periapt at alioth.debian.org
Tue May 15 17:05:26 UTC 2012
Author: periapt
Date: 2012-05-15 17:05:26 +0000 (Tue, 15 May 2012)
New Revision: 2105
Added:
mysql-5.5/branches/unstable/debian/mysql-client-5.5.examples
mysql-5.5/branches/unstable/debian/mysql-server-5.5.examples
Removed:
mysql-5.5/branches/unstable/debian/libmysqlclient-dev.lintian-overrides
mysql-5.5/branches/unstable/debian/libmysqlclient18.lintian-overrides
mysql-5.5/branches/unstable/debian/libmysqld-dev.lintian-overrides
mysql-5.5/branches/unstable/debian/libmysqld-pic.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-client.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-common.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-server-core-5.5.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-server.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-source-5.5.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/control
mysql-5.5/branches/unstable/debian/copyright
mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.install
mysql-5.5/branches/unstable/debian/rules
Log:
* Distributed unused resources amongst packages appropriately
* Located and installed upstream changelog
* Removed doxygen-latex as build dependency
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-05-15 17:05:26 UTC (rev 2105)
@@ -13,6 +13,9 @@
* Removed the numerical prefix from the patch files
* Applied fix-mysqldump-test.patch from Ubuntu
* Added --fail-missing to dh_install to catch binaries not being installed
+ * Distributed unused resources amongst packages appropriately
+ * Located and installed upstream changelog
+ * Removed doxygen-latex as build dependency
-- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/control 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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), zlib1g-dev (>= 1:1.1.3-5), 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), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, po-debconf, psmisc, chrpath, ghostscript, gawk, bison, lsb-release, hardening-wrapper, cmake, libssl-dev
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/unstable/debian/copyright
===================================================================
--- mysql-5.5/branches/unstable/debian/copyright 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/copyright 2012-05-15 17:05:26 UTC (rev 2105)
@@ -160,6 +160,7 @@
of which version of the GPL is applied is otherwise unspecified.
Files: BUILD/*
+ Docs/*
client/*
client/echo.c
client/get_password.c
Deleted: mysql-5.5/branches/unstable/debian/libmysqlclient-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient-dev.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient-dev.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/libmysqlclient18.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient18.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient18.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/libmysqld-dev.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqld-dev.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/libmysqld-dev.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/libmysqld-pic.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqld-pic.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/libmysqld-pic.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-libmysqld-pic: no-upstream-changelog
Added: mysql-5.5/branches/unstable/debian/mysql-client-5.5.examples
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-5.5.examples (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-client-5.5.examples 2012-05-15 17:05:26 UTC (rev 2105)
@@ -0,0 +1 @@
+debian/tmp/usr/bin/mysqlaccess.conf
Modified: mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -1,5 +1,3 @@
-# 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
# Will look at man pages later
# 2012-03-08 periapt
mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
Deleted: mysql-5.5/branches/unstable/debian/mysql-client.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-client.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-client.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/mysql-common.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-common.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-common.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -1,2 +0,0 @@
-# See http://dev.mysql.com/doc/refman/5.5/en/news-5-5-x.html
-mysql-common: no-upstream-changelog
Added: mysql-5.5/branches/unstable/debian/mysql-server-5.5.examples
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.examples (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.examples 2012-05-15 17:05:26 UTC (rev 2105)
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/mysql/magic
+debian/tmp/usr/lib/mysql/plugin/daemon_example.ini
Deleted: mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/mysql-server-core-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-core-5.5.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-server-core-5.5.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/mysql-server.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-server.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/mysql-source-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-source-5.5.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-source-5.5.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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
Modified: mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.install
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.install 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.install 2012-05-15 17:05:26 UTC (rev 2105)
@@ -1 +1,4 @@
-/usr/share/mysql-test/* /usr/lib/mysql-testsuite/
+usr/share/mysql-test/* usr/lib/mysql-testsuite/
+usr/bin/mysql_client_test_embedded
+usr/bin/mysql_embedded
+usr/bin/mysqltest_embedded
Deleted: mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides 2012-05-15 17:05:26 UTC (rev 2105)
@@ -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/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-05-14 06:22:21 UTC (rev 2104)
+++ mysql-5.5/branches/unstable/debian/rules 2012-05-15 17:05:26 UTC (rev 2105)
@@ -182,14 +182,15 @@
touch $@
# Use the --fail-missing to check for stuff that we should be installing
-# Exclusions:
-# usr/share/man/ - dh_installman
-# libmysqlclient_r.so dh_links
-# usr/share/info [dh_installinfo - mysql-client ]
-# usr/share/mysql/magic [dh_installexamples - mysql-server]
-# usr/lib/mysql/plugin/daemon_example.ini [to investigate]
-# usr/bin/mysqlaccess.conf [dh_installexamples - mysql-client]
-# embdedded [-> test suite ?]
+# 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
+# Note: lintian complains about the upstream supplied info file
+# and we don't have the source to fix it.
override_dh_install:
dh_install --fail-missing \
-Xusr/share/man/ \
@@ -197,10 +198,7 @@
-Xusr/share/info \
-Xusr/share/mysql/magic \
-Xusr/lib/mysql/plugin/daemon_example.ini \
- -Xusr/bin/mysqlaccess.conf \
- -Xusr/bin/mysql_client_test_embedded \
- -Xusr/bin/mysql_embedded \
- -Xusr/bin/mysqltest_embedded
+ -Xusr/bin/mysqlaccess.conf
libmysqlclient-links-stamp: auto_install-stamp
@echo "RULES.$@"
@@ -226,6 +224,9 @@
dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; \
fi
+override_dh_installchangelogs:
+ dh_installchangelogs Docs/ChangeLog
+
# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
# started which might depend on a running database server.
override_dh_installinit-arch:
More information about the Pkg-mysql-commits
mailing list