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

Rene Engelhard rene at alioth.debian.org
Sat Mar 13 17:02:41 UTC 2010 

Author: rene
Date: 2010-03-13 17:01:55 +0000 (Sat, 13 Mar 2010)
New Revision: 1849

Removed:
   mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch
Modified:
   mysql-connector-cpp/trunk/debian/changelog
   mysql-connector-cpp/trunk/debian/control
   mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
   mysql-connector-cpp/trunk/debian/rules
Log:
new bzr snapshot; remove -stlport* packages, not needed anymore and never used anyway

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2010-03-01 17:27:30 UTC (rev 1848)
+++ mysql-connector-cpp/trunk/debian/changelog	2010-03-13 17:01:55 UTC (rev 1849)
@@ -1,3 +1,11 @@
+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 

Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control	2010-03-01 17:27:30 UTC (rev 1848)
+++ mysql-connector-cpp/trunk/debian/control	2010-03-13 17:01:55 UTC (rev 1849)
@@ -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, libstlport4.6-dev [i386]
+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++
@@ -10,7 +10,7 @@
 Package: libmysqlcppconn-dev
 Section: libdevel
 Architecture: any
-Depends: libmysqlcppconn4 (= ${binary:Version})
+Depends: libmysqlcppconn4 (= ${binary:Version}), ${misc:Depends}
 Description: MySQL Connector for C++ (development files)
  MySQL Connector/C++ is a MySQL database connector for C++.
  .
@@ -21,7 +21,7 @@
 Package: libmysqlcppconn4
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: MySQL Connector for C++ (library)
  MySQL Connector/C++ is a MySQL database connector for C++.
  .
@@ -29,26 +29,3 @@
  .
  This package contains the shared library
 
-Package: libmysqlcppconn-stlport-dev
-Section: libdevel
-Architecture: i386
-Depends: libmysqlcppconn-dev (= ${binary:Version}), libmysqlcppconn-stlport4 (= ${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-stlport4
-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/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch	2010-03-01 17:27:30 UTC (rev 1848)
+++ mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch	2010-03-13 17:01:55 UTC (rev 1849)
@@ -30,44 +30,3 @@
  
  SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
      ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
-diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt.rej mysql-connector-c++-1.0.6~r754/CMakeLists.txt.rej
---- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt.rej	1970-01-01 01:00:00.000000000 +0100
-+++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt.rej	2009-08-20 19:20:21.000000000 +0200
-@@ -0,0 +1,37 @@
-+***************
-+*** 89,98 ****
-+  SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
-+  IF(EXISTS "COPYING")
-+    SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
-+- ELSE(EXISTS "COPYING")
-+-   SET(CPACK_RESOURCE_FILE_LICENSE "LICENSE.mysql")
-+  ENDIF(EXISTS "COPYING")
-+- SET(CPACK_RESOURCE_FILE_README "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}")
-+--- 89,95 ----
-+  SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
-+  IF(EXISTS "COPYING")
-+    SET(CPACK_RESOURCE_FILE_LICENSE "COPYING")
-+  ENDIF(EXISTS "COPYING")
-+  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}")
-+***************
-+*** 114,120 ****
-+  SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
-+  ENDIF(WIN32)
-+  
-+- INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
-+  
-+  SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
-+      ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
-+--- 111,117 ----
-+  SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
-+  ENDIF(WIN32)
-+  
-++ INSTALL(FILES "COPYING" "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/06_stlport_flavour.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	2010-03-01 17:27:30 UTC (rev 1848)
+++ mysql-connector-cpp/trunk/debian/patches/06_stlport_flavour.dpatch	2010-03-13 17:01:55 UTC (rev 1849)
@@ -1,103 +0,0 @@
-#! /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.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)
-+                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)
-+		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
-@@ -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	2010-03-01 17:27:30 UTC (rev 1848)
+++ mysql-connector-cpp/trunk/debian/rules	2010-03-13 17:01:55 UTC (rev 1849)
@@ -5,47 +5,24 @@
 
 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 \
 		-DMYSQLCPPCONN_ICU_ENABLE: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_ICU_ENABLE: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 $@
 
@@ -55,9 +32,6 @@
 	rm -f build-stamp configure-stamp
 
 	rm -rf builddir
-ifeq "$(ARCH)" "i386"
-	rm -rf builddir-stlport
-endif
 
 	dh_clean 
 
@@ -68,9 +42,6 @@
 	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
 
@@ -87,9 +58,6 @@
 	dh_compress -s
 	dh_fixperms -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

More information about the Pkg-mysql-commits mailing list