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

[Nicholas Bamber]

Author: periapt
Date: 2012-05-12 06:36:34 +0000 (Sat, 12 May 2012)
New Revision: 2099

Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/rules
Log:
Migrated libmysqlclient-dev, mysql-client-5.5 off dh_movefiles

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2012-05-11 09:54:57 UTC (rev 2098)
+++ mysql-5.5/branches/unstable/debian/changelog	2012-05-12 06:36:34 UTC (rev 2099)
@@ -1,6 +1,6 @@
 mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
 
-  * Migrated libmysqlclient-dev off dh_movefiles
+  * Migrated libmysqlclient-dev, mysql-client-5.5 off dh_movefiles
   * 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

Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules	2012-05-11 09:54:57 UTC (rev 2098)
+++ mysql-5.5/branches/unstable/debian/rules	2012-05-12 06:36:34 UTC (rev 2099)
@@ -169,10 +169,6 @@
 	install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
 	# mysql_config won't report the -fPIC, so give libmysqld-pic users a way to get their flags
 	install -m 0755 -o root -g root $(BUILDDIR_PIC)/scripts/mysql_config $(TMP)/usr/bin/mysql_config_pic
-	# mysql-client
-	install -m 0755 debian/additions/mysqlreport $(TMP)/usr/bin/
-	install -m 0755 debian/additions/innotop/innotop $(TMP)/usr/bin/
-	install -m 0644 debian/additions/innotop/innotop.1 $(TMP)/usr/share/man/man1/
 	# 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/