[Pkg-mysql-commits] r1743 - mysql-connector-cpp/trunk/debian

[Rene Engelhard]

Author: rene
Date: 2009-09-13 21:25:47 +0000 (Sun, 13 Sep 2009)
New Revision: 1743

Added:
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install
   mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install
Removed:
   mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install
Modified:
   mysql-connector-cpp/trunk/debian/changelog
   mysql-connector-cpp/trunk/debian/control
   mysql-connector-cpp/trunk/debian/rules
Log:
update to 1.1.0 snapshot; actually add .install file

Modified: mysql-connector-cpp/trunk/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog	2009-09-13 21:24:09 UTC (rev 1742)
+++ mysql-connector-cpp/trunk/debian/changelog	2009-09-13 21:25:47 UTC (rev 1743)
@@ -1,9 +1,10 @@
-mysql-connector-c++ (1.0.6~r768-3) UNRELEASED; urgency=low
+mysql-connector-c++ (1.1.0~r783-1) UNRELEASED; urgency=low
 
-  * fix -stlport-dev to depends on the -stlport shared lib package
-  * add debian/watch 
+  * New upstream snapshot 
+  * fix -stlport-dev to depends on the -stlport shared lib package 
+  * add debian/watch
 
- -- Rene Engelhard <rene at debian.org>  Mon, 07 Sep 2009 16:51:57 +0200
+ -- Rene Engelhard <rene at debian.org>  Sun, 13 Sep 2009 18:15:34 +0200
 
 mysql-connector-c++ (1.0.6~r768-2) experimental; urgency=low
 

Modified: mysql-connector-cpp/trunk/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control	2009-09-13 21:24:09 UTC (rev 1742)
+++ mysql-connector-cpp/trunk/debian/control	2009-09-13 21:25:47 UTC (rev 1743)
@@ -3,8 +3,6 @@
 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]
-# only needed for tests and would result in a bogus dep otherwise
-Build-Conflicts: libicu-dev
 Standards-Version: 3.7.3
 Section: libs
 Homepage: http://forge.mysql.com/wiki/Connector_C++
@@ -12,7 +10,7 @@
 Package: libmysqlcppconn-dev
 Section: libdevel
 Architecture: any
-Depends: libmysqlcppconn3 (= ${binary:Version})
+Depends: libmysqlcppconn4 (= ${binary:Version})
 Description: MySQL Connector for C++ (development files)
  MySQL Connector/C++ is a MySQL database connector for C++.
  .
@@ -20,7 +18,7 @@
  .
  This package contains the development files (headers, static library).
 
-Package: libmysqlcppconn3
+Package: libmysqlcppconn4
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -34,7 +32,7 @@
 Package: libmysqlcppconn-stlport-dev
 Section: libdevel
 Architecture: i386
-Depends: libmysqlcppconn-dev (= ${binary:Version}), libmysqlcppconn-stlport3 (= ${binary:Version})
+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++.
  .
@@ -43,7 +41,7 @@
  This package contains the development files (headers, static library)
  - build with STLport instead of GCCs STL.
 
-Package: libmysqlcppconn-stlport3
+Package: libmysqlcppconn-stlport4
 Section: libs
 Architecture: i386
 Depends: ${shlibs:Depends}

Deleted: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install	2009-09-13 21:24:09 UTC (rev 1742)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install	2009-09-13 21:25:47 UTC (rev 1743)
@@ -1 +0,0 @@
-usr/lib/libmysqlcppconn-stlport.so.*

Copied: mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install (from rev 1736, mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport3.install)
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn-stlport4.install	2009-09-13 21:25:47 UTC (rev 1743)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn-stlport.so.*

Added: mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install	                        (rev 0)
+++ mysql-connector-cpp/trunk/debian/libmysqlcppconn4.install	2009-09-13 21:25:47 UTC (rev 1743)
@@ -0,0 +1 @@
+usr/lib/libmysqlcppconn.so.*

Modified: mysql-connector-cpp/trunk/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules	2009-09-13 21:24:09 UTC (rev 1742)
+++ mysql-connector-cpp/trunk/debian/rules	2009-09-13 21:25:47 UTC (rev 1743)
@@ -25,12 +25,14 @@
 	rm -rf builddir-stlport/debian
 endif
 	cd builddir && cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
+		-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