[Pkg-mysql-commits] r1906 - in mysql-connector-cpp/trunk/debian: . patches source
Rene Engelhard
rene at alioth.debian.org
Thu Oct 7 18:04:33 UTC 2010
Author: rene
Date: 2010-10-07 18:04:26 +0000 (Thu, 07 Oct 2010)
New Revision: 1906
Added:
mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport5.install
mysql-connector-cpp/trunk/debian/libmysqlcppconn5.install
mysql-connector-cpp/trunk/debian/patches/attribute_visibility_default_for_exceptions.diff
mysql-connector-cpp/trunk/debian/patches/disable_tests.diff
mysql-connector-cpp/trunk/debian/patches/libmysqlclient_SONAME.diff
mysql-connector-cpp/trunk/debian/patches/no_README_LICENSE.mysql.diff
mysql-connector-cpp/trunk/debian/patches/series
mysql-connector-cpp/trunk/debian/source/
mysql-connector-cpp/trunk/debian/source/format
Removed:
mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install
mysql-connector-cpp/trunk/debian/libmysqlcppconn4.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/patches/04_libmysqlclient_SONAME.dpatch
mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch
mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch
Modified:
mysql-connector-cpp/trunk/debian/changelog
mysql-connector-cpp/trunk/debian/control
mysql-connector-cpp/trunk/debian/rules
Log:
update to 1.1.0 final release
Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/changelog 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,3 +1,10 @@
+mysql-connector-c++ (1.1.0-1) UNRELEASED; urgency=low
+
+ * Update to 1.1.0 final release
+ * migrate from dpatch to "3.0 (quilt)" format
+
+ -- Rene Engelhard <rene at debian.org> Thu, 07 Oct 2010 19:56:17 +0200
+
mysql-connector-c++ (1.1.0~r814-1) unstable; urgency=low
* new bzr snapshot
Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/control 2010-10-07 18:04:26 UTC (rev 1906)
@@ -2,7 +2,7 @@
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, libmysqlclient-dev, dpatch, libboost-dev
+Build-Depends: debhelper (>= 7), cmake, libmysqlclient-dev, libboost-dev
Standards-Version: 3.7.3
Section: libs
Homepage: http://forge.mysql.com/wiki/Connector_C++
@@ -10,7 +10,7 @@
Package: libmysqlcppconn-dev
Section: libdevel
Architecture: any
-Depends: libmysqlcppconn4 (= ${binary:Version}), ${misc:Depends}
+Depends: libmysqlcppconn5 (= ${binary:Version}), ${misc:Depends}
Description: MySQL Connector for C++ (development files)
MySQL Connector/C++ is a MySQL database connector for C++.
.
@@ -18,7 +18,7 @@
.
This package contains the development files (headers, static library).
-Package: libmysqlcppconn4
+Package: libmysqlcppconn5
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Deleted: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1 +0,0 @@
-usr/lib/libmysqlcppconn-stlport.so.*
Copied: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport5.install (from rev 1898, mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install)
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport5.install (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport5.install 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn-stlport.so.*
Deleted: mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1 +0,0 @@
-usr/lib/libmysqlcppconn.so.*
Copied: mysql-connector-cpp/trunk/debian/libmysqlcppconn5.install (from rev 1898, mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install)
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn5.install (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn5.install 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn.so.*
Deleted: mysql-connector-cpp/trunk/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/patches/00list 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,4 +0,0 @@
-02_no_README_LICENSE.mysql
-04_libmysqlclient_SONAME
-05_disable_tests
-07_attribute_visibility_default_for_exceptions
Deleted: mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_no_README_LICENSE.mysql.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 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 "${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}")
-@@ -208,7 +202,7 @@
- SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
- ENDIF(WIN32)
-
--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"
Deleted: mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,19 +0,0 @@
-#! /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>
Deleted: mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,21 +0,0 @@
-#! /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
Deleted: mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch 2010-10-07 18:04:26 UTC (rev 1906)
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_attribute_visibility_default_for_exceptions.dpatch by <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.1.0~r791~/cppconn/exception.h mysql-connector-c++-1.1.0~r791/cppconn/exception.h
---- mysql-connector-c++-1.1.0~r791~/cppconn/exception.h 2009-12-02 19:07:54.000000000 +0100
-+++ mysql-connector-c++-1.1.0~r791/cppconn/exception.h 2009-12-02 19:11:55.000000000 +0100
-@@ -17,6 +17,8 @@
- #include <string>
- #include <memory>
-
-+#define CPPCONN_PUBLIC_EXCEPTION __attribute__((visibility("default")))
-+
- namespace sql
- {
-
-@@ -37,7 +39,7 @@
- #pragma warning(push)
- #pragma warning(disable: 4275)
- #endif
--class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
-+class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
- {
- #ifdef _WIN32
- #pragma warning(pop)
-@@ -83,26 +85,26 @@
- MEMORY_ALLOC_OPERATORS(SQLException)
- };
-
--struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
- {
- MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
--struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
- {
- InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
--struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
- {
- InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
- };
-
-
--struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
-+struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
- {
- NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
- NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
Copied: mysql-connector-cpp/trunk/debian/patches/attribute_visibility_default_for_exceptions.diff (from rev 1898, mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch)
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/attribute_visibility_default_for_exceptions.diff (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/attribute_visibility_default_for_exceptions.diff 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1,52 @@
+diff -urNad mysql-connector-c++-1.1.0~r791~/cppconn/exception.h mysql-connector-c++-1.1.0~r791/cppconn/exception.h
+--- mysql-connector-c++-1.1.0~r791~/cppconn/exception.h 2009-12-02 19:07:54.000000000 +0100
++++ mysql-connector-c++-1.1.0~r791/cppconn/exception.h 2009-12-02 19:11:55.000000000 +0100
+@@ -17,6 +17,8 @@
+ #include <string>
+ #include <memory>
+
++#define CPPCONN_PUBLIC_EXCEPTION __attribute__((visibility("default")))
++
+ namespace sql
+ {
+
+@@ -37,7 +39,7 @@
+ #pragma warning(push)
+ #pragma warning(disable: 4275)
+ #endif
+-class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
++class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
+ {
+ #ifdef _WIN32
+ #pragma warning(pop)
+@@ -83,26 +85,26 @@
+ MEMORY_ALLOC_OPERATORS(SQLException)
+ };
+
+-struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
+ {
+ MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+-struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
+ {
+ InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+-struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
+ {
+ InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
+ };
+
+
+-struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
+ {
+ NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
Copied: mysql-connector-cpp/trunk/debian/patches/disable_tests.diff (from rev 1898, mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch)
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/disable_tests.diff (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/disable_tests.diff 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1,14 @@
+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
Copied: mysql-connector-cpp/trunk/debian/patches/libmysqlclient_SONAME.diff (from rev 1898, mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch)
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/libmysqlclient_SONAME.diff (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/libmysqlclient_SONAME.diff 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1,12 @@
+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
+@@ -41,7 +41,7 @@
+ #elif defined(__hpux) && defined(__hppa)
+ static const char * const baseName = "libmysqlclient_r.sl";
+ #else
+-static const char * const baseName = "libmysqlclient_r.so";
++static const char * const baseName = "libmysqlclient_r.so.16";
+ #endif
+
+ template<typename FunctionType>
Copied: mysql-connector-cpp/trunk/debian/patches/no_README_LICENSE.mysql.diff (from rev 1898, mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch)
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/no_README_LICENSE.mysql.diff (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/no_README_LICENSE.mysql.diff 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1,25 @@
+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
+@@ -198,12 +198,6 @@
+ SET(CPACK_PACKAGE_VERSION_PATCH 0)
+ SET(CPACK_PACKAGE_RELEASE_TYPE "")
+ SET(CPACK_PACKAGE_VENDOR "Oracle and/or its affiliates")
+-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}/ANNOUNCEMENT")
+-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}")
+@@ -208,7 +202,7 @@
+ SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
+ ENDIF(WIN32)
+
+-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"
Copied: mysql-connector-cpp/trunk/debian/patches/series (from rev 1898, mysql-connector-cpp/trunk/debian/patches/00list)
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/series (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/series 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1,4 @@
+#no_README_LICENSE.mysql.diff
+libmysqlclient_SONAME.diff
+disable_tests.diff
+attribute_visibility_default_for_exceptions.diff
Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules 2010-10-03 10:53:38 UTC (rev 1905)
+++ mysql-connector-cpp/trunk/debian/rules 2010-10-07 18:04:26 UTC (rev 1906)
@@ -57,7 +57,7 @@
dh_strip -s
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibmysqlcppconn4 -V'libmysqlcppconn4 (>= 1.1.0~r791)'
+ dh_makeshlibs -s
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
Added: mysql-connector-cpp/trunk/debian/source/format
===================================================================
--- mysql-connector-cpp/trunk/debian/source/format (rev 0)
+++ mysql-connector-cpp/trunk/debian/source/format 2010-10-07 18:04:26 UTC (rev 1906)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-mysql-commits
mailing list