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

[Rene Engelhard]

Author: rene
Date: 2009-09-23 18:24:47 +0000 (Wed, 23 Sep 2009)
New Revision: 1761

Modified:
   mysql-connector-cpp/trunk/debian/changelog
   mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch
Log:
update 06_stlport_flavour.dpatch

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2009-09-23 18:05:56 UTC (rev 1760)
+++ mysql-connector-cpp/trunk/debian/changelog	2009-09-23 18:24:47 UTC (rev 1761)
@@ -1,3 +1,9 @@
+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 

Modified: mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	2009-09-23 18:05:56 UTC (rev 1760)
+++ mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	2009-09-23 18:24:47 UTC (rev 1761)
@@ -68,21 +68,24 @@
  		LIBRARY DESTINATION lib
  		ARCHIVE DESTINATION lib
  	)
-diff -urNad mysql-connector-c++-1.0.6~r768~/examples/CMakeLists.txt mysql-connector-c++-1.0.6~r768/examples/CMakeLists.txt
---- mysql-connector-c++-1.0.6~r768~/examples/CMakeLists.txt	2009-08-28 16:14:33.000000000 +0200
-+++ mysql-connector-c++-1.0.6~r768/examples/CMakeLists.txt	2009-08-30 20:02:45.000000000 +0200
-@@ -27,9 +27,9 @@
+diff -urNad mysql-connector-c++-1.1.0~r768~/examples/CMakeLists.txt mysql-connector-c++-1.1.0~r768/examples/CMakeLists.txt
+--- mysql-connector-c++-1.1.0~r768~/examples/CMakeLists.txt	2009-08-28 16:14:33.000000000 +0200
++++ mysql-connector-c++-1.1.0~r768/examples/CMakeLists.txt	2009-08-30 20:02:45.000000000 +0200
+@@ -27,12 +27,12 @@
  
  		ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS")
  
--		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn libmysql)
-+		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport libmysql)
+-                SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn)
++                SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport)
+                 IF(MYSQLCLIENT_STATIC_BINDING)
+ 			SET(MY_TARGET_LINK_LIBRARIES ${MY_TARGET_LINK_LIBRARIES} libmysql)
+                 ENDIF(MYSQLCLIENT_STATIC_BINDING)
  	ELSEIF(NOT WIN32)
--		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-static mysqlclient_r)
-+		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport-static mysqlclient_r)
- 	ENDIF(WIN32)
- 
- 	IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
+-		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-static)
++		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport-static)
+                 IF(MYSQLCLIENT_STATIC_BINDING)
+ 			SET(MY_TARGET_LINK_LIBRARIES ${MY_TARGET_LINK_LIBRARIES} mysqlclient_r)
+                 ENDIF(MYSQLCLIENT_STATIC_BINDING)                 
 diff -urNad mysql-connector-c++-1.0.6~r768~/test/CMakeLists.txt mysql-connector-c++-1.0.6~r768/test/CMakeLists.txt
 --- mysql-connector-c++-1.0.6~r768~/test/CMakeLists.txt	2009-08-28 16:14:33.000000000 +0200
 +++ mysql-connector-c++-1.0.6~r768/test/CMakeLists.txt	2009-08-30 20:03:10.000000000 +0200