[Commits] Rev 3237: Add missing include and library files to libmariadbclient-dev package. in http://bazaar.launchpad.net/~maria-captains/maria/5.5

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Wed Jan 25 14:39:55 EET 2012


At http://bazaar.launchpad.net/~maria-captains/maria/5.5

------------------------------------------------------------
revno: 3237
revision-id: knielsen at knielsen-hq.org-20120125123954-ixortt1eq6bha6j3
parent: monty at askmonty.org-20120125074341-6c146mamfvim9b87
committer: knielsen at knielsen-hq.org
branch nick: mariadb-5.5
timestamp: Wed 2012-01-25 13:39:54 +0100
message:
  Add missing include and library files to libmariadbclient-dev package.
=== modified file 'debian/dist/Debian/rules'
--- a/debian/dist/Debian/rules	2012-01-24 13:52:43 +0000
+++ b/debian/dist/Debian/rules	2012-01-25 12:39:54 +0000
@@ -73,7 +73,7 @@ endif
                 -DCMAKE_INSTALL_PREFIX=/usr \
                         -DINSTALL_SBINDIR=sbin  \
                         -DMYSQL_DATADIR=/var/lib/mysql \
-                        -DINSTALL_INCLUDEDIR=include \
+                        -DINSTALL_INCLUDEDIR=include/mysql \
                         -DINSTALL_INFODIR=share/info \
                         -DINSTALL_MANDIR=share/man \
                 \
@@ -169,6 +169,8 @@ install: build
         # libmysqlclient-dev: forgotten header file since 3.23.25?
         cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
         cp include/my_dir.h $(TMP)/usr/include/mysql/
+        mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
+        mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
 
         # mysql-common: We now provide our own config file.
         # can't be mariadb-common, other packages insist

=== modified file 'debian/dist/Ubuntu/rules'
--- a/debian/dist/Ubuntu/rules	2012-01-24 13:52:43 +0000
+++ b/debian/dist/Ubuntu/rules	2012-01-25 12:39:54 +0000
@@ -73,7 +73,7 @@ endif
                 -DCMAKE_INSTALL_PREFIX=/usr \
                         -DINSTALL_SBINDIR=sbin  \
                         -DMYSQL_DATADIR=/var/lib/mysql \
-                        -DINSTALL_INCLUDEDIR=include \
+                        -DINSTALL_INCLUDEDIR=include/mysql \
                         -DINSTALL_INFODIR=share/info \
                         -DINSTALL_MANDIR=share/man \
                 \
@@ -169,6 +169,8 @@ install: build
         # libmysqlclient-dev: forgotten header file since 3.23.25?
         cp $(BUILDDIR)/include/my_config.h $(TMP)/usr/include/mysql/
         cp include/my_dir.h $(TMP)/usr/include/mysql/
+        mv $(TMP)/usr/include/mysql/mysql/*.h $(TMP)/usr/include/mysql/
+        mv $(TMP)/usr/include/mysql/mysql/psi $(TMP)/usr/include/mysql/
 
         # mysql-common: We now provide our own config file.
         # can't be mariadb-common, other packages insist

=== modified file 'debian/libmariadbclient-dev.files'
--- a/debian/libmariadbclient-dev.files	2012-01-23 11:20:16 +0000
+++ b/debian/libmariadbclient-dev.files	2012-01-25 12:39:54 +0000
@@ -1,6 +1,8 @@
 usr/bin/mysql_config
 usr/include/mysql/*.h
+usr/include/mysql/psi/*.h
 usr/lib/libmysqlclient.a
 usr/lib/libmysqlclient_r.a
+usr/lib/libmysqlservices.a
 usr/share/aclocal/mysql.m4
 usr/share/man/man1/mysql_config.1



More information about the commits mailing list