[Pkg-mysql-commits] [mariadb-5.5] 02/04: Add sed lines to rename mysqlclient SONAME and files to mariadbclint in dh_auto_configure before configure and build

Otto Kekäläinen ottok-guest at moszumanska.debian.org
Tue Feb 4 17:52:51 UTC 2014 

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 721872239a1c11c07b22225dcde905030fb7bfbc
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Tue Feb 4 13:13:43 2014 +0200

    Add sed lines to rename mysqlclient SONAME and files to mariadbclint in dh_auto_configure before configure and build
---
 debian/changelog                                   |  1 +
 debian/libmariadbclient-dev.install                |  2 +-
 debian/libmariadbclient18.lintian-overrides        |  2 --
 debian/libmariadbd-dev.lintian-overrides           |  1 -
 debian/libmariadbdclient18.lintian-overrides       |  3 ---
 debian/mariadb-client-5.5.lintian-overrides        |  5 ----
 debian/mariadb-client-core-5.5.lintian-overrides   |  2 --
 debian/mariadb-test-5.5.lintian-overrides          |  8 +++---
 debian/patches/44_scripts__mysql_config__libs.diff |  4 +--
 debian/rules                                       | 29 +++++++++++-----------
 10 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 871fd88..31400b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ mariadb-5.5 (5.5.35-1) unstable; urgency=low
   * Updated Japanese debconf translation (Closes: #735284)
   * Updated French debconf translation (Closes: #736480)
   * Upstream includes fix for CVE-2014-0001 (Closes: #737597)
+  * Renamed SONAME properly (Closes: #732967)
 
  -- Otto Kekäläinen <otto at seravo.fi>  Wed, 29 Jan 2014 21:09:51 +0300
 
diff --git a/debian/libmariadbclient-dev.install b/debian/libmariadbclient-dev.install
index bcb134e..705af8e 100644
--- a/debian/libmariadbclient-dev.install
+++ b/debian/libmariadbclient-dev.install
@@ -2,5 +2,5 @@ usr/bin/mysql_config
 usr/include/mysql
 usr/lib/*/libmariadbclient.a
 usr/lib/*/libmariadbclient.so
-usr/lib/*/libmariadbservices.a
+usr/lib/*/libmysqlservices.a
 usr/share/aclocal/mysql.m4
diff --git a/debian/libmariadbclient18.lintian-overrides b/debian/libmariadbclient18.lintian-overrides
deleted file mode 100644
index 9577647..0000000
--- a/debian/libmariadbclient18.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libmariadbclient18: embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
-libmariadbclient18: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0 libmysqlclient.so.18
diff --git a/debian/libmariadbd-dev.lintian-overrides b/debian/libmariadbd-dev.lintian-overrides
index 1d07bc6..40cf761 100644
--- a/debian/libmariadbd-dev.lintian-overrides
+++ b/debian/libmariadbd-dev.lintian-overrides
@@ -1,4 +1,3 @@
 libmariadbd-dev: package-name-doesnt-match-sonames libmysqld18
-libmariadbd-dev: embedded-library usr/lib/x86_64-linux-gnu/libmysqld.so.18: libmysqlclient
 # OK, newer Debian should support xz
 libmariadbd-dev: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/libmariadbdclient18.lintian-overrides b/debian/libmariadbdclient18.lintian-overrides
deleted file mode 100644
index 73a6b9d..0000000
--- a/debian/libmariadbdclient18.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libmariadbclient18: package-name-doesnt-match-sonames libmysqlclient18
-libmariadbclient18: embedded-library usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0: libmysqlclient
-libmariadbclient18: ldconfig-symlink-missing-for-shlib usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 usr/lib/x86_64-linux-gnu/libmariadbclient.so.18.0.0 libmysqlclient.so.18
diff --git a/debian/mariadb-client-5.5.lintian-overrides b/debian/mariadb-client-5.5.lintian-overrides
index 682b40d..1581ccb 100644
--- a/debian/mariadb-client-5.5.lintian-overrides
+++ b/debian/mariadb-client-5.5.lintian-overrides
@@ -5,8 +5,3 @@ mariadb-client-5.5: binary-without-manpage usr/bin/innochecksum
 mariadb-client-5.5: binary-without-manpage usr/bin/mysqlanalyze
 mariadb-client-5.5: binary-without-manpage usr/bin/mysqloptimize
 mariadb-client-5.5: binary-without-manpage usr/bin/mysqlrepair
-mariadb-client-5.5: embedded-library usr/bin/mysqladmin: libmysqlclient
-mariadb-client-5.5: embedded-library usr/bin/mysqldump: libmysqlclient
-mariadb-client-5.5: embedded-library usr/bin/mysqlimport: libmysqlclient
-mariadb-client-5.5: embedded-library usr/bin/mysqlshow: libmysqlclient
-mariadb-client-5.5: embedded-library usr/bin/mysqlslap: libmysqlclient
diff --git a/debian/mariadb-client-core-5.5.lintian-overrides b/debian/mariadb-client-core-5.5.lintian-overrides
index b78be0a..205871d 100644
--- a/debian/mariadb-client-core-5.5.lintian-overrides
+++ b/debian/mariadb-client-core-5.5.lintian-overrides
@@ -1,4 +1,2 @@
-mariadb-client-core-5.5: embedded-library usr/bin/mysql: libmysqlclient
-mariadb-client-core-5.5: embedded-library usr/bin/mysqlcheck: libmysqlclient
 # OK in neẃer Debian, includes support for xz
 mariadb-client-core-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/mariadb-test-5.5.lintian-overrides b/debian/mariadb-test-5.5.lintian-overrides
index 5aae070..fa6fb16 100644
--- a/debian/mariadb-test-5.5.lintian-overrides
+++ b/debian/mariadb-test-5.5.lintian-overrides
@@ -1,7 +1,7 @@
 # OK to have embedded libraries in test suite
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmysqlclient
-mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmysqlclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmysqlclient
-mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmysqlclient
+mariadb-test-5.5: embedded-library usr/bin/mysql_client_test: libmariadbclient
+mariadb-test-5.5: embedded-library usr/bin/mysql_client_test_embedded: libmariadbclient
+mariadb-test-5.5: embedded-library usr/bin/mysqltest: libmariadbclient
+mariadb-test-5.5: embedded-library usr/bin/mysqltest_embedded: libmariadbclient
 # in modern Debian this xz support exists, this should not matter anymore
 mariadb-test-5.5: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
index a856961..93cacff 100755
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -13,11 +13,11 @@ diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.
  # Create options 
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs=" $ldflags -L$pkglibdir -lmysqlclient"
++libs=" $ldflags -L$pkglibdir -lmariadbclient"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
 -embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
-+libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @CLIENT_LIBS@ @openssl_libs@ "
++libs_r=" $ldflags -L$pkglibdir -lmariadbclient_r @CLIENT_LIBS@ @openssl_libs@ "
 +embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @WRAPLIBS@ @openssl_libs@ "
  
  if [ -r "$pkglibdir/libmygcc.a" ]; then
diff --git a/debian/rules b/debian/rules
index 5c55720..eb596df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,6 +74,17 @@ override_dh_prep:
 configure-stamp:
 	@echo "RULES.$@"
 	dh_testdir
+	
+	# Rename shared libraries SONAME and filenames
+	# libmysqlclient18.so > libmariadbclient18.so etc
+	sed -i 's/mysqlclient/mariadbclient/g' client/CMakeLists.txt tests/CMakeLists.txt libmysql/CMakeLists.txt scripts/CMakeLists.txt
+	sed -i 's/mysqlclient/mariadbclient/g' libmysql/libmysql.ver.in
+	sed -i 's/mysqlclient/mariadbclient/g' man/mysql_config.1
+	sed -i 's/mysqlclient/mariadbclient/g' scripts/make_win_bin_dist scripts/mysql_config.sh scripts/mysql_config.pl.in
+	# Patch 44_scripts__mysql_config__libs also contains 'mysqlclient' but is compatible with this
+	# Stuff in storage/ndb/* is not compiled, no need to sed it.
+	# Neither does RPM packaging related files or comments in other code need sedding.
+	
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
 	    	CC=$${MYSQL_BUILD_CC:-gcc} \
@@ -90,14 +101,15 @@ configure-stamp:
 	    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
 	    -DINSTALL_SUPPORTFILESDIR=share/mysql \
 		-DDEB=1 ..'
-	touch $@
-	touch debug-distribution-$(DISTRIBUTION)
+	@echo "Debug: DISTRIBUTION=$(DISTRIBUTION)"
 ifeq ($(DISTRIBUTION),Ubuntu)
-	touch debug-release-$(RELEASE)
+	@echo "Debug: RELEASE=$(RELEASE)"
 ifeq ($(RELEASE),14.04)
 	sed -i '/ha_oqgraph.so/d' debian/mariadb-server-5.5.install.in
+	@echo "Debug: ha_oqgraph.so removed from 'mariadb-server-5.5.install.in'"
 endif
 endif
+	touch $@
 
 override_dh_auto_build: build-stamp
 
@@ -168,17 +180,6 @@ auto_install-stamp:
 	install -m 0644 $(builddir)/Docs/INFO_SRC $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_SRC
 	install -m 0644 $(builddir)/Docs/INFO_BIN $(TMP)/usr/share/doc/mariadb-server-5.5/INFO_BIN
 	
-	# Rename libmysqlclient18.x to libmariadbclient18.x
-	# Leave old files in place for -dev packages to use
-	cp $(SHARED_LIBS_DIR)/libmysqlclient.a $(SHARED_LIBS_DIR)/libmariadbclient.a
-	cp $(SHARED_LIBS_DIR)/libmysqlclient.so.18.0.0 $(SHARED_LIBS_DIR)/libmariadbclient.so.18.0.0
-	# Also rename links including link targets
-	# libmysqlclient.so -> libmysqlclient.so.18
-	# libmysqlclient.so.18 -> libmysqlclient.so.18.0.0
-	ln -s libmariadbclient.so.18 $(SHARED_LIBS_DIR)/libmariadbclient.so
-	ln -s libmariadbclient.so.18.0.0 $(SHARED_LIBS_DIR)/libmariadbclient.so.18
-	# Available in libmariadbclient-dev
-	cp $(SHARED_LIBS_DIR)/libmysqlservices.a $(SHARED_LIBS_DIR)/libmariadbservices.a
 	# mariadb-test
 	mv $(TMP)/usr/mysql-test $(TMP)/usr/share/mysql
 	touch $@

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git

More information about the Pkg-mysql-commits mailing list