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

Rene Engelhard rene at alioth.debian.org
Sat Sep 5 13:14:43 UTC 2009 

Author: rene
Date: 2009-09-05 13:14:43 +0000 (Sat, 05 Sep 2009)
New Revision: 1730

Added:
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.install
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.links
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install
   mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch
Removed:
   mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install
Modified:
   mysql-connector-cpp/trunk/debian/changelog
   mysql-connector-cpp/trunk/debian/control
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install
   mysql-connector-cpp/trunk/debian/rules
Log:
build flavour with STLport on i386; we need it for OOo on i386....

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2009-09-05 11:38:29 UTC (rev 1729)
+++ mysql-connector-cpp/trunk/debian/changelog	2009-09-05 13:14:43 UTC (rev 1730)
@@ -1,3 +1,9 @@
+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

Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control	2009-09-05 11:38:29 UTC (rev 1729)
+++ mysql-connector-cpp/trunk/debian/control	2009-09-05 13:14:43 UTC (rev 1730)
@@ -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, dpatch, libboost-dev, libstlport4.6-dev [i386]
 # only needed for tests and would result in a bogus dep otherwise
 Build-Conflicts: libicu-dev
 Standards-Version: 3.7.3
@@ -31,3 +31,26 @@
  .
  This package contains the shared library
 
+Package: libmysqlcppconn-stlport-dev
+Section: libdevel
+Architecture: i386
+Depends: libmysqlcppconn-dev (= ${binary:Version})
+Description: MySQL Connector for C++ (development files using STLport)
+ 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)
+ - build with STLport instead of GCCs STL.
+
+Package: libmysqlcppconn-stlport3
+Section: libs
+Architecture: i386
+Depends: ${shlibs:Depends}
+Description: MySQL Connector for C++ (library built against STLport)
+ MySQL Connector/C++ is a MySQL database connector for C++.
+ .
+ It mimics the JDBC 4.0 API.
+ .
+ This package contains the shared library built using STLport.
+

Modified: mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install	2009-09-05 11:38:29 UTC (rev 1729)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install	2009-09-05 13:14:43 UTC (rev 1730)
@@ -1,3 +1,3 @@
 usr/include
+usr/lib/libmysqlcppconn.so
 usr/lib/libmysqlcppconn-static.a
-usr/lib/*.so

Added: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.install	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.install	2009-09-05 13:14:43 UTC (rev 1730)
@@ -0,0 +1,2 @@
+usr/lib/libmysqlcppconn-stlport.so
+usr/lib/libmysqlcppconn-stlport-static.a

Added: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.links
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.links	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport-dev.links	2009-09-05 13:14:43 UTC (rev 1730)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn-stlport-static.a usr/lib/libmysqlcppconn-stlport.a

Added: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install	2009-09-05 13:14:43 UTC (rev 1730)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn-stlport.so.*

Deleted: mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install	2009-09-05 11:38:29 UTC (rev 1729)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install	2009-09-05 13:14:43 UTC (rev 1730)
@@ -1 +0,0 @@
-usr/lib/*.so.*

Added: mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	2009-09-05 13:14:43 UTC (rev 1730)
@@ -0,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_stlport_flavour.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~r768~/driver/CMakeLists.txt mysql-connector-c++-1.0.6~r768/driver/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r768~/driver/CMakeLists.txt	2009-08-28 16:14:33.000000000 +0200
++++ mysql-connector-c++-1.0.6~r768/driver/CMakeLists.txt	2009-08-30 20:01:48.000000000 +0200
+@@ -124,8 +124,8 @@
+ ENDIF(WIN32)
+ 
+ 
+-ADD_LIBRARY(mysqlcppconn SHARED ${MYSQLCPPCONN_SOURCES})
+-ADD_LIBRARY(mysqlcppconn-static STATIC ${MYSQLCPPCONN_SOURCES})
++ADD_LIBRARY(mysqlcppconn-stlport SHARED ${MYSQLCPPCONN_SOURCES})
++ADD_LIBRARY(mysqlcppconn-stlport-static STATIC ${MYSQLCPPCONN_SOURCES})
+ 
+ IF(WIN32)
+ 
+@@ -170,7 +170,7 @@
+ ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
+ 
+ 
+-TARGET_LINK_LIBRARIES(mysqlcppconn	${MY_TARGET_LINK_LIBRARIES_DYNAMIC}
++TARGET_LINK_LIBRARIES(mysqlcppconn-stlport	${MY_TARGET_LINK_LIBRARIES_DYNAMIC}
+ 									${MY_GCOV_LINK_LIBRARIES}
+ 									${MYSQLCPPCONN_STLPORT_LIB}
+ 									${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
+@@ -183,7 +183,7 @@
+ #ENDIF(WIN32)
+ 
+ 
+-TARGET_LINK_LIBRARIES(mysqlcppconn-static	${MY_TARGET_LINK_LIBRARIES_STATIC}
++TARGET_LINK_LIBRARIES(mysqlcppconn-stlport-static	${MY_TARGET_LINK_LIBRARIES_STATIC}
+ 											${MY_GCOV_LINK_LIBRARIES}
+ 											${MYSQLCPPCONN_STLPORT_LIB}
+ 											${MYSQLCPPCONN_BOOST_SYSTEM_LIBS}
+@@ -192,13 +192,13 @@
+ 
+ MESSAGE("$ENV{CPPFLAGS} ${MYSQL_CXXFLAGS} $ENV{CXXFLAGS}")
+ 
+-SET_TARGET_PROPERTIES(mysqlcppconn-static PROPERTIES
++SET_TARGET_PROPERTIES(mysqlcppconn-stlport-static PROPERTIES
+ 					LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
+ 					COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}"
+ 					COMPILE_DEFINITIONS CPPCONN_LIB_BUILD="")
+ 
+ 
+-SET_TARGET_PROPERTIES(mysqlcppconn
++SET_TARGET_PROPERTIES(mysqlcppconn-stlport
+ 					PROPERTIES
+ 					SOVERSION "${MYSQLCPPCONN_SOVERSION}"
+ 					VERSION "${MYSQLCPPCONN_SOVERSION}.${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}"
+@@ -208,12 +208,12 @@
+ 
+ 
+ IF(WIN32)
+-	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
++	INSTALL(TARGETS mysqlcppconn-stlport mysqlcppconn-stlport-static
+ 		RUNTIME DESTINATION lib
+ 		ARCHIVE DESTINATION lib
+ 	)
+ ELSE(WIN32)
+-	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
++	INSTALL(TARGETS mysqlcppconn-stlport mysqlcppconn-stlport-static
+ 		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 @@
+ 
+ 		ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS")
+ 
+-		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn libmysql)
++		SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport libmysql)
+ 	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)
+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
+@@ -18,9 +18,9 @@
+ 	ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS")
+ 	ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
+ 
+-	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn libmysql ${MYSQLCPPCONN_STLPORT_LIB})
++	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport libmysql ${MYSQLCPPCONN_STLPORT_LIB})
+ ELSEIF(NOT WIN32)
+-	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn mysqlclient_r ${MYSQLCPPCONN_STLPORT_LIB})
++	SET(MY_TARGET_LINK_LIBRARIES mysqlcppconn-stlport mysqlclient_r ${MYSQLCPPCONN_STLPORT_LIB})
+ ENDIF(WIN32)
+ 
+ IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)

Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules	2009-09-05 11:38:29 UTC (rev 1729)
+++ mysql-connector-cpp/trunk/debian/rules	2009-09-05 13:14:43 UTC (rev 1730)
@@ -5,24 +5,45 @@
 
 include /usr/share/dpatch/dpatch.make
 
+ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 builddir/CMakeCache.txt: patch-stamp
 	dh_testdir
 
 	mkdir -p builddir
-	
+ifeq "$(ARCH)" "i386"
+	mkdir -p builddir-stlport
+endif
+
 	# work around upstream breakge. cmake . works, but we don't
 	# want that in the toplevel, obviously
 	cp -rav * builddir || true
+	rm -rf builddir/debian
+ifeq "$(ARCH)" "i386"
+	cp -rav * builddir-stlport || true
+	rm -rf builddir-stlport/builddir
+	rm -rf builddir-stlport/debian
+endif
 	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
+ifeq "$(ARCH)" "i386"
+	cd builddir-stlport && \
+		patch -p1 < ../debian/patches/06_stlport_flavour.dpatch
+	cd builddir-stlport && cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0 \
+		-DMYSQLCPPCONN_STLPORT_ENABLE:BOOL=1
+	cd builddir-stlport && \
+		patch -p1 -R < ../debian/patches/06_stlport_flavour.dpatch
+endif
 
 build: build-stamp
 build-stamp: builddir/CMakeCache.txt
 	dh_testdir
 
 	cd builddir && $(MAKE)
+ifeq "$(ARCH)" "i386"
+	cd builddir-stlport && $(MAKE)
+endif
 
 	touch $@
 
@@ -31,9 +52,10 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	[ ! -f Makefile ] || $(MAKE) clean
-	
 	rm -rf builddir
+ifeq "$(ARCH)" "i386"
+	rm -rf builddir-stlport
+endif
 
 	dh_clean 
 
@@ -41,30 +63,33 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs
+	dh_installdirs -s
 
 	cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ifeq "$(ARCH)" "i386"
+	cp -a builddir-stlport/driver/libmysqlcppconn* $(CURDIR)/debian/tmp/usr/lib
+endif
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs CHANGES
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	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