[Pkg-mysql-commits] r2097 - in mysql-5.5/branches/unstable/debian: . additions
Nicholas Bamber
periapt at alioth.debian.org
Thu May 10 22:23:03 UTC 2012
Author: periapt
Date: 2012-05-10 22:23:03 +0000 (Thu, 10 May 2012)
New Revision: 2097
Added:
mysql-5.5/branches/unstable/debian/clean
mysql-5.5/branches/unstable/debian/libmysqlclient-dev.install
mysql-5.5/branches/unstable/debian/libmysqlclient-dev.manpages
Removed:
mysql-5.5/branches/unstable/debian/additions/mysql_config.1
mysql-5.5/branches/unstable/debian/libmysqlclient-dev.files
Modified:
mysql-5.5/branches/unstable/debian/changelog
mysql-5.5/branches/unstable/debian/control
mysql-5.5/branches/unstable/debian/libmysqlclient18.install
mysql-5.5/branches/unstable/debian/rules
Log:
* Migrated libmysqlclient-dev 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
* Converted mysql-source-5.5 to arch:all
* Removed source cruft: debian/additions/mysql_config.1
Deleted: mysql-5.5/branches/unstable/debian/additions/mysql_config.1
===================================================================
--- mysql-5.5/branches/unstable/debian/additions/mysql_config.1 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/additions/mysql_config.1 2012-05-10 22:23:03 UTC (rev 2097)
@@ -1,17 +0,0 @@
-.TH mysql 1 "17 March 2003" "MySQL 3.23" "MySQL database"
-.SH NAME
-mysqlconfig \- MySQL compile settings.
-.SH SYNOPSIS
-mysqlconfig [options]
-.SH DESCRIPTION
-This program is only useful for people who want to compile agains
-libmysqlclient.
-
-For more information start the program with '--help'.
-.SH "SEE ALSO"
-mysql (1), mysqld (1)
-.SH AUTHOR
-This manpage was written by Christian Hammers <ch at debian.org>.
-
-MySQL is available at http://www.mysql.com/.
-.\" end of man page
Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/changelog 2012-05-10 22:23:03 UTC (rev 2097)
@@ -1,3 +1,14 @@
+mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low
+
+ * Migrated libmysqlclient-dev 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
+ * Converted mysql-source-5.5 to arch:all
+ * Removed source cruft: debian/additions/mysql_config.1
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk> Tue, 08 May 2012 09:04:25 +0100
+
mysql-5.5 (5.5.23-2) unstable; urgency=low
* Stopped overriding the -j build parameter (Closes: #512964)
Added: mysql-5.5/branches/unstable/debian/clean
===================================================================
--- mysql-5.5/branches/unstable/debian/clean (rev 0)
+++ mysql-5.5/branches/unstable/debian/clean 2012-05-10 22:23:03 UTC (rev 2097)
@@ -0,0 +1,2 @@
+debian/libmysqlclient18.links
+debian/libmysqlclient-dev.links
Modified: mysql-5.5/branches/unstable/debian/control
===================================================================
--- mysql-5.5/branches/unstable/debian/control 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/control 2012-05-10 22:23:03 UTC (rev 2097)
@@ -116,8 +116,8 @@
Depends: mysql-client-5.5 (>= ${source:Version}), libdbi-perl, perl (>= 5.6), ${shlibs:Depends}, ${misc:Depends}, psmisc, passwd, lsb-base (>= 3.0-10), mysql-server-core-5.5 (= ${binary:Version})
Breaks: mysql-server (<< ${source:Version}), mysql-server-5.1, libmysqlclient-dev ( << 5.5.17~), mysql-client-5.1
Provides: virtual-mysql-server
-Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0, , mysql-client-5.1,
- libmysqlclient-dev ( << 5.5.17~)
+Replaces: mysql-server (<< ${source:Version}), mysql-server-5.1, mysql-server-5.0,
+ mysql-client-5.1, libmysqlclient-dev ( << 5.5.17~)
Description: MySQL database server binaries and system database setup
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -164,7 +164,7 @@
This package includes the MySQL testsuite.
Package: mysql-source-5.5
-Architecture: any
+Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: MySQL source
MySQL is a fast, stable, and true multi-user, multi-threaded SQL database
Deleted: mysql-5.5/branches/unstable/debian/libmysqlclient-dev.files
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient-dev.files 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient-dev.files 2012-05-10 22:23:03 UTC (rev 2097)
@@ -1,11 +0,0 @@
-usr/bin/mysql_config
-usr/include/mysql/*
-usr/lib/*/libmysqlclient.a
-usr/lib/*/libmysqlclient.so
-usr/lib/*/libmysqlclient_r.a
-usr/lib/*/libmysqlclient_r.so
-usr/lib/*/mysql/plugin/ha_example.*
-usr/lib/*/mysql/plugin/ha_*_plugin.a
-usr/lib/*/mysql/plugin/ha_*_plugin.la
-usr/share/aclocal/mysql.m4
-usr/share/man/man1/mysql_config.1
Added: mysql-5.5/branches/unstable/debian/libmysqlclient-dev.install
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient-dev.install (rev 0)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient-dev.install 2012-05-10 22:23:03 UTC (rev 2097)
@@ -0,0 +1,6 @@
+usr/bin/mysql_config
+usr/include/mysql/*
+usr/lib/*/libmysqlclient.a
+usr/lib/*/libmysqlclient.so
+usr/lib/*/libmysqlclient_r.a
+usr/share/aclocal/mysql.m4
Added: mysql-5.5/branches/unstable/debian/libmysqlclient-dev.manpages
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient-dev.manpages (rev 0)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient-dev.manpages 2012-05-10 22:23:03 UTC (rev 2097)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mysql_config.1
Modified: mysql-5.5/branches/unstable/debian/libmysqlclient18.install
===================================================================
--- mysql-5.5/branches/unstable/debian/libmysqlclient18.install 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/libmysqlclient18.install 2012-05-10 22:23:03 UTC (rev 2097)
@@ -1,2 +1 @@
usr/lib/*/libmysqlclient.so.*
-usr/lib/*/libmysqlclient_r.so.*
Modified: mysql-5.5/branches/unstable/debian/rules
===================================================================
--- mysql-5.5/branches/unstable/debian/rules 2012-05-08 07:22:51 UTC (rev 2096)
+++ mysql-5.5/branches/unstable/debian/rules 2012-05-10 22:23:03 UTC (rev 2097)
@@ -114,7 +114,6 @@
-DWITH_EXTRA_CHARSETS=all ..'
touch $@
-
override_dh_auto_build: build-stamp build-pic-stamp
build-stamp:
@@ -165,13 +164,6 @@
| cut -d: -f 1 \
| xargs --no-run-if-empty chrpath -d; \
set -e
- # libmysqlclient_r is now a symlink to libmysqlclient. But it is
- # created wrong by the cmake build system and points at
- # libmysqlclient.so instead of the corresponding versioned lib.
- for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so*` ; do \
- rlib=`basename $$i | sed -e 's/libmysqlclient\./libmysqlclient_r./'` ;\
- ln -sf `basename $$i` $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/$$rlib ;\
- done
# install libmysqld built with -FPIC
install -d -m 0755 -o root -g root $(TMP)/usr/lib/mysql
install -m 0644 -o root -g root $(BUILDDIR_PIC)/libmysqld/libmysqld.a $(TMP)/usr/lib/mysql/libmysqld_pic.a
@@ -198,6 +190,24 @@
dh_movefiles
dh_install
+libmysqlclient-links-stamp: auto_install-stamp
+ @echo "RULES.$@"
+ # libmysqlclient_r is now a symlink to libmysqlclient. But it is
+ # created wrong by the cmake build system and points at
+ # libmysqlclient.so instead of the corresponding versioned lib.
+ echo usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient_r.so > debian/libmysqlclient-dev.links
+ rm -f debian/libmysqlclient18.links
+ for i in `ls $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmysqlclient.so.*`; \
+ do \
+ source=`basename $$i`; \
+ dest=`echo $$source | sed -e's/libmysqlclient/libmysqlclient_r/'`; \
+ echo usr/lib/$(DEB_HOST_MULTIARCH)/$$source usr/lib/$(DEB_HOST_MULTIARCH)/$$dest >> debian/libmysqlclient18.links; \
+ done
+ touch $@
+
+override_dh_link-arch: libmysqlclient-links-stamp
+ dh_link
+
override_dh_installlogrotate-arch:
dh_installlogrotate --name mysql-server
if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \
More information about the Pkg-mysql-commits
mailing list