[Pkg-mysql-commits] r1691 - in mysql-connector-cpp/tags: . 1.0.6_r754-1/debian 1.0.6_r754-1/debian/patches
Rene Engelhard
rene at alioth.debian.org
Thu Aug 20 21:56:07 UTC 2009
Author: rene
Date: 2009-08-20 21:56:07 +0000 (Thu, 20 Aug 2009)
New Revision: 1691
Added:
mysql-connector-cpp/tags/1.0.6_r754-1/
mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog
mysql-connector-cpp/tags/1.0.6_r754-1/debian/control
mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright
mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install
mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn2.install
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/03_install_sqlstring.h.dpatch
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/04_libmysqlclient_SONAME.dpatch
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/05_disable_tests.dpatch
mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules
Removed:
mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog
mysql-connector-cpp/tags/1.0.6_r754-1/debian/control
mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright
mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install
mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn1.install
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list
mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch
mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules
Log:
tg 1.0.6~r754-1
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog
===================================================================
--- mysql-connector-cpp/trunk/debian/changelog 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,12 +0,0 @@
-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)
-
- -- Rene Engelhard <rene at debian.org> Mon, 05 Jan 2009 12:29:23 +0100
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog (from rev 1690, mysql-connector-cpp/trunk/debian/changelog)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/changelog 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,22 @@
+mysql-connector-c++ (1.0.6~r754-1) experimental; urgency=low
+
+ * New upstream snapshot
+ * use libmysqlclient-dev
+ * enable shared lib (now libmysqcppconn2)
+ * disable build of test/. gets us a bogus libicu dep when icu is there on the
+ build system and we don't/can't run the tests anyway
+
+ -- Rene Engelhard <rene at debian.org> Thu, 20 Aug 2009 22:38:27 +0200
+
+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)
+
+ -- Rene Engelhard <rene at debian.org> Mon, 05 Jan 2009 12:29:23 +0100
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/control
===================================================================
--- mysql-connector-cpp/trunk/debian/control 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/control 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,31 +0,0 @@
-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>
-Build-Depends: debhelper (>= 7), cmake, libmysqlclient15-dev, dpatch
-Standards-Version: 3.7.3
-Section: libs
-Homepage: http://forge.mysql.com/wiki/Connector_C++
-
-Package: libmysqlcppconn-dev
-Section: libdevel
-Architecture: any
-#Depends: libmysqlcppconn1 (= ${binary:Version})
-Description: MySQL Connector for C++ (development files)
- 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).
-
-#Package: libmysqlcppconn1
-#Section: libs
-#Architecture: any
-#Depends: ${shlibs:Depends}
-#Description: MySQL Connector for C++ (library)
-# MySQL Connector/C++ is a MySQL database connector for C++.
-# .
-# It mimics the JDBC 4.0 API.
-# .
-# This package contains the shared library
-
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/control (from rev 1689, mysql-connector-cpp/trunk/debian/control)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/control (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/control 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,33 @@
+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>
+Build-Depends: debhelper (>= 7), cmake, libmysqlclient-dev, dpatch, libboost-dev
+# 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++
+
+Package: libmysqlcppconn-dev
+Section: libdevel
+Architecture: any
+Depends: libmysqlcppconn2 (= ${binary:Version})
+Description: MySQL Connector for C++ (development files)
+ 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).
+
+Package: libmysqlcppconn2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: MySQL Connector for C++ (library)
+ MySQL Connector/C++ is a MySQL database connector for C++.
+ .
+ It mimics the JDBC 4.0 API.
+ .
+ This package contains the shared library
+
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright
===================================================================
--- mysql-connector-cpp/trunk/debian/copyright 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,85 +0,0 @@
-This package was debianized by Rene Engelhard <rene at debian.org> on
-Tue, 25 Nov 2008 14:39:51 +0100.
-
-It was downloaded from http://forge.mysql.com/wiki/Connector_C++
-
-Upstream Authors:
-
-MySQL AB, Sun Microsystems Inc.
-
-Copyright:
-
-Copyright (C) 2000-2008 MySQL AB
-Copyright (C) 2008 Sun Microsystems Inc.
-
-License:
-
- GPL v2 with "FLOSS exception"
-
-On Debian systems, the full text of the GPL v2 can be found in
-/usr/share/common-licenses/GPL-2.
-
-FLOSS License Exception
-
-The MySQL AB Exception for Free/Libre and Open Source Software-only Applications Using MySQL Client Libraries (the "FLOSS Exception").
-
-Version 0.6, 11 Aug 2008
-Exception Intent
-
-We want specified Free/Libre and Open Source Software ("FLOSS") applications to be able to use specified GPL-licensed MySQL client libraries (the "Program") despite the fact that not all FLOSS licenses are compatible with version 2 of the GNU General Public License (the "GPL").
-Legal Terms and Conditions
-
-As a special exception to the terms and conditions of version 2.0 of the GPL:
-
-You are free to distribute a Derivative Work that is formed entirely from the Program and one or more works (each, a "FLOSS Work") licensed under one or more of the licenses listed below in section 1, as long as:
-
- 1. You obey the GPL in all respects for the Program and the Derivative Work, except for identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
- 2. all identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
- 1. are distributed subject to one of the FLOSS licenses listed below, and
- 2. the object code or executable form of those sections are accompanied by the complete corresponding machine-readable source code for those sections on the same medium and under the same FLOSS license as the corresponding object code or executable forms of those sections, and
- 3. any works which are aggregated with the Program or with a Derivative Work on a volume of a storage or distribution medium in accordance with the GPL, can reasonably be considered independent and separate works in themselves which are not derivatives of either the Program, a Derivative Work or a FLOSS Work.
-
-If the above conditions are not met, then the Program may only be copied, modified, distributed or used under the terms and conditions of the GPL or another valid licensing option from MySQL AB.
-1. FLOSS License List
-License name Version(s)/Copyright Date
-Academic Free License 2.0
-Apache Software License 1.0/1.1/2.0
-Apple Public Source License 2.0
-Artistic license From Perl 5.8.0
-BSD license "July 22 1999"
-Common Development and Distribution License (CDDL) 1.0
-Common Public License 1.0
-Eclipse Public License 1.0
-GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1/3.0
-Jabber Open Source License 1.0
-MIT License (As listed in file MIT-License.txt) -
-Mozilla Public License (MPL) 1.0/1.1
-Open Software License 2.0
-OpenSSL license (with original SSLeay license) "2003" ("1998")
-PHP License 3.0/3.01
-Python license (CNRI Python License) -
-Python Software Foundation License 2.1.1
-Sleepycat License "1999"
-University of Illinois/NCSA Open Source License -
-W3C License "2001"
-X11 License "2001"
-Zlib/libpng License -
-Zope Public License 2.0
-
-Due to the many variants of some of the above licenses, we require that any version follow the 2003 version of the Free Software Foundation's Free Software Definition (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the Open Source Definition by the Open Source Initiative (http://www.opensource.org/docs/definition.php).
-2. Definitions
-
- 1. Terms used, but not defined, herein shall have the meaning provided in the GPL.
- 2. Derivative Work means a derivative work under copyright law.
-
-3. Applicability
-
-This FLOSS Exception applies to all Programs that contain a notice placed by MySQL AB saying that the Program may be distributed under the terms of this FLOSS Exception. If you create or distribute a work which is a Derivative Work of both the Program and any other work licensed under the GPL, then this FLOSS Exception is not available for that work; thus, you must remove the FLOSS Exception notice from that work and comply with the GPL in all respects, including by retaining all GPL notices. You may choose to redistribute a copy of the Program exclusively under the terms of the GPL by removing the FLOSS Exception notice from that copy of the Program, provided that the copy has never been modified by you or any third party.
-Appendix A. Qualified Libraries and Packages
-
-The following is a a non-exhaustive list of libraries and packages which are covered by the FLOSS License Exception. Please note that appendix is merely provided as an additional service to specific FLOSS projects who wish to simplify licensing information for their users. Compliance with one of the licenses noted under the "FLOSS license list" section remains a prerequisite.
-Package name Qualifying License and Version
-Apache Portable Runtime (APR) Apache Software License 2.0
-
-The Debian packaging is (C) 2008, Rene Engelhard <rene at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright (from rev 1689, mysql-connector-cpp/trunk/debian/copyright)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/copyright 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,85 @@
+This package was debianized by Rene Engelhard <rene at debian.org> on
+Tue, 25 Nov 2008 14:39:51 +0100.
+
+It was downloaded from http://forge.mysql.com/wiki/Connector_C++
+
+Upstream Authors:
+
+MySQL AB, Sun Microsystems Inc.
+
+Copyright:
+
+Copyright (C) 2000-2008 MySQL AB
+Copyright (C) 2008 Sun Microsystems Inc.
+
+License:
+
+ GPL v2 with "FLOSS exception"
+
+On Debian systems, the full text of the GPL v2 can be found in
+/usr/share/common-licenses/GPL-2.
+
+FLOSS License Exception
+
+The MySQL AB Exception for Free/Libre and Open Source Software-only Applications Using MySQL Client Libraries (the "FLOSS Exception").
+
+Version 0.6, 11 Aug 2008
+Exception Intent
+
+We want specified Free/Libre and Open Source Software ("FLOSS") applications to be able to use specified GPL-licensed MySQL client libraries (the "Program") despite the fact that not all FLOSS licenses are compatible with version 2 of the GNU General Public License (the "GPL").
+Legal Terms and Conditions
+
+As a special exception to the terms and conditions of version 2.0 of the GPL:
+
+You are free to distribute a Derivative Work that is formed entirely from the Program and one or more works (each, a "FLOSS Work") licensed under one or more of the licenses listed below in section 1, as long as:
+
+ 1. You obey the GPL in all respects for the Program and the Derivative Work, except for identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+ 2. all identifiable sections of the Derivative Work which are not derived from the Program, and which can reasonably be considered independent and separate works in themselves,
+ 1. are distributed subject to one of the FLOSS licenses listed below, and
+ 2. the object code or executable form of those sections are accompanied by the complete corresponding machine-readable source code for those sections on the same medium and under the same FLOSS license as the corresponding object code or executable forms of those sections, and
+ 3. any works which are aggregated with the Program or with a Derivative Work on a volume of a storage or distribution medium in accordance with the GPL, can reasonably be considered independent and separate works in themselves which are not derivatives of either the Program, a Derivative Work or a FLOSS Work.
+
+If the above conditions are not met, then the Program may only be copied, modified, distributed or used under the terms and conditions of the GPL or another valid licensing option from MySQL AB.
+1. FLOSS License List
+License name Version(s)/Copyright Date
+Academic Free License 2.0
+Apache Software License 1.0/1.1/2.0
+Apple Public Source License 2.0
+Artistic license From Perl 5.8.0
+BSD license "July 22 1999"
+Common Development and Distribution License (CDDL) 1.0
+Common Public License 1.0
+Eclipse Public License 1.0
+GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1/3.0
+Jabber Open Source License 1.0
+MIT License (As listed in file MIT-License.txt) -
+Mozilla Public License (MPL) 1.0/1.1
+Open Software License 2.0
+OpenSSL license (with original SSLeay license) "2003" ("1998")
+PHP License 3.0/3.01
+Python license (CNRI Python License) -
+Python Software Foundation License 2.1.1
+Sleepycat License "1999"
+University of Illinois/NCSA Open Source License -
+W3C License "2001"
+X11 License "2001"
+Zlib/libpng License -
+Zope Public License 2.0
+
+Due to the many variants of some of the above licenses, we require that any version follow the 2003 version of the Free Software Foundation's Free Software Definition (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of the Open Source Definition by the Open Source Initiative (http://www.opensource.org/docs/definition.php).
+2. Definitions
+
+ 1. Terms used, but not defined, herein shall have the meaning provided in the GPL.
+ 2. Derivative Work means a derivative work under copyright law.
+
+3. Applicability
+
+This FLOSS Exception applies to all Programs that contain a notice placed by MySQL AB saying that the Program may be distributed under the terms of this FLOSS Exception. If you create or distribute a work which is a Derivative Work of both the Program and any other work licensed under the GPL, then this FLOSS Exception is not available for that work; thus, you must remove the FLOSS Exception notice from that work and comply with the GPL in all respects, including by retaining all GPL notices. You may choose to redistribute a copy of the Program exclusively under the terms of the GPL by removing the FLOSS Exception notice from that copy of the Program, provided that the copy has never been modified by you or any third party.
+Appendix A. Qualified Libraries and Packages
+
+The following is a a non-exhaustive list of libraries and packages which are covered by the FLOSS License Exception. Please note that appendix is merely provided as an additional service to specific FLOSS projects who wish to simplify licensing information for their users. Compliance with one of the licenses noted under the "FLOSS license list" section remains a prerequisite.
+Package name Qualifying License and Version
+Apache Portable Runtime (APR) Apache Software License 2.0
+
+The Debian packaging is (C) 2008, Rene Engelhard <rene at debian.org> and
+is licensed under the GPL v2, too, see `/usr/share/common-licenses/GPL-2'.
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/libmysqlcppconn-static.a
-#usr/lib/*.so
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install (from rev 1689, mysql-connector-cpp/trunk/debian/libmysqlcppconn-dev.install)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn-dev.install 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/libmysqlcppconn-static.a
+usr/lib/*.so
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn1.install
===================================================================
--- mysql-connector-cpp/trunk/debian/libmysqlcppconn1.install 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn1.install 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1 +0,0 @@
-usr/lib/*.so.*
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn2.install (from rev 1689, mysql-connector-cpp/trunk/debian/libmysqlcppconn2.install)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn2.install (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/libmysqlcppconn2.install 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1 @@
+usr/lib/*.so.*
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/00list 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,2 +0,0 @@
-01_OOo_r271359
-02_no_README_LICENSE.mysql
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list (from rev 1689, mysql-connector-cpp/trunk/debian/patches/00list)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/00list 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,5 @@
+01_OOo_r271359
+02_no_README_LICENSE.mysql
+03_install_sqlstring.h
+04_libmysqlclient_SONAME
+05_disable_tests
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch
===================================================================
--- mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,30 +0,0 @@
-#! /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"
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch (from rev 1689, mysql-connector-cpp/trunk/debian/patches/02_no_README_LICENSE.mysql.dpatch)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/02_no_README_LICENSE.mysql.dpatch 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,73 @@
+#! /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.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 16:42:13.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 19:21:41.000000000 +0200
+@@ -181,12 +181,6 @@
+ SET(CPACK_PACKAGE_VERSION_PATCH 6)
+ SET(CPACK_PACKAGE_RELEASE_TYPE "")
+ SET(CPACK_PACKAGE_VENDOR "Sun Microsystems, Inc.")
+-IF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+-ELSE(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.mysql")
+-ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/COPYING")
+-SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/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}")
+@@ -208,7 +202,7 @@
+ SET( LICENSE_FILENAME "${CPACK_RESOURCE_FILE_LICENSE}")")
+ ENDIF(WIN32)
+
+-INSTALL(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE} "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
++INSTALL(FILES "${CMAKE_SOURCE_DIR}/ANNOUNCEMENT" DESTINATION "." OPTIONAL)
+
+ 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"
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/03_install_sqlstring.h.dpatch (from rev 1689, mysql-connector-cpp/trunk/debian/patches/03_install_sqlstring.h.dpatch)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/03_install_sqlstring.h.dpatch (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/03_install_sqlstring.h.dpatch 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_install_sqlstring.h.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~r754~/cppconn/CMakeLists.txt mysql-connector-c++-1.0.6~r754/cppconn/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/cppconn/CMakeLists.txt 2009-08-20 16:42:14.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/cppconn/CMakeLists.txt 2009-08-20 19:22:21.000000000 +0200
+@@ -52,6 +52,7 @@
+ prepared_statement.h
+ resultset.h
+ resultset_metadata.h
++ sqlstring.h
+ statement.h
+ warning.h)
+
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/04_libmysqlclient_SONAME.dpatch (from rev 1689, mysql-connector-cpp/trunk/debian/patches/04_libmysqlclient_SONAME.dpatch)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/04_libmysqlclient_SONAME.dpatch (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/04_libmysqlclient_SONAME.dpatch 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_libmysqlclient_SONAME.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~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
+--- mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 20:25:31.000000000 +0200
+@@ -26,7 +26,7 @@
+ #elif defined(__APPLE__)
+ static const char * const baseName = "libmysqlclient_r.dylib";
+ #else
+-static const char * const baseName = "libmysqlclient_r.so";
++static const char * const baseName = "libmysqlclient_r.so.16";
+ #endif
+
+ template<typename FunctionType>
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/05_disable_tests.dpatch (from rev 1689, mysql-connector-cpp/trunk/debian/patches/05_disable_tests.dpatch)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/05_disable_tests.dpatch (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/patches/05_disable_tests.dpatch 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_disable_tests.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.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt
+--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200
++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200
+@@ -241,10 +241,6 @@
+ ADD_SUBDIRECTORY(cppconn)
+ ADD_SUBDIRECTORY(driver)
+ ADD_SUBDIRECTORY(examples)
+-ADD_SUBDIRECTORY(test)
+-ADD_SUBDIRECTORY(test/framework)
+-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
+-ADD_SUBDIRECTORY(test/unit)
+
+ IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+ # see also README
Deleted: mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules
===================================================================
--- mysql-connector-cpp/trunk/debian/rules 2009-08-16 16:39:20 UTC (rev 1688)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules 2009-08-20 21:56:07 UTC (rev 1691)
@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-builddir/CMakeCache.txt: patch-stamp
- dh_testdir
-
- mkdir -p builddir
- cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=0
-
-build: build-stamp
-build-stamp: builddir/CMakeCache.txt
- dh_testdir
-
- cd builddir && $(MAKE)
-
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- [ ! -f Makefile ] || $(MAKE) clean
-
- rm -rf builddir
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-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
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
Copied: mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules (from rev 1689, mysql-connector-cpp/trunk/debian/rules)
===================================================================
--- mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules (rev 0)
+++ mysql-connector-cpp/tags/1.0.6_r754-1/debian/rules 2009-08-20 21:56:07 UTC (rev 1691)
@@ -0,0 +1,70 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+builddir/CMakeCache.txt: patch-stamp
+ dh_testdir
+
+ mkdir -p builddir
+
+ # work around upstream breakge. cmake . works, but we don't
+ # want that in the toplevel, obviously
+ cp -rav * builddir || true
+ 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
+
+build: build-stamp
+build-stamp: builddir/CMakeCache.txt
+ dh_testdir
+
+ cd builddir && $(MAKE)
+
+ touch $@
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ [ ! -f Makefile ] || $(MAKE) clean
+
+ rm -rf builddir
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_installdirs
+
+ cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+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
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
More information about the Pkg-mysql-commits
mailing list