[Pkg-mysql-commits] r914 - branches/sid-5.1/debian
Christian Hammers
ch at alioth.debian.org
Sat Aug 25 19:56:38 UTC 2007
Author: ch
Date: 2007-08-25 19:56:38 +0000 (Sat, 25 Aug 2007)
New Revision: 914
Added:
branches/sid-5.1/debian/libmysqlclient16-dev.README.Maintainer
branches/sid-5.1/debian/libmysqlclient16-dev.dirs
branches/sid-5.1/debian/libmysqlclient16-dev.docs
branches/sid-5.1/debian/libmysqlclient16-dev.examples
branches/sid-5.1/debian/libmysqlclient16-dev.files
branches/sid-5.1/debian/libmysqlclient16-dev.lintian-overrides
branches/sid-5.1/debian/libmysqlclient16.dirs
branches/sid-5.1/debian/libmysqlclient16.docs
branches/sid-5.1/debian/libmysqlclient16.files
branches/sid-5.1/debian/libmysqlclient16.postinst
Removed:
branches/sid-5.1/debian/libmysqlclient15-dev.README.Maintainer
branches/sid-5.1/debian/libmysqlclient15-dev.dirs
branches/sid-5.1/debian/libmysqlclient15-dev.docs
branches/sid-5.1/debian/libmysqlclient15-dev.examples
branches/sid-5.1/debian/libmysqlclient15-dev.files
branches/sid-5.1/debian/libmysqlclient15-dev.links
branches/sid-5.1/debian/libmysqlclient15-dev.lintian-overrides
branches/sid-5.1/debian/libmysqlclient15off.NEWS
branches/sid-5.1/debian/libmysqlclient15off.README.Debian
branches/sid-5.1/debian/libmysqlclient15off.dirs
branches/sid-5.1/debian/libmysqlclient15off.docs
branches/sid-5.1/debian/libmysqlclient15off.files
branches/sid-5.1/debian/libmysqlclient15off.postinst
Modified:
branches/sid-5.1/debian/changelog
branches/sid-5.1/debian/control
branches/sid-5.1/debian/rules
Log:
mv libmysqlclient15off libmysqlclient16
Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/changelog 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,6 +1,7 @@
mysql-dfsg-5.1 (5.1.21beta-1) unstable; urgency=low
* New upstream version.
+ * libmysqlclient.so.15 has been superseeded to libmysqlclient.so.16.
* Synced with 5.0 branch up to subversion release r909.
-- Christian Hammers <ch at debian.org> Sat, 25 Aug 2007 14:24:40 +0200
Modified: branches/sid-5.1/debian/control
===================================================================
--- branches/sid-5.1/debian/control 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/control 2007-08-25 19:56:38 UTC (rev 914)
@@ -6,12 +6,10 @@
Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison, linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
Standards-Version: 3.7.2
-Package: libmysqlclient15off
+Package: libmysqlclient16
Section: libs
Architecture: any
Depends: mysql-common (>= ${Source-Version}), ${shlibs:Depends}
-Conflicts: libmysqlclient15
-Replaces: libmysqlclient15
Description: MySQL database client library
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
server. SQL (Structured Query Language) is the most popular database query
@@ -20,11 +18,11 @@
.
This package includes the client library.
-Package: libmysqlclient15-dev
+Package: libmysqlclient16-dev
Architecture: any
Section: libdevel
-Depends: libmysqlclient15off (>= ${Source-Version}), zlib1g-dev, , ${shlibs:Depends}
-Conflicts: libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
+Depends: libmysqlclient16 (>= ${Source-Version}), zlib1g-dev, , ${shlibs:Depends}
+Conflicts: libmysqlclient15-dev, libmysqlclient14-dev, libmysqlclient12-dev, libmysqlclient10-dev
Provides: libmysqlclient-dev
Description: MySQL database development files
MySQL is a fast, stable and true multi-user, multi-threaded SQL database
@@ -52,7 +50,7 @@
Package: mysql-client-5.1
Architecture: any
-Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient15off (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: debianutils (>=1.6), libdbi-perl, libdbd-mysql-perl (>= 1.2202), mysql-common (>= ${Source-Version}), libmysqlclient16 (>= ${Source-Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: virtual-mysql-client, mysql-client, mysql-client-4.1
Conflicts: mysql-client (<< ${Source-Version}), mysql-client-5.0
Replaces: mysql-client (<< ${Source-Version}), mysql-client-5.0
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.README.Maintainer
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.README.Maintainer 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.README.Maintainer 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,4 +0,0 @@
-The examples directory includes files that might be needed by some
-developers:
-- header files not installed by default
-- the example file udf_example.c
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.dirs
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.dirs 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.dirs 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,2 +0,0 @@
-usr/include/
-usr/lib/
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.docs
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.docs 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.docs 2007-08-25 19:56:38 UTC (rev 914)
@@ -1 +0,0 @@
-EXCEPTIONS-CLIENT
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.examples
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.examples 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.examples 2007-08-25 19:56:38 UTC (rev 914)
@@ -1 +0,0 @@
-sql/udf_example.c
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.files
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.files 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.files 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,7 +0,0 @@
-usr/bin/mysql_config
-usr/include/*
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/mysql
-usr/share/man/man1/mysql_config.1
-usr/share/lintian/overrides/libmysqlclient15-dev
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.links
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.links 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.links 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,2 +0,0 @@
-usr/lib/libmysqlclient.so.15 usr/lib/libmysqlclient.so
-usr/lib/libmysqlclient_r.so.15 usr/lib/libmysqlclient_r.so
Deleted: branches/sid-5.1/debian/libmysqlclient15-dev.lintian-overrides
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15-dev.lintian-overrides 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15-dev.lintian-overrides 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,2 +0,0 @@
-libmysqlclient15-dev: dev-pkg-without-shlib-symlink usr/lib/libndbclient.so.0.0.0 usr/lib/libndbclient.so
-libmysqlclient15-dev: package-name-doesnt-match-sonames libndbclient0
Deleted: branches/sid-5.1/debian/libmysqlclient15off.NEWS
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.NEWS 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.NEWS 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,6 +0,0 @@
-mysql-dfsg-5.0 (5.0.20-2) unstable; urgency=low
-
- Self-build binaries which link against libmysqlclient15 MUST be rebuild!
- (Read /usr/share/doc/libmysqlclient15off/README.Debian)
-
- -- Christian Hammers <ch at debian.org> Sat, 15 Apr 2006 13:05:22 +0200
Deleted: branches/sid-5.1/debian/libmysqlclient15off.README.Debian
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.README.Debian 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.README.Debian 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,23 +0,0 @@
-
-* Self-build binaries that are linked against libmysqlclient15 MUST be rebuild!
-===============================================================================
-
-This only affects binaries that are build on a Debian unstable/testing system
-before 2006-03-31 or version 5.0.19. "objdump -T myprogram | grep MYSQL_5.0"
-will give a couple of lines output in such a case.
-
-Until now libmysqlclient.so.15 had versioned symbols provided by a Debian
-patch. Now MySQL finally decided to adopt this patch but sadly chosed a
-different symbol name.
-
-Binaries linked against the old version of the library with my symbol name will
-not run with the new version with MySQL's symbol name ("version `MYSQL_5.0' not
-found"). The actual name /usr/lib/libmysqlclient.so.15 must stay because else
-binaries coming from systems other than Debian would never run on a Debian
-server.
-
-So the Debian package had to be renamed from "libmysqlclient15" to
-"libmysqlclient15off" and do now conflict with their former version.
-
--- 2006-03-14, Christian Hammers <ch at debian.org>
-
Deleted: branches/sid-5.1/debian/libmysqlclient15off.dirs
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.dirs 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.dirs 2007-08-25 19:56:38 UTC (rev 914)
@@ -1 +0,0 @@
-usr/lib/
Deleted: branches/sid-5.1/debian/libmysqlclient15off.docs
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.docs 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.docs 2007-08-25 19:56:38 UTC (rev 914)
@@ -1 +0,0 @@
-EXCEPTIONS-CLIENT
Deleted: branches/sid-5.1/debian/libmysqlclient15off.files
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.files 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.files 2007-08-25 19:56:38 UTC (rev 914)
@@ -1 +0,0 @@
-usr/lib/libmysqlclient*.so.*
Deleted: branches/sid-5.1/debian/libmysqlclient15off.postinst
===================================================================
--- branches/sid-5.1/debian/libmysqlclient15off.postinst 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/libmysqlclient15off.postinst 2007-08-25 19:56:38 UTC (rev 914)
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-# vim: ts=4
-
-
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.README.Maintainer (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.README.Maintainer)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.README.Maintainer (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.README.Maintainer 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1,4 @@
+The examples directory includes files that might be needed by some
+developers:
+- header files not installed by default
+- the example file udf_example.c
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.dirs (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.dirs)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.dirs (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.dirs 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1,2 @@
+usr/include/
+usr/lib/
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.docs (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.docs)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.docs (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.docs 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1 @@
+EXCEPTIONS-CLIENT
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.examples (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.examples)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.examples (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.examples 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1 @@
+sql/udf_example.c
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.files (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.files)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.files (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.files 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1,7 @@
+usr/bin/mysql_config
+usr/include/*
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/mysql
+usr/share/man/man1/mysql_config.1
+usr/share/lintian/overrides/libmysqlclient16-dev
Copied: branches/sid-5.1/debian/libmysqlclient16-dev.lintian-overrides (from rev 739, branches/sid-5.1/debian/libmysqlclient15-dev.lintian-overrides)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16-dev.lintian-overrides (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16-dev.lintian-overrides 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1,2 @@
+libmysqlclient16-dev: dev-pkg-without-shlib-symlink usr/lib/libndbclient.so.0.0.0 usr/lib/libndbclient.so
+libmysqlclient16-dev: package-name-doesnt-match-sonames libndbclient0
Copied: branches/sid-5.1/debian/libmysqlclient16.dirs (from rev 739, branches/sid-5.1/debian/libmysqlclient15off.dirs)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16.dirs (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16.dirs 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1 @@
+usr/lib/
Copied: branches/sid-5.1/debian/libmysqlclient16.docs (from rev 739, branches/sid-5.1/debian/libmysqlclient15off.docs)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16.docs (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16.docs 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1 @@
+EXCEPTIONS-CLIENT
Copied: branches/sid-5.1/debian/libmysqlclient16.files (from rev 739, branches/sid-5.1/debian/libmysqlclient15off.files)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16.files (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16.files 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1 @@
+usr/lib/libmysqlclient*.so.*
Copied: branches/sid-5.1/debian/libmysqlclient16.postinst (from rev 739, branches/sid-5.1/debian/libmysqlclient15off.postinst)
===================================================================
--- branches/sid-5.1/debian/libmysqlclient16.postinst (rev 0)
+++ branches/sid-5.1/debian/libmysqlclient16.postinst 2007-08-25 19:56:38 UTC (rev 914)
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+# vim: ts=4
+
+
Modified: branches/sid-5.1/debian/rules
===================================================================
--- branches/sid-5.1/debian/rules 2007-08-25 18:19:28 UTC (rev 913)
+++ branches/sid-5.1/debian/rules 2007-08-25 19:56:38 UTC (rev 914)
@@ -195,7 +195,7 @@
perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient.la
perl -pi -e 's#/usr/lib/mysql#/usr/lib#' $(TMP)/usr/lib/libmysqlclient_r.la
# Check if our beloved versioned symbols are really there
- if [ "`objdump -T $(TMP)/usr/lib/libmysqlclient.so.15.0.0 | grep -c libmysqlclient_15`" -lt 500 ]; then \
+ if [ "`objdump -T $(TMP)/usr/lib/libmysqlclient.so.16.0.0 | grep -c libmysqlclient_16`" -lt 500 ]; then \
echo "ERROR: versioned symbols are absent"; \
exit 1; \
fi
@@ -231,7 +231,7 @@
mkdir -p $(TMP)/usr/share/lintian/overrides/
cp debian/mysql-server-5.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-server-5.1
cp debian/mysql-client-5.1.lintian-overrides $(TMP)/usr/share/lintian/overrides/mysql-client-5.1
- cp debian/libmysqlclient15-dev.lintian-overrides $(TMP)/usr/share/lintian/overrides/libmysqlclient15-dev
+ cp debian/libmysqlclient16-dev.lintian-overrides $(TMP)/usr/share/lintian/overrides/libmysqlclient16-dev
dh_movefiles
@@ -290,10 +290,10 @@
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
- dh_makeshlibs -plibmysqlclient15off -V'libmysqlclient15off (>= 5.0.27-1)'
+ dh_makeshlibs -plibmysqlclient16 -V'libmysqlclient16 (>= 5.1.21-1)'
dh_installdeb -a
dh_perl -a
- dh_shlibdeps -a -l debian/libmysqlclient15off/usr/lib -L libmysqlclient15off
+ dh_shlibdeps -a -l debian/libmysqlclient16/usr/lib -L libmysqlclient16
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
More information about the Pkg-mysql-commits
mailing list