[Pkg-mysql-commits] r2107 - mysql-5.5/branches/unstable/debian
Nicholas Bamber
periapt at alioth.debian.org
Thu May 17 21:47:32 UTC 2012
Author: periapt
Date: 2012-05-17 21:47:32 +0000 (Thu, 17 May 2012)
New Revision: 2107
Added:
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-testsuite-5.5.lintian-overrides
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides
mysql-5.5/branches/unstable/debian/mysql-server-5.5.install
mysql-5.5/branches/unstable/debian/rules
Log:
* Added --fail-missing to dh_install to catch executables not being installed
* Distributed unused resources amongst packages appropriately
* Added fixes to mop up various permissions issues in auto-install rule
* Added lintian overrides
- spelling false positive: yuR
- long lines in man pages that cannot be reformatted
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-05-15 22:09:00 UTC (rev 2106)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-05-17 21:47:32 UTC (rev 2107)
@@ -7,15 +7,19 @@
ephemeral dh_link files so that the hack is more comprehensible
* Stopped attempts to install non-existent files for libmysqlclient-dev
and mysql-server-5.5
+ * Added --fail-missing to dh_install to catch executables not being installed
+ * Distributed unused resources amongst packages appropriately
+ * Added fixes to mop up various permissions issues in auto-install rule
* Converted mysql-source-5.5 to arch:all
* Removed source cruft: debian/additions/mysql_config.1
* Restored zlib1g-dev build dependency pending further investigation
* 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
+ * Added lintian overrides
+ - spelling false positive: yuR
+ - long lines in man pages that cannot be reformatted
-- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
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-15 22:09:00 UTC (rev 2106)
+++ mysql-5.5/branches/unstable/debian/mysql-client-5.5.lintian-overrides 2012-05-17 21:47:32 UTC (rev 2107)
@@ -1,3 +1,7 @@
# Will look at man pages later
# 2012-03-08 periapt
mysql-client-5.5: binary-without-manpage usr/bin/innochecksum
+# These long lines reproduce actual output and to reformat them
+# would damage the integrity of the man page.
+mysql-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqladmin.1.gz 28: warning [p 1, 1.5i]: can't break line
+mysql-client-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqldump.1.gz 2151: warning [p 12, 6.5i, div `3tbd2,1', 0.2i]: can't break line
Modified: mysql-5.5/branches/unstable/debian/mysql-server-5.5.install
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.install 2012-05-15 22:09:00 UTC (rev 2106)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.install 2012-05-17 21:47:32 UTC (rev 2107)
@@ -1,6 +1,6 @@
usr/lib/mysql/plugin/*.so
etc/mysql/debian-start
-etc/mysql/conf.d/mysqld_safe_syslog.cnf
+debian/additions/mysqld_safe_syslog.cnf etc/mysql/conf.d/
usr/bin/msql2mysql
usr/bin/myisamchk
usr/bin/myisamlog
@@ -29,8 +29,3 @@
usr/share/mysql/config.medium.ini
usr/share/mysql/config.small.ini
usr/share/mysql/ndb-config-2-node.ini
-usr/share/mysql/debian-start.inc.sh
-usr/share/mysql/echo_stderr
-usr/share/mysql/errmsg-utf8.txt
-usr/share/mysql/mysqld_multi.server
-usr/share/mysql/mysql_test_data_timezone.sql
Added: mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.lintian-overrides 2012-05-17 21:47:32 UTC (rev 2107)
@@ -0,0 +1,3 @@
+# These long lines reproduce actual output and to reformat them
+# would damage the integrity of the man page.
+mysql-server-5.5: manpage-has-errors-from-man usr/share/man/man1/mysqlbinlog.1.gz 1405: warning [p 9, 7.5i, div `3tbd3,2', 0.8i]: can't break line
Added: 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 (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-server-core-5.5.lintian-overrides 2012-05-17 21:47:32 UTC (rev 2107)
@@ -0,0 +1,2 @@
+# These are random occurrences of a pseudo word in a binary.
+mysql-server-core-5.5: spelling-error-in-binary usr/sbin/mysqld yuR your
Added: mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-testsuite-5.5.lintian-overrides 2012-05-17 21:47:32 UTC (rev 2107)
@@ -0,0 +1,4 @@
+# These are random occurrences of a pseudo word in a binary.
+mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysql_client_test_embedded yuR your
+mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysql_embedded yuR your
+mysql-testsuite-5.5: spelling-error-in-binary usr/bin/mysqltest_embedded yuR your
Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-05-15 22:09:00 UTC (rev 2106)
+++ mysql-5.5/branches/unstable/debian/rules 2012-05-17 21:47:32 UTC (rev 2107)
@@ -151,8 +151,6 @@
# gets overwritten sooner or later with upstreams
mkdir -p $(TMP)/usr/share/man/man1/
cp debian/additions/*.1 $(TMP)/usr/share/man/man1/
- mkdir -p $(TMP)/etc/mysql/conf.d/
- cp debian/additions/mysqld_safe_syslog.cnf $(TMP)/etc/mysql/conf.d/
# make install (trailing slash needed for innobase)
cd $(builddir) && $(MAKE) install DESTDIR=$(TMP)/
# After installing, remove rpath to make lintian happy.
@@ -171,14 +169,20 @@
# mysql-server
mkdir -p $(TMP)/usr/share/doc/mysql-server-5.5/examples
mv $(TMP)/usr/share/mysql/*cnf $(TMP)/usr/share/doc/mysql-server-5.5/examples/
- rm -vf $(TMP)/usr/share/mysql/mi_test_all* \
- $(TMP)/usr/share/mysql/mysql-log-rotate \
- $(TMP)/usr/share/mysql/mysql.server \
- $(TMP)/usr/share/mysql/binary-configure
nm -n $(BUILDDIR)/sql/mysqld |gzip -9 > $(TMP)/usr/share/doc/mysql-server-5.5/mysqld.sym.gz
+ # This seems to be the only safe place to fix permissions issues
+ # not handled by dh_fixperms.
+ mkdir -p $(TMP)/etc/mysql/conf.d/
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/
+ chmod 0755 $(TMP)/usr/share/mysql-test/lib/My/SafeProcess/safe_process.pl
+ chmod 0755 $(TMP)/usr/share/mysql-test/std_data/checkDBI_DBD-mysql.pl
+ chmod 0644 $(TMP)/usr/share/mysql/*.ini
+ chmod 0644 $(TMP)/usr/share/mysql-test/[rt]/*
+ chmod 0644 $(TMP)/usr/share/mysql-test/collections/default.weekly
+ chmod 0644 $(TMP)/usr/share/mysql-test/suite/innodb/[rt]/*
+ chmod 0644 $(TMP)/usr/bin/mysqlaccess.conf
touch $@
# Use the --fail-missing to check for stuff that we should be installing
@@ -191,6 +195,13 @@
# 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.
+#
+# The following exclusions have been inherited from pre short form
+# debian/rules days.
+# usr/share/mysql/mi_test_all
+# usr/share/mysql/mysql-log-rotate
+# usr/share/mysql/mysql.server
+# usr/share/mysql/binary-configure
override_dh_install:
dh_install --fail-missing \
-Xusr/share/man/ \
@@ -198,7 +209,11 @@
-Xusr/share/info \
-Xusr/share/mysql/magic \
-Xusr/lib/mysql/plugin/daemon_example.ini \
- -Xusr/bin/mysqlaccess.conf
+ -Xusr/bin/mysqlaccess.conf \
+ -Xusr/share/mysql/mi_test_all \
+ -Xusr/share/mysql/mysql-log-rotate \
+ -Xusr/share/mysql/mysql.server \
+ -Xusr/share/mysql/binary-configure
libmysqlclient-links-stamp: auto_install-stamp
@echo "RULES.$@"
More information about the Pkg-mysql-commits
mailing list