summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorperiapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2012-05-12 06:36:34 +0000
committerperiapt <periapt@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2012-05-12 06:36:34 +0000
commitd7b92f79022522490c4ff0c03081e90219058980 (patch)
tree4c6179c74cc3940c08f366d9b10d20593b19b80a
parent1f97cb68ffdd42e981a0d15e42b7af85aeabb7a5 (diff)
downloadmysql-5.5-d7b92f79022522490c4ff0c03081e90219058980.tar.gz
Migrated libmysqlclient-dev, mysql-client-5.5 off dh_movefiles
git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2099 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules4
2 files changed, 1 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 64541fc..01e18e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/rules b/debian/rules
index f296cef..fc4623e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -169,10 +169,6 @@ auto_install-stamp:
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/