[Pkg-mysql-commits] r1909 - in mysql-connector-cpp/tags: . 1.1.0-1/debian 1.1.0-1/debian/patches
Rene Engelhard
rene at alioth.debian.org
Thu Oct 7 21:27:25 UTC 2010
Author: rene
Date: 2010-10-07 21:27:20 +0000 (Thu, 07 Oct 2010)
New Revision: 1909
Added:
mysql-connector-cpp/tags/1.1.0-1/
mysql-connector-cpp/tags/1.1.0-1/debian/changelog
mysql-connector-cpp/tags/1.1.0-1/debian/control
mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport5.install
mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn5.install
mysql-connector-cpp/tags/1.1.0-1/debian/patches/attribute_visibility_default_for_exceptions.diff
mysql-connector-cpp/tags/1.1.0-1/debian/patches/disable_tests.diff
mysql-connector-cpp/tags/1.1.0-1/debian/patches/libmysqlclient_SONAME.diff
mysql-connector-cpp/tags/1.1.0-1/debian/patches/no_README_LICENSE.mysql.diff
mysql-connector-cpp/tags/1.1.0-1/debian/patches/series
mysql-connector-cpp/tags/1.1.0-1/debian/rules
mysql-connector-cpp/tags/1.1.0-1/debian/source/
Removed:
mysql-connector-cpp/tags/1.1.0-1/debian/changelog
mysql-connector-cpp/tags/1.1.0-1/debian/control
mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport4.install
mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn4.install
mysql-connector-cpp/tags/1.1.0-1/debian/patches/00list
mysql-connector-cpp/tags/1.1.0-1/debian/patches/02_no_README_LICENSE.mysql.dpatch
mysql-connector-cpp/tags/1.1.0-1/debian/patches/04_libmysqlclient_SONAME.dpatch
mysql-connector-cpp/tags/1.1.0-1/debian/patches/05_disable_tests.dpatch
mysql-connector-cpp/tags/1.1.0-1/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch
mysql-connector-cpp/tags/1.1.0-1/debian/rules
Log:
tag mysql-connector-c++ 1.1.0-1
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/changelog 2010-10-07 21:27:20 UTC (rev 1909)
@@ -1,66 +0,0 @@
-mysql-connector-c++ (1.1.0~r814-1) unstable; urgency=low
-
- * new bzr snapshot
- * remove -stlport* packages, not needed anymore and never used anyway
- * add ${misc:Depends}
-
- -- Rene Engelhard <rene at debian.org> Tue, 09 Mar 2010 22:45:04 +0100
-
-mysql-connector-c++ (1.1.0~r791-1) unstable; urgency=low
-
- * new bzr snapshot
- * add patch to add __attribute__((visibility("default"))) to the
- exceptions (closes: #559219)
- * debian/rules: bump .shlibs
-
- -- Rene Engelhard <rene at debian.org> Wed, 02 Dec 2009 22:08:19 +0100
-
-mysql-connector-c++ (1.1.0~r786-2) unstable; urgency=low
-
- * update 06_stlport_flavour.dpatch
-
- -- Rene Engelhard <rene at debian.org> Wed, 23 Sep 2009 20:13:34 +0200
-
-mysql-connector-c++ (1.1.0~r786-1) unstable; urgency=low
-
- * New upstream snapshot
- * fix -stlport-dev to depends on the -stlport shared lib package
- * add debian/watch
- * upload to unstable
-
- -- Rene Engelhard <rene at debian.org> Wed, 23 Sep 2009 19:07:54 +0200
-
-mysql-connector-c++ (1.0.6~r768-2) experimental; urgency=low
-
- * build flavour with STLport on i386; we need it for OOo on i386....
-
- -- Rene Engelhard <rene at debian.org> Sat, 05 Sep 2009 13:01:55 +0200
-
-mysql-connector-c++ (1.0.6~r768-1) experimental; urgency=low
-
- * New upstream snapshot
-
- -- Rene Engelhard <rene at debian.org> Fri, 28 Aug 2009 16:17:12 +0200
-
-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/. gets 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
- * clean up dmake usage
-
- -- Rene Engelhard <rene at debian.org> Mon, 08 Jun 2009 22:07:51 +0200
-
-mysql-connector-cpp (1.0.2~20081215-1) experimental; urgency=low
-
- * Initial release (closes: #508985)
-
- -- Rene Engelhard <rene at debian.org> Mon, 05 Jan 2009 12:29:23 +0100
Copied: mysql-connector-cpp/tags/1.1.0-1/debian/changelog (from rev 1908, mysql-connector-cpp/trunk/debian/changelog)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/changelog (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/changelog 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1,73 @@
+mysql-connector-c++ (1.1.0-1) experimental; 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 22:23:42 +0200
+
+mysql-connector-c++ (1.1.0~r814-1) unstable; urgency=low
+
+ * new bzr snapshot
+ * remove -stlport* packages, not needed anymore and never used anyway
+ * add ${misc:Depends}
+
+ -- Rene Engelhard <rene at debian.org> Tue, 09 Mar 2010 22:45:04 +0100
+
+mysql-connector-c++ (1.1.0~r791-1) unstable; urgency=low
+
+ * new bzr snapshot
+ * add patch to add __attribute__((visibility("default"))) to the
+ exceptions (closes: #559219)
+ * debian/rules: bump .shlibs
+
+ -- Rene Engelhard <rene at debian.org> Wed, 02 Dec 2009 22:08:19 +0100
+
+mysql-connector-c++ (1.1.0~r786-2) unstable; urgency=low
+
+ * update 06_stlport_flavour.dpatch
+
+ -- Rene Engelhard <rene at debian.org> Wed, 23 Sep 2009 20:13:34 +0200
+
+mysql-connector-c++ (1.1.0~r786-1) unstable; urgency=low
+
+ * New upstream snapshot
+ * fix -stlport-dev to depends on the -stlport shared lib package
+ * add debian/watch
+ * upload to unstable
+
+ -- Rene Engelhard <rene at debian.org> Wed, 23 Sep 2009 19:07:54 +0200
+
+mysql-connector-c++ (1.0.6~r768-2) experimental; urgency=low
+
+ * build flavour with STLport on i386; we need it for OOo on i386....
+
+ -- Rene Engelhard <rene at debian.org> Sat, 05 Sep 2009 13:01:55 +0200
+
+mysql-connector-c++ (1.0.6~r768-1) experimental; urgency=low
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org> Fri, 28 Aug 2009 16:17:12 +0200
+
+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/. gets 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
+ * clean up dmake usage
+
+ -- Rene Engelhard <rene at debian.org> Mon, 08 Jun 2009 22:07:51 +0200
+
+mysql-connector-cpp (1.0.2~20081215-1) experimental; urgency=low
+
+ * Initial release (closes: #508985)
+
+ -- Rene Engelhard <rene at debian.org> Mon, 05 Jan 2009 12:29:23 +0100
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/control 2010-10-07 21:27:20 UTC (rev 1909)
@@ -1,31 +0,0 @@
-Source: mysql-connector-c++
-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
-Standards-Version: 3.7.3
-Section: libs
-Homepage: http://forge.mysql.com/wiki/Connector_C++
-
-Package: libmysqlcppconn-dev
-Section: libdevel
-Architecture: any
-Depends: libmysqlcppconn4 (= ${binary:Version}), ${misc:Depends}
-Description: MySQL Connector for C++ (development files)
- MySQL Connector/C++ is a MySQL database connector for C++.
- .
- It mimics the JDBC 4.0 API.
- .
- This package contains the development files (headers, static library).
-
-Package: libmysqlcppconn4
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc: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
-
Copied: mysql-connector-cpp/tags/1.1.0-1/debian/control (from rev 1906, mysql-connector-cpp/trunk/debian/control)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/control (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/control 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1,31 @@
+Source: mysql-connector-c++
+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, libboost-dev
+Standards-Version: 3.7.3
+Section: libs
+Homepage: http://forge.mysql.com/wiki/Connector_C++
+
+Package: libmysqlcppconn-dev
+Section: libdevel
+Architecture: any
+Depends: libmysqlcppconn5 (= ${binary:Version}), ${misc:Depends}
+Description: MySQL Connector for C++ (development files)
+ MySQL Connector/C++ is a MySQL database connector for C++.
+ .
+ It mimics the JDBC 4.0 API.
+ .
+ This package contains the development files (headers, static library).
+
+Package: libmysqlcppconn5
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc: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
+
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport4.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport4.install 2010-10-07 21:27:20 UTC (rev 1909)
@@ -1 +0,0 @@
-usr/lib/libmysqlcppconn-stlport.so.*
Copied: mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport5.install (from rev 1906, mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport5.install)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport5.install (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn-stlport5.install 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn-stlport.so.*
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn4.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn4.install 2010-10-07 21:27:20 UTC (rev 1909)
@@ -1 +0,0 @@
-usr/lib/libmysqlcppconn.so.*
Copied: mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn5.install (from rev 1906, mysql-connector-cpp/trunk/debian/libmysqlcppconn5.install)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn5.install (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/libmysqlcppconn5.install 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn.so.*
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/00list 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/02_no_README_LICENSE.mysql.dpatch 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/04_libmysqlclient_SONAME.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/04_libmysqlclient_SONAME.dpatch 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/05_disable_tests.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/05_disable_tests.dpatch 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/attribute_visibility_default_for_exceptions.diff (from rev 1906, mysql-connector-cpp/trunk/debian/patches/attribute_visibility_default_for_exceptions.diff)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/patches/attribute_visibility_default_for_exceptions.diff (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/attribute_visibility_default_for_exceptions.diff 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/disable_tests.diff (from rev 1906, mysql-connector-cpp/trunk/debian/patches/disable_tests.diff)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/patches/disable_tests.diff (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/disable_tests.diff 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/libmysqlclient_SONAME.diff (from rev 1906, mysql-connector-cpp/trunk/debian/patches/libmysqlclient_SONAME.diff)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/patches/libmysqlclient_SONAME.diff (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/libmysqlclient_SONAME.diff 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/no_README_LICENSE.mysql.diff (from rev 1906, mysql-connector-cpp/trunk/debian/patches/no_README_LICENSE.mysql.diff)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/patches/no_README_LICENSE.mysql.diff (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/no_README_LICENSE.mysql.diff 2010-10-07 21:27:20 UTC (rev 1909)
@@ -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/tags/1.1.0-1/debian/patches/series (from rev 1906, mysql-connector-cpp/trunk/debian/patches/series)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/patches/series (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/patches/series 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1,4 @@
+#no_README_LICENSE.mysql.diff
+libmysqlclient_SONAME.diff
+disable_tests.diff
+attribute_visibility_default_for_exceptions.diff
Deleted: mysql-connector-cpp/tags/1.1.0-1/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules 2010-08-04 07:28:44 UTC (rev 1898)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/rules 2010-10-07 21:27:20 UTC (rev 1909)
@@ -1,68 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-builddir/CMakeCache.txt: patch-stamp
- dh_testdir
-
- mkdir -p builddir
-
- # work around upstream breakge. cmake . works, but we don't
- # want that in the toplevel, obviously
- cp -rav * builddir || true
- rm -rf builddir/debian
- cd builddir && cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0 \
- -DMYSQLCPPCONN_ICU_ENABLE:BOOL=0
-
-build: build-stamp
-build-stamp: builddir/CMakeCache.txt
- dh_testdir
-
- cd builddir && $(MAKE)
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- rm -rf builddir
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs -s
-
- cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGES -s
- dh_installdocs -s
- dh_installexamples -s
- dh_install -s
- dh_installman -s
- dh_link -s
- dh_strip -s
- dh_compress -s
- dh_fixperms -s
- dh_makeshlibs -plibmysqlcppconn4 -V'libmysqlcppconn4 (>= 1.1.0~r791)'
- dh_installdeb -s
- dh_shlibdeps -s
- dh_gencontrol -s
- dh_md5sums -s
- dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Copied: mysql-connector-cpp/tags/1.1.0-1/debian/rules (from rev 1907, mysql-connector-cpp/trunk/debian/rules)
===================================================================
--- mysql-connector-cpp/tags/1.1.0-1/debian/rules (rev 0)
+++ mysql-connector-cpp/tags/1.1.0-1/debian/rules 2010-10-07 21:27:20 UTC (rev 1909)
@@ -0,0 +1,66 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+builddir/CMakeCache.txt:
+ dh_testdir
+
+ mkdir -p builddir
+
+ # work around upstream breakge. cmake . works, but we don't
+ # want that in the toplevel, obviously
+ cp -rav * builddir || true
+ rm -rf builddir/debian
+ cd builddir && cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0 \
+ -DMYSQLCPPCONN_ICU_ENABLE:BOOL=0
+
+build: build-stamp
+build-stamp: builddir/CMakeCache.txt
+ dh_testdir
+
+ cd builddir && $(MAKE)
+
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ rm -rf builddir
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs -s
+
+ cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGES -s
+ dh_installdocs -s
+ dh_installexamples -s
+ dh_install -s
+ dh_installman -s
+ dh_link -s
+ dh_strip -s
+ dh_compress -s
+ dh_fixperms -s
+ dh_makeshlibs -s
+ dh_installdeb -s
+ dh_shlibdeps -s
+ dh_gencontrol -s
+ dh_md5sums -s
+ dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
More information about the Pkg-mysql-commits
mailing list