[debian-mysql] [RFC PATCH 2/9] Re-enable lib*

Robie Basak robie.basak at canonical.com
Wed Aug 13 17:03:44 UTC 2014


Re-enable libmysqld-pic, libmysqld-dev, libmysqlclient18 and
libmysqlclient-dev (renamed accordingly) to replace binary packages
provided by src:mysql-5.5.
---
 debian/control                                  | 55 +++++++++++++++++++++++++
 debian/libmysqlclient-dev.README.Maintainer     |  4 ++
 debian/libmysqlclient-dev.dirs                  |  2 +
 debian/libmysqlclient-dev.examples              |  1 +
 debian/libmysqlclient-dev.install               |  7 ++++
 debian/libmysqlclient-dev.manpages              |  1 +
 debian/libmysqlclient18.1-dev.README.Maintainer |  4 --
 debian/libmysqlclient18.1-dev.dirs              |  2 -
 debian/libmysqlclient18.1-dev.examples          |  1 -
 debian/libmysqlclient18.1-dev.install           |  4 --
 debian/libmysqlclient18.1-dev.manpages          |  1 -
 debian/libmysqlclient18.1.dirs                  |  1 -
 debian/libmysqlclient18.1.install               |  1 -
 debian/libmysqlclient18.1.lintian-overrides     |  7 ----
 debian/libmysqlclient18.dirs                    |  1 +
 debian/libmysqlclient18.install                 |  2 +
 debian/libmysqlclient18.lintian-overrides       |  7 ++++
 debian/libmysqld-5.6-dev.install                |  2 -
 debian/libmysqld-5.6-pic.README.Debian          |  5 ---
 debian/libmysqld-5.6-pic.install                |  2 -
 debian/libmysqld-5.6-pic.manpages               |  1 -
 debian/libmysqld-dev.install                    |  2 +
 debian/libmysqld-pic.README.Debian              |  5 +++
 debian/libmysqld-pic.install                    |  2 +
 debian/libmysqld-pic.manpages                   |  1 +
 debian/rules                                    |  2 -
 26 files changed, 90 insertions(+), 33 deletions(-)
 create mode 100644 debian/libmysqlclient-dev.README.Maintainer
 create mode 100644 debian/libmysqlclient-dev.dirs
 create mode 100644 debian/libmysqlclient-dev.examples
 create mode 100644 debian/libmysqlclient-dev.install
 create mode 100644 debian/libmysqlclient-dev.manpages
 delete mode 100644 debian/libmysqlclient18.1-dev.README.Maintainer
 delete mode 100644 debian/libmysqlclient18.1-dev.dirs
 delete mode 100644 debian/libmysqlclient18.1-dev.examples
 delete mode 100644 debian/libmysqlclient18.1-dev.install
 delete mode 100644 debian/libmysqlclient18.1-dev.manpages
 delete mode 100644 debian/libmysqlclient18.1.dirs
 delete mode 100644 debian/libmysqlclient18.1.install
 delete mode 100644 debian/libmysqlclient18.1.lintian-overrides
 create mode 100644 debian/libmysqlclient18.dirs
 create mode 100644 debian/libmysqlclient18.install
 create mode 100644 debian/libmysqlclient18.lintian-overrides
 delete mode 100644 debian/libmysqld-5.6-dev.install
 delete mode 100644 debian/libmysqld-5.6-pic.README.Debian
 delete mode 100644 debian/libmysqld-5.6-pic.install
 delete mode 100644 debian/libmysqld-5.6-pic.manpages
 create mode 100644 debian/libmysqld-dev.install
 create mode 100644 debian/libmysqld-pic.README.Debian
 create mode 100644 debian/libmysqld-pic.install
 create mode 100644 debian/libmysqld-pic.manpages

diff --git a/debian/control b/debian/control
index 6b5fe9b..126b7b5 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,61 @@ Vcs-Git: git://git.debian.org/git/pkg-mysql/mysql-5.6.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mysql/mysql-5.6.git
 XS-Testsuite: autopkgtest
 
+Package: libmysqlclient18
+Section: libs
+Architecture: any
+Depends: mysql-common (>= 5.5), ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: multiarch-support, ${misc:Pre-Depends}
+Recommends: mysql-common-5.6
+Multi-Arch: same
+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
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the client library.
+
+Package: libmysqld-pic
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends}
+Description: PIC version of MySQL embedded server development files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the -fPIC version of the embedded server library.
+
+Package: libmysqld-dev
+Architecture: any
+Section: libdevel
+Depends: libmysqlclient-dev (>= ${source:Version}), ${misc:Depends}
+Description: MySQL embedded database development files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes the embedded server library and header files.
+
+Package: libmysqlclient-dev
+Architecture: any
+Section: libdevel
+Depends:
+ libmysqlclient18 (= ${binary:Version}),
+ zlib1g-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: MySQL database development files
+ MySQL is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MySQL are speed, robustness and
+ ease of use.
+ .
+ This package includes development libraries and header files.
+
 Package: mysql-common-5.6
 Architecture: all
 Depends: mysql-common, ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libmysqlclient-dev.README.Maintainer b/debian/libmysqlclient-dev.README.Maintainer
new file mode 100644
index 0000000..f24cdcd
--- /dev/null
+++ b/debian/libmysqlclient-dev.README.Maintainer
@@ -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
diff --git a/debian/libmysqlclient-dev.dirs b/debian/libmysqlclient-dev.dirs
new file mode 100644
index 0000000..f6ad287
--- /dev/null
+++ b/debian/libmysqlclient-dev.dirs
@@ -0,0 +1,2 @@
+usr/include/
+usr/lib/
diff --git a/debian/libmysqlclient-dev.examples b/debian/libmysqlclient-dev.examples
new file mode 100644
index 0000000..80a749f
--- /dev/null
+++ b/debian/libmysqlclient-dev.examples
@@ -0,0 +1 @@
+sql/udf_example.cc
diff --git a/debian/libmysqlclient-dev.install b/debian/libmysqlclient-dev.install
new file mode 100644
index 0000000..769007d
--- /dev/null
+++ b/debian/libmysqlclient-dev.install
@@ -0,0 +1,7 @@
+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/share/aclocal/mysql.m4
diff --git a/debian/libmysqlclient-dev.manpages b/debian/libmysqlclient-dev.manpages
new file mode 100644
index 0000000..3aac7f4
--- /dev/null
+++ b/debian/libmysqlclient-dev.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mysql_config.1
diff --git a/debian/libmysqlclient18.1-dev.README.Maintainer b/debian/libmysqlclient18.1-dev.README.Maintainer
deleted file mode 100644
index f24cdcd..0000000
--- a/debian/libmysqlclient18.1-dev.README.Maintainer
+++ /dev/null
@@ -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
diff --git a/debian/libmysqlclient18.1-dev.dirs b/debian/libmysqlclient18.1-dev.dirs
deleted file mode 100644
index f6ad287..0000000
--- a/debian/libmysqlclient18.1-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/
-usr/lib/
diff --git a/debian/libmysqlclient18.1-dev.examples b/debian/libmysqlclient18.1-dev.examples
deleted file mode 100644
index 80a749f..0000000
--- a/debian/libmysqlclient18.1-dev.examples
+++ /dev/null
@@ -1 +0,0 @@
-sql/udf_example.cc
diff --git a/debian/libmysqlclient18.1-dev.install b/debian/libmysqlclient18.1-dev.install
deleted file mode 100644
index 3fae026..0000000
--- a/debian/libmysqlclient18.1-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/bin/mysql_config
-usr/include/mysql/*
-usr/lib/*/libmysqlclient.a
-usr/share/aclocal/mysql.m4
diff --git a/debian/libmysqlclient18.1-dev.manpages b/debian/libmysqlclient18.1-dev.manpages
deleted file mode 100644
index 3aac7f4..0000000
--- a/debian/libmysqlclient18.1-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_config.1
diff --git a/debian/libmysqlclient18.1.dirs b/debian/libmysqlclient18.1.dirs
deleted file mode 100644
index 2964de6..0000000
--- a/debian/libmysqlclient18.1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/
diff --git a/debian/libmysqlclient18.1.install b/debian/libmysqlclient18.1.install
deleted file mode 100644
index e1fa46c..0000000
--- a/debian/libmysqlclient18.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmysqlclient.so.18.1*
diff --git a/debian/libmysqlclient18.1.lintian-overrides b/debian/libmysqlclient18.1.lintian-overrides
deleted file mode 100644
index 5ffbc28..0000000
--- a/debian/libmysqlclient18.1.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# I take this issue seriously but as per bug #590905
-# it will need playing with in experimental. - periapt
-libmysqlclient18.1: no-symbols-control-file usr/lib/i386-linux-gnu/libmysqlclient.so.18.1.0
-# Now that MySQL 5.6 client library package is name 18.1
-# so will have no other option but to overlook both errors
-libmysqlclient18.1: package-name-doesnt-match-sonames libmysqlclient18
-libmysqlclient18.1: ldconfig-symlink-referencing-wrong-file usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 -> libmysqlclient.so.18.1 instead of libmysqlclient.so.18.1.0
diff --git a/debian/libmysqlclient18.dirs b/debian/libmysqlclient18.dirs
new file mode 100644
index 0000000..2964de6
--- /dev/null
+++ b/debian/libmysqlclient18.dirs
@@ -0,0 +1 @@
+usr/lib/
diff --git a/debian/libmysqlclient18.install b/debian/libmysqlclient18.install
new file mode 100644
index 0000000..0feb497
--- /dev/null
+++ b/debian/libmysqlclient18.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmysqlclient.so.18*
+usr/lib/*/libmysqlclient_r.so.18*
diff --git a/debian/libmysqlclient18.lintian-overrides b/debian/libmysqlclient18.lintian-overrides
new file mode 100644
index 0000000..5ffbc28
--- /dev/null
+++ b/debian/libmysqlclient18.lintian-overrides
@@ -0,0 +1,7 @@
+# I take this issue seriously but as per bug #590905
+# it will need playing with in experimental. - periapt
+libmysqlclient18.1: no-symbols-control-file usr/lib/i386-linux-gnu/libmysqlclient.so.18.1.0
+# Now that MySQL 5.6 client library package is name 18.1
+# so will have no other option but to overlook both errors
+libmysqlclient18.1: package-name-doesnt-match-sonames libmysqlclient18
+libmysqlclient18.1: ldconfig-symlink-referencing-wrong-file usr/lib/x86_64-linux-gnu/libmysqlclient.so.18 -> libmysqlclient.so.18.1 instead of libmysqlclient.so.18.1.0
diff --git a/debian/libmysqld-5.6-dev.install b/debian/libmysqld-5.6-dev.install
deleted file mode 100644
index 11b84fb..0000000
--- a/debian/libmysqld-5.6-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libmysqld.a
-usr/lib/*/libmysqlservices.a
diff --git a/debian/libmysqld-5.6-pic.README.Debian b/debian/libmysqld-5.6-pic.README.Debian
deleted file mode 100644
index 4ec22b7..0000000
--- a/debian/libmysqld-5.6-pic.README.Debian
+++ /dev/null
@@ -1,5 +0,0 @@
-This package was requested in http://bugs.debian.org/508406 because it
-is needed by programs want to include the embedded MySQL into their
-shared libraries.
-
-In order to get the full compile flags, use /bin/mysql_config_pic
diff --git a/debian/libmysqld-5.6-pic.install b/debian/libmysqld-5.6-pic.install
deleted file mode 100644
index 7ff38b3..0000000
--- a/debian/libmysqld-5.6-pic.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/mysql_config_pic
-usr/lib/mysql/libmysqld_pic.a
diff --git a/debian/libmysqld-5.6-pic.manpages b/debian/libmysqld-5.6-pic.manpages
deleted file mode 100644
index 3e2e2b2..0000000
--- a/debian/libmysqld-5.6-pic.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/mysql_config_pic.1
diff --git a/debian/libmysqld-dev.install b/debian/libmysqld-dev.install
new file mode 100644
index 0000000..11b84fb
--- /dev/null
+++ b/debian/libmysqld-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libmysqld.a
+usr/lib/*/libmysqlservices.a
diff --git a/debian/libmysqld-pic.README.Debian b/debian/libmysqld-pic.README.Debian
new file mode 100644
index 0000000..4ec22b7
--- /dev/null
+++ b/debian/libmysqld-pic.README.Debian
@@ -0,0 +1,5 @@
+This package was requested in http://bugs.debian.org/508406 because it
+is needed by programs want to include the embedded MySQL into their
+shared libraries.
+
+In order to get the full compile flags, use /bin/mysql_config_pic
diff --git a/debian/libmysqld-pic.install b/debian/libmysqld-pic.install
new file mode 100644
index 0000000..7ff38b3
--- /dev/null
+++ b/debian/libmysqld-pic.install
@@ -0,0 +1,2 @@
+usr/bin/mysql_config_pic
+usr/lib/mysql/libmysqld_pic.a
diff --git a/debian/libmysqld-pic.manpages b/debian/libmysqld-pic.manpages
new file mode 100644
index 0000000..3e2e2b2
--- /dev/null
+++ b/debian/libmysqld-pic.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/mysql_config_pic.1
diff --git a/debian/rules b/debian/rules
index 71efe19..df560e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -196,8 +196,6 @@ auto_install-stamp:
 	chmod 0644 $(TMP)/usr/share/mysql-test/suite/parts/r/partition_exch_qa*.result
 	chmod 0644 $(TMP)/usr/share/mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
 	chmod 0644 $(TMP)/usr/share/mysql/innodb_memcached_config.sql
-	# removing all redundant library links at debian/tmp/usr/lib/*/*_r*
-	rm $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/*_r*
 	# getting rid of other extra files
 	rm -f $(TMP)/etc/mysql/conf.d/.keepme
 	touch $@
-- 
1.9.1




More information about the pkg-mysql-maint mailing list