[Pkg-mysql-commits] r2102 - mysql-5.5/branches/unstable/debian

[Nicholas Bamber]

Author: periapt
Date: 2012-05-12 20:13:25 +0000 (Sat, 12 May 2012)
New Revision: 2102

Added:
   mysql-5.5/branches/unstable/debian/mysql-server-5.5.install
   mysql-5.5/branches/unstable/debian/mysql-server-5.5.manpages
Removed:
   mysql-5.5/branches/unstable/debian/mysql-server-5.5.files
Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/rules
Log:
and mysql-server-5.5 off dh_movefiles
* Removed dh_movefiles override
and mysql-server-5.5

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2012-05-12 13:02:09 UTC (rev 2101)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-05-12 20:13:25 UTC (rev 2102)
@@ -1,10 +1,12 @@
 mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
 
   * Migrated libmysqlclient-dev, mysql-client-5.5, mysql-server-core-5.5
-    off dh_movefiles
+    and mysql-server-5.5 off dh_movefiles
+  * Removed dh_movefiles override
   * Rewrote libmysqlclient_r linking stuff to generate
     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
   * Converted mysql-source-5.5 to arch:all
   * Removed source cruft: debian/additions/mysql_config.1
   * Restored zlib1g-dev build dependency pending further investigation

Deleted: mysql-5.5/branches/unstable/debian/mysql-server-5.5.files
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.files	2012-05-12 13:02:09 UTC (rev 2101)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.files	2012-05-12 20:13:25 UTC (rev 2102)
@@ -1,57 +0,0 @@
-usr/lib/mysql/*so*
-usr/lib/mysql/plugin/*.so
-etc/mysql/debian-start
-etc/mysql/conf.d/mysqld_safe_syslog.cnf
-usr/bin/msql2mysql
-usr/bin/myisamchk
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_zap
-usr/bin/mysqlbinlog
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqlhotcopy
-usr/bin/mysqltest
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-usr/share/doc/mysql-server-5.5/
-usr/share/man/man1/msql2mysql.1
-usr/share/man/man1/myisamchk.1
-usr/share/man/man1/myisamlog.1
-usr/share/man/man1/myisampack.1
-usr/share/man/man1/mysqlbinlog.1
-usr/share/man/man1/mysql_convert_table_format.1
-usr/share/man/man1/mysqld_multi.1
-usr/share/man/man1/mysqld_safe.1
-usr/share/man/man1/mysqlhotcopy.1
-usr/share/man/man1/mysql_secure_installation.1
-usr/share/man/man1/mysql_setpermission.1
-usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mysql_zap.1
-usr/share/man/man1/perror.1
-usr/share/man/man1/replace.1
-usr/share/man/man1/resolveip.1
-usr/share/man/man1/resolve_stack_dump.1
-usr/share/man/man1/innochecksum.1
-usr/share/man/man1/mysqltest_embedded.1
-usr/share/man/man1/mysql_tzinfo_to_sql.1
-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
-usr/share/mysql/config.huge.ini
-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.install
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.install	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.install	2012-05-12 20:13:25 UTC (rev 2102)
@@ -0,0 +1,36 @@
+usr/lib/mysql/plugin/*.so
+etc/mysql/debian-start
+etc/mysql/conf.d/mysqld_safe_syslog.cnf
+usr/bin/msql2mysql
+usr/bin/myisamchk
+usr/bin/myisamlog
+usr/bin/myisampack
+usr/bin/mysql_convert_table_format
+usr/bin/mysql_secure_installation
+usr/bin/mysql_setpermission
+usr/bin/mysql_tzinfo_to_sql
+usr/bin/mysql_zap
+usr/bin/mysqlbinlog
+usr/bin/mysqld_multi
+usr/bin/mysqld_safe
+usr/bin/mysqlhotcopy
+usr/bin/mysqltest
+usr/bin/perror
+usr/bin/replace
+usr/bin/resolve_stack_dump
+usr/bin/resolveip
+usr/share/doc/mysql-server-5.5/
+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
+usr/share/mysql/config.huge.ini
+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.manpages
===================================================================
--- mysql-5.5/branches/unstable/debian/mysql-server-5.5.manpages	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/mysql-server-5.5.manpages	2012-05-12 20:13:25 UTC (rev 2102)
@@ -0,0 +1,20 @@
+debian/tmp/usr/share/man/man1/msql2mysql.1
+debian/tmp/usr/share/man/man1/myisamchk.1
+debian/tmp/usr/share/man/man1/myisamlog.1
+debian/tmp/usr/share/man/man1/myisampack.1
+debian/tmp/usr/share/man/man1/mysqlbinlog.1
+debian/tmp/usr/share/man/man1/mysql_convert_table_format.1
+debian/tmp/usr/share/man/man1/mysqld_multi.1
+debian/tmp/usr/share/man/man1/mysqld_safe.1
+debian/tmp/usr/share/man/man1/mysqlhotcopy.1
+debian/tmp/usr/share/man/man1/mysql_secure_installation.1
+debian/tmp/usr/share/man/man1/mysql_setpermission.1
+debian/tmp/usr/share/man/man1/mysqltest.1
+debian/tmp/usr/share/man/man1/mysql_zap.1
+debian/tmp/usr/share/man/man1/perror.1
+debian/tmp/usr/share/man/man1/replace.1
+debian/tmp/usr/share/man/man1/resolveip.1
+debian/tmp/usr/share/man/man1/resolve_stack_dump.1
+debian/tmp/usr/share/man/man1/innochecksum.1
+debian/tmp/usr/share/man/man1/mysqltest_embedded.1
+debian/tmp/usr/share/man/man1/mysql_tzinfo_to_sql.1

Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules	2012-05-12 13:02:09 UTC (rev 2101)
+++ mysql-5.5/branches/unstable/debian/rules	2012-05-12 20:13:25 UTC (rev 2102)
@@ -182,10 +182,6 @@
 	install -m 0755 debian/additions/debian-start.inc.sh $(TMP)/usr/share/mysql/
 	touch $@
 
-override_dh_install:
-	dh_movefiles
-	dh_install
-
 libmysqlclient-links-stamp: auto_install-stamp
 	@echo "RULES.$@"
 	# libmysqlclient_r is now a symlink to libmysqlclient. But it is