[Pkg-mysql-commits] r1793 - in mysql-connector-cpp/trunk/debian: . patches

[Rene Engelhard]

tags 559219 pending
thanks

Author: rene
Date: 2009-12-02 21:09:24 +0000 (Wed, 02 Dec 2009)
New Revision: 1793

Added:
   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/patches/00list
   mysql-connector-cpp/trunk/debian/rules
Log:
update to new snapshot; add visibility patch from OOo and bump .shlibs

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2009-11-30 11:46:53 UTC (rev 1792)
+++ mysql-connector-cpp/trunk/debian/changelog	2009-12-02 21:09:24 UTC (rev 1793)
@@ -1,3 +1,12 @@
+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

Modified: mysql-connector-cpp/trunk/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list	2009-11-30 11:46:53 UTC (rev 1792)
+++ mysql-connector-cpp/trunk/debian/patches/00list	2009-12-02 21:09:24 UTC (rev 1793)
@@ -1,3 +1,4 @@
 02_no_README_LICENSE.mysql
 04_libmysqlclient_SONAME
 05_disable_tests
+07_attribute_visibility_default_for_exceptions

Added: 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	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch	2009-12-02 21:09:24 UTC (rev 1793)
@@ -0,0 +1,59 @@
+#! /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) {}


Property changes on: mysql-connector-cpp/trunk/debian/patches/07_attribute_visibility_default_for_exceptions.dpatch
___________________________________________________________________
Added: svn:executable
   + *

Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules	2009-11-30 11:46:53 UTC (rev 1792)
+++ mysql-connector-cpp/trunk/debian/rules	2009-12-02 21:09:24 UTC (rev 1793)
@@ -86,7 +86,10 @@
 	dh_strip -s
 	dh_compress -s
 	dh_fixperms -s
-	dh_makeshlibs -s
+	dh_makeshlibs -plibmysqlcppconn4 -V'libmysqlcppconn4 (>= 1.1.0~r791)'
+ifeq "$(ARCH)" "i386"
+	dh_makeshlibs -plibmysqlcppconn-stlport4 -V'libmysqlcppconn-stlport4 (>= 1.1.0~r791)'
+endif
 	dh_installdeb -s
 	dh_shlibdeps -s
 	dh_gencontrol -s