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

Rene Engelhard rene at alioth.debian.org
Mon Jun 8 20:14:00 UTC 2009 

Author: rene
Date: 2009-06-08 20:14:00 +0000 (Mon, 08 Jun 2009)
New Revision: 1600

Added:
   mysql-connector-cpp/trunk/debian/patches/01_OOo_r271359.dpatch
   mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
Modified:
   mysql-connector-cpp/trunk/debian/changelog
   mysql-connector-cpp/trunk/debian/control
   mysql-connector-cpp/trunk/debian/patches/00list
   mysql-connector-cpp/trunk/debian/rules
Log:
new upstream release; clean up dmake usage

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2009-06-05 07:05:05 UTC (rev 1599)
+++ mysql-connector-cpp/trunk/debian/changelog	2009-06-08 20:14:00 UTC (rev 1600)
@@ -1,3 +1,10 @@
+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)

Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control	2009-06-05 07:05:05 UTC (rev 1599)
+++ mysql-connector-cpp/trunk/debian/control	2009-06-08 20:14:00 UTC (rev 1600)
@@ -1,4 +1,4 @@
-Source: mysql-connector-cpp
+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>

Modified: mysql-connector-cpp/trunk/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list	2009-06-05 07:05:05 UTC (rev 1599)
+++ mysql-connector-cpp/trunk/debian/patches/00list	2009-06-08 20:14:00 UTC (rev 1600)
@@ -1 +1,2 @@
-01_gcc43
+01_OOo_r271359
+02_no_README_LICENSE.mysql

Added: mysql-connector-cpp/trunk/debian/patches/01_OOo_r271359.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/01_OOo_r271359.dpatch	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/01_OOo_r271359.dpatch	2009-06-08 20:14:00 UTC (rev 1600)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_OOo_r271359.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.5~/cppconn/build_config.h mysql-connector-c++-1.0.5/cppconn/build_config.h
+diff -urNad mysql-connector-c++-1.0.5~/driver/mysql_driver.cpp mysql-connector-c++-1.0.5/driver/mysql_driver.cpp
+--- mysql-connector-c++-1.0.5~/driver/mysql_driver.cpp	2009-05-11 21:37:12.000000000 +0200
++++ mysql-connector-c++-1.0.5/driver/mysql_driver.cpp	2009-05-11 21:37:17.000000000 +0200
+@@ -22,6 +22,14 @@
+ 	return sql::mysql::MySQL_Driver::Instance();
+ }
+ 
++extern "C"
++{
++    void* sql_mysql_get_mysql_driver_instance()
++    {
++        return sql::mysql::get_mysql_driver_instance();
++    }
++}
++
+ namespace sql
+ {
+ namespace mysql
+diff -urNad mysql-connector-c++-1.0.5~/driver/mysql_driver.h mysql-connector-c++-1.0.5/driver/mysql_driver.h
+--- mysql-connector-c++-1.0.5~/driver/mysql_driver.h	2009-05-11 21:37:12.000000000 +0200
++++ mysql-connector-c++-1.0.5/driver/mysql_driver.h	2009-05-11 21:37:17.000000000 +0200
+@@ -56,6 +56,9 @@
+ } /* namespace mysql */
+ } /* namespace sql */
+ 
++// C-wrapper around sql::mysql::get_mysql_driver_instance, to be able to retrieve the symbol at runtime
++extern "C" void* sql_mysql_get_mysql_driver_instance();
++
+ #endif // _MYSQL_DRIVER_H_
+ 
+ /*


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

Added: mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch	2009-06-08 20:14:00 UTC (rev 1600)
@@ -0,0 +1,30 @@
+#! /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.5~/CMakeLists.txt mysql-connector-c++-1.0.5/CMakeLists.txt
+--- mysql-connector-c++-1.0.5~/CMakeLists.txt	2009-06-08 22:06:46.000000000 +0200
++++ mysql-connector-c++-1.0.5/CMakeLists.txt	2009-06-08 22:07:31.000000000 +0200
+@@ -89,10 +89,7 @@
+ 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}")
+@@ -114,7 +111,7 @@
+ SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES "README" "COPYING" "LICENSE.mysql" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
++INSTALL(FILES "COPYING" "ANNOUNCEMENT" DESTINATION "." OPTIONAL)
+ 
+ SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
+     ".cmake$" "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"


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

Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules	2009-06-05 07:05:05 UTC (rev 1599)
+++ mysql-connector-cpp/trunk/debian/rules	2009-06-08 20:14:00 UTC (rev 1600)
@@ -5,19 +5,18 @@
 
 include /usr/share/dpatch/dpatch.make
 
-configure: configure-stamp
-configure-stamp: patch-stamp
+builddir/CMakeCache.txt: patch-stamp
 	dh_testdir
 	
-	cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr .
-	touch configure-stamp
+	mkdir -p builddir
+	cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
 
-
 build: build-stamp
-build-stamp: configure-stamp  
+build-stamp: builddir/CMakeCache.txt
 	dh_testdir
 
-	$(MAKE)
+	cd builddir && $(MAKE)
 
 	touch $@
 
@@ -28,31 +27,7 @@
 
 	[ ! -f Makefile ] || $(MAKE) clean
 	
-	rm -f CMakeCache.txt
-	rm -f CPackConfig.cmake
-	rm -f CPackSourceConfig.cmake
-	rm -f Makefile
-	rm -f cmake_install.cmake
-	rm -f cppconn/CMakeFiles/CMakeDirectoryInformation.cmake
-	rm -f cppconn/CMakeFiles/progress.make
-	rm -f cppconn/Makefile
-	rm -f cppconn/cmake_install.cmake
-	rm -f driver/Makefile
-	rm -f driver/cmake_install.cmake
-	rm -f examples/Makefile
-	rm -f examples/cmake_install.cmake
-	rm -f install_manifest.txt
-	rm -f test/Makefile 
-	rm -f test/cmake_install.cmake
-	rm -f test/CJUnitTestsPort/cmake_install.cmake
-	rm -f test/CJUnitTestsPort/CMakeFiles/progress.make
-	rm -f test/CJUnitTestsPort/Makefile
-	rm -rf foo
-	rm -rf CMakeFiles
-	rm -rf driver/CMakeFiles
-	rm -rf test/CMakeFiles
-	rm -rf test/CJUnitTestsPort/CMakeFiles
-	rm -rf examples/CMakeFiles
+	rm -rf builddir
 
 	dh_clean 
 
@@ -62,15 +37,11 @@
 	dh_prep
 	dh_installdirs
 
-	# Add here commands to install the package into debian/tmp
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot

More information about the Pkg-mysql-commits mailing list