and mysql-server-5.5 off dh_movefiles

* Removed dh_movefiles override
and mysql-server-5.5

git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2102 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1

4 files changed, 23 insertions, 26 deletions

diff --git a/debian/changelog b/debian/changelog
index d9d908e..2ac9f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/mysql-server-5.5.files b/debian/mysql-server-5.5.install
index 626f78d..e10fd56 100644
--- a/debian/mysql-server-5.5.files
+++ b/debian/mysql-server-5.5.install
@@ -1,4 +1,3 @@
-usr/lib/mysql/*so*
 usr/lib/mysql/plugin/*.so
 etc/mysql/debian-start
 etc/mysql/conf.d/mysqld_safe_syslog.cnf
@@ -21,26 +20,6 @@ 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
diff --git a/debian/mysql-server-5.5.manpages b/debian/mysql-server-5.5.manpages
new file mode 100644
index 0000000..bfe4d21
--- /dev/null
+++ b/debian/mysql-server-5.5.manpages
@@ -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
diff --git a/debian/rules b/debian/rules
index fc4623e..4e0f059 100755
--- a/debian/rules
+++ b/debian/rules
@@ -182,10 +182,6 @@ auto_install-stamp:
 	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