[Pkg-mysql-commits] r1689 - in mysql-connector-cpp/trunk/debian: . patches
Rene Engelhard
rene at alioth.debian.org
Thu Aug 20 21:46:12 UTC 2009
Author: rene
Date: 2009-08-20 21:46:11 +0000 (Thu, 20 Aug 2009)
New Revision: 1689
Added:
mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install
mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch
mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch
mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch
Removed:
mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install
Modified:
mysql-connector-cpp/trunk/debian/changelog
mysql-connector-cpp/trunk/debian/control
mysql-connector-cpp/trunk/debian/copyright
mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install
mysql-connector-cpp/trunk/debian/patches/00list
mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
mysql-connector-cpp/trunk/debian/rules
Log:
update to 1.0.6 (actually a snapshot which is really close to 1.0.6)
Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/changelog 2009-08-20 21:46:11 UTC (rev 1689)
@@ -1,3 +1,13 @@
+mysql-connector-c++ (1.0.6~r754-1) experimental; urgency=low
+
+ * New upstream snapshot
+ * use libmysqlclient-dev
+ * enable shared lib (now libmysqcppconn2)
+ * disable build of test/. get us a bogus libicu dep when icu is there on the
+ build system and we don't/can't run the tests anyway
+
+ -- Rene Engelhard <rene at debian.org> Thu, 20 Aug 2009 22:38:27 +0200
+
mysql-connector-c++ (1.0.5-1) experimental; urgency=low
* New upstream release
Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/control 2009-08-20 21:46:11 UTC (rev 1689)
@@ -2,7 +2,9 @@
Priority: optional
Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 7), cmake, libmysqlclient15-dev, dpatch
+Build-Depends: debhelper (>= 7), cmake, libmysqlclient-dev, dpatch, libboost-dev
+# only needed for tests and would result in a bogus dep otherwise
+Build-Conflicts: libicu-dev
Standards-Version: 3.7.3
Section: libs
Homepage: http://forge.mysql.com/wiki/Connector_C++
@@ -10,7 +12,7 @@
Package: libmysqlcppconn-dev
Section: libdevel
Architecture: any
-#Depends: libmysqlcppconn1 (= ${binary:Version})
+Depends: libmysqlcppconn2 (= ${binary:Version})
Description: MySQL Connector for C++ (development files)
MySQL Connector/C++ is a MySQL database connector for C++.
.
@@ -18,14 +20,14 @@
.
This package contains the development files (headers, static library).
-#Package: libmysqlcppconn1
-#Section: libs
-#Architecture: any
-#Depends: ${shlibs:Depends}
-#Description: MySQL Connector for C++ (library)
-# MySQL Connector/C++ is a MySQL database connector for C++.
-# .
-# It mimics the JDBC 4.0 API.
-# .
-# This package contains the shared library
+Package: libmysqlcppconn2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: MySQL Connector for C++ (library)
+ MySQL Connector/C++ is a MySQL database connector for C++.
+ .
+ It mimics the JDBC 4.0 API.
+ .
+ This package contains the shared library
Modified: mysql-connector-cpp/trunk/debian/copyright
===================================================================
--- mysql-connector-cpp/trunk/debian/copyright 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/copyright 2009-08-20 21:46:11 UTC (rev 1689)
@@ -82,4 +82,4 @@
Apache Portable Runtime (APR) Apache Software License 2.0
The Debian packaging is (C) 2008, Rene Engelhard <rene at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL v2, too, see `/usr/share/common-licenses/GPL-2'.
Modified: mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install 2009-08-20 21:46:11 UTC (rev 1689)
@@ -1,3 +1,3 @@
usr/include
usr/lib/libmysqlcppconn-static.a
-#usr/lib/*.so
+usr/lib/*.so
Deleted: mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install 2009-08-20 21:46:11 UTC (rev 1689)
@@ -1 +0,0 @@
-usr/lib/*.so.*
Copied: mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install (from rev 1688, mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install)
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install 2009-08-20 21:46:11 UTC (rev 1689)
@@ -0,0 +1 @@
+usr/lib/*.so.*
Modified: mysql-connector-cpp/trunk/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/patches/00list 2009-08-20 21:46:11 UTC (rev 1689)
@@ -1,2 +1,5 @@
01_OOo_r271359
02_no_README_LICENSE.mysql
+03_install_sqlstring.h
+04_libmysqlclient_SONAME
+05_disable_tests
Modified: mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2009-08-20 21:46:11 UTC (rev 1689)
@@ -5,26 +5,69 @@
## DP: No description.
@DPATCH@
-diff -urNad mysql-connector-c++-1.0.5~/CMakeLists.txt mysql-connector-c++-1.0.5/CMakeLists.txt
---- mysql-connector-c++-1.0.5~/CMakeLists.txt 2009-06-08 22:06:46.000000000 +0200
-+++ mysql-connector-c++-1.0.5/CMakeLists.txt 2009-06-08 22:07:31.000000000 +0200
-@@ -89,10 +89,7 @@
+diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 16:42:13.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 19:21:41.000000000 +0200
+@@ -181,12 +181,6 @@
+ SET(CPACK_PACKAGE_VERSION_PATCH 6)
+ SET(CPACK_PACKAGE_RELEASE_TYPE "")
SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
- IF(EXISTS "COPYING")
- SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
--ELSE(EXISTS "COPYING")
-- SET(CPACK_RESOURCE_FILE_LICENSE "LICENSE.mysql")
- ENDIF(EXISTS "COPYING")
--SET(CPACK_RESOURCE_FILE_README "README")
+-IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+-ELSE(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.mysql")
+-ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
SET(MYSQLCPPCONN_NUMERIC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
IF(EXTRA_VERSION)
SET(MYSQLCPPCONN_VERSION "${MYSQLCPPCONN_NUMERIC_VERSION}${EXTRA_VERSION}${CPACK_PACKAGE_RELEASE_TYPE}")
-@@ -114,7 +111,7 @@
+@@ -208,7 +202,7 @@
SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
ENDIF(WIN32)
--INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
-+INSTALL(FILES "COPYING" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
+-INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
++INSTALL(FILES "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
+diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt.rej mysql-connector-c++-1.0.6~r754/CMakeLists.txt.rej
+--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt.rej 1970-01-01 01:00:00.000000000 +0100
++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt.rej 2009-08-20 19:20:21.000000000 +0200
+@@ -0,0 +1,37 @@
++***************
++*** 89,98 ****
++ SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
++ IF(EXISTS "COPYING")
++ SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
++- ELSE(EXISTS "COPYING")
++- SET(CPACK_RESOURCE_FILE_LICENSE "LICENSE.mysql")
++ ENDIF(EXISTS "COPYING")
++- SET(CPACK_RESOURCE_FILE_README "README")
++ SET(MYSQLCPPCONN_NUMERIC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
++ IF(EXTRA_VERSION)
++ SET(MYSQLCPPCONN_VERSION "${MYSQLCPPCONN_NUMERIC_VERSION}${EXTRA_VERSION}${CPACK_PACKAGE_RELEASE_TYPE}")
++--- 89,95 ----
++ SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
++ IF(EXISTS "COPYING")
++ SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
++ ENDIF(EXISTS "COPYING")
++ SET(MYSQLCPPCONN_NUMERIC_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
++ IF(EXTRA_VERSION)
++ SET(MYSQLCPPCONN_VERSION "${MYSQLCPPCONN_NUMERIC_VERSION}${EXTRA_VERSION}${CPACK_PACKAGE_RELEASE_TYPE}")
++***************
++*** 114,120 ****
++ SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
++ ENDIF(WIN32)
++
++- INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
++
++ SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
++ ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
++--- 111,117 ----
++ SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
++ ENDIF(WIN32)
++
+++ INSTALL(FILES "COPYING" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
++
++ SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
++ ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
Added: mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch 2009-08-20 21:46:11 UTC (rev 1689)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_install_sqlstring.h.dpatch by <rene at pavillon.lan>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mysql-connector-c++-1.0.6~r754~/cppconn/CMakeLists.txt mysql-connector-c++-1.0.6~r754/cppconn/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/cppconn/CMakeLists.txt 2009-08-20 16:42:14.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/cppconn/CMakeLists.txt 2009-08-20 19:22:21.000000000 +0200
+@@ -52,6 +52,7 @@
+ prepared_statement.h
+ resultset.h
+ resultset_metadata.h
++ sqlstring.h
+ statement.h
+ warning.h)
+
Property changes on: mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch 2009-08-20 21:46:11 UTC (rev 1689)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_libmysqlclient_SONAME.dpatch by <rene at pavillon.lan>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
+--- mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 20:25:31.000000000 +0200
+@@ -26,7 +26,7 @@
+ #elif defined(__APPLE__)
+ static const char * const baseName = "libmysqlclient_r.dylib";
+ #else
+-static const char * const baseName = "libmysqlclient_r.so";
++static const char * const baseName = "libmysqlclient_r.so.16";
+ #endif
+
+ template<typename FunctionType>
Property changes on: mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch 2009-08-20 21:46:11 UTC (rev 1689)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_disable_tests.dpatch by Rene Engelhard <rene at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200
+@@ -241,10 +241,6 @@
+ ADD_SUBDIRECTORY(cppconn)
+ ADD_SUBDIRECTORY(driver)
+ ADD_SUBDIRECTORY(examples)
+-ADD_SUBDIRECTORY(test)
+-ADD_SUBDIRECTORY(test/framework)
+-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
+-ADD_SUBDIRECTORY(test/unit)
+
+ IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+ # see also README
Property changes on: mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/trunk/debian/rules 2009-08-20 21:46:11 UTC (rev 1689)
@@ -7,10 +7,16 @@
builddir/CMakeCache.txt: patch-stamp
dh_testdir
+
+ mkdir -p builddir
- mkdir -p builddir
- cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ # work around upstream breakge. cmake . works, but we don't
+ # want that in the toplevel, obviously
+ cp -rav * builddir || true
+ cd builddir && cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
+# cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+# -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
build: build-stamp
build-stamp: builddir/CMakeCache.txt
@@ -39,7 +45,6 @@
cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
binary-indep: build install
binary-arch: build install
@@ -54,7 +59,7 @@
dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
+ dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the Pkg-mysql-commits
mailing list