diff --git a/debian/changelog b/debian/changelog index 6a993a4..4b1988c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,104 @@ -soci (3.1.0+git2013015-5) unstable; urgency=low +soci (3.1.0+git20130218-1) UNRELEASED; urgency=low - * Debian packaging for SOCI + * New maintainer (Closes: #520746) + * New upstream version (Closes: #583846) + - removes need for patches: + + fix-gcc4.3-build.patch + + fix-gcc4.4-build.patch + + gcc_ftbfs.patch + + link-against-dl.patch + + missin_library.diff + * change to dh-7 build system + * Switch to dpkg-source 3.0 (quilt) format + * Bump Standards Version to 3.9.2. (No changes needed). + * remove debugging package + * renamed to use soversion in package name + * use --as-needed for linking + * wrap-and-sort debian/ + * multiarch package + * bump compat to 9 - -- Denis Chapligin Tue, 05 Feb 2013 10:44:40 +0300 \ No newline at end of file + -- Julian Taylor Sat, 04 Sep 2010 01:15:53 +0200 + +soci (3.0.0+cvs20081223-4) unstable; urgency=low + + * QA upload. + * gcc_ftbfs.patch - Include missing headers. (Closes: #549640). + + Thanks to Nobuhiro Iwamatsu for the patch! + * Add README.source for quilt. + * Bump Standards Version to 3.8.3. (No changes needed). + + -- Barry deFreese Fri, 09 Oct 2009 11:21:18 -0400 + +soci (3.0.0+cvs20081223-3) unstable; urgency=low + + [ Marco Rodrigues ] + * QA upload. + * Fix FTBFS because of GCC 4.4 (Closes: #525719). + + [ Christoph Berg ] + * Set -dbg package Section to debug. + + -- Christoph Berg Sun, 21 Jun 2009 13:05:28 +0200 + +soci (3.0.0+cvs20081223-2) unstable; urgency=low + + * QA upload. + * Changing maintainer to QA group + * Update Standards Version (no changes) + * Migrate to dh_prep instead of dh_clean -k + + -- Neil Williams Fri, 03 Apr 2009 11:04:01 +0100 + +soci (3.0.0+cvs20081223-1) experimental; urgency=low + + * New CVS snapshot. Closes: #509453. + * debian/control: + - New maintainer. + - Update Standards-Version to 3.8.0. (No changes). + - Update compat version to 7 and upgrade debhelper Build-Depends. + - Update Vcs-* fields. + * debian/rules: + - Migrate away from cdbs. + * debian/patches: + - Migrate to quilt. + - sqlite-namespace.patch - Removed (Gone upstream). + - sqlite-common-ctime.patch - Removed (Gone upstream). + - postgressql-standard-use-type.patch - Removed (No longer needed). + - postgressql-common-ctime.patch - Removed (Gone upstream). + - mysql-common-ctime.patch - Removed (Gone upstream). + - missing-headers.patch - Removed (No longer needed). + - link-against-dl.patch - Refreshed. + - fix-gcc4.3-build.patch - Fix build with gcc 4.3. + - fix-gcc4.4-build.patch - Fix build with gcc 4.4. (Patch from Martin + Michlmayr ) Closes: #504907 + + -- Bradley Smith Tue, 23 Dec 2008 11:13:58 +0000 + +soci (2.2.0-4) unstable; urgency=low + + * Fix soci FTBFS on mips (Closes: #481499) + Thanks to Thiemo Seufer for the patch. + + -- Neil Williams Sat, 17 May 2008 08:23:41 +0100 + +soci (2.2.0-3) unstable; urgency=low + + * FTBFS: auto_ptr with no type (Closes: #478504) + Add more missing C++ headers to soci.h and std::tm + definition () to each backend common.h. + + -- Neil Williams Tue, 06 May 2008 22:00:19 +0100 + +soci (2.2.0-2) unstable; urgency=low + + * soci - FTBFS: error: 'bad_cast' is not a member of 'std' + (incomplete fix, bug reopened). + + -- Neil Williams Mon, 05 May 2008 00:18:09 +0100 + +soci (2.2.0-1) unstable; urgency=low + + * Initial release soci -- C++ Database Access Library (Closes: #476793) + + -- Neil Williams Tue, 22 Apr 2008 11:31:19 +0100 diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 48a5884..5a4e1c8 100644 --- a/debian/control +++ b/debian/control @@ -1,23 +1,23 @@ Source: soci -Priority: extra -Maintainer: Denis Chapligin -Build-Depends: quilt, - patchutils (>= 0.2.25), - cdbs (>= 0.4.27), - debhelper (>= 7.0.1), - dh-buildinfo, - cdbs (>= 0.4.69~), - devscripts (>= 2.10.7~), cmake, libboost-dev | libboost1.44-dev, - libmysqlclient15-dev, libpq-dev, libsqlite3-dev, unixodbc-dev -Standards-Version: 3.7.3 Section: libs -Homepage: http://soci.sourceforge.net - -Package: libsoci-core-gcc Priority: optional -Section: libs +Maintainer: Julian Taylor +Build-Depends: cmake (>= 2.6), + debhelper (>= 8.1.3~), + libboost-date-time-dev, + libboost-dev, + libmysqlclient-dev, + libpq-dev, + libsqlite3-dev, + unixodbc-dev +Standards-Version: 3.9.2 +Homepage: http://soci.sourceforge.net/ + +Package: libsoci-core3.2 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ Database Access Library (core) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -25,11 +25,11 @@ Description: C++ Database Access Library (core) . This package provides the shared library. -Package: libsoci-core-gcc-dev -Priority: optional +Package: libsoci3.2-dev Section: libdevel Architecture: any -Depends: libsoci-core-gcc (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Depends: libsoci-core3.2 (= ${binary:Version}), ${misc:Depends} Description: C++ Database Access Library (devel) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -37,23 +37,11 @@ Description: C++ Database Access Library (devel) . This package provides the development headers. -Package: libsoci-core-gcc-dbg -Priority: extra -Section: libs -Architecture: any -Depends: libsoci-core-gcc (= ${binary:Version}), ${misc:Depends} -Description: C++ Database Access Library (debug symbols) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the debugging symbols. - -Package: libsoci-mysql-gcc -Priority: optional -Section: libs +Package: libsoci-mysql3.2 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ Database Access Library (MySQL backend) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -61,11 +49,11 @@ Description: C++ Database Access Library (MySQL backend) . This package provides the MySQL backend. -Package: libsoci-sqlite3-gcc -Priority: optional -Section: libs +Package: libsoci-sqlite3-3.2 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ Database Access Library (SQLite3 backend) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -73,11 +61,11 @@ Description: C++ Database Access Library (SQLite3 backend) . This package provides the SQLite3 backend. -Package: libsoci-postgresql-gcc -Priority: optional -Section: libs +Package: libsoci-postgresql3.2 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ Database Access Library (PostgreSQL backend) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -85,11 +73,12 @@ Description: C++ Database Access Library (PostgreSQL backend) . This package provides the PostgreSQL backend. -Package: libsoci-odbc-gcc -Priority: optional -Section: libs +Package: libsoci-odbc3.2 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Priority: optional +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: C++ Database Access Library (PostgreSQL backend) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely @@ -98,9 +87,8 @@ Description: C++ Database Access Library (PostgreSQL backend) This package provides the ODBC backend. Package: libsoci-doc -Priority: optional -Section: libs Architecture: all +Depends: ${misc:Depends} Description: C++ Database Access Library (Documentation) Database access library for C++ that makes the illusion of embedding SQL queries in the regular C++ code, staying entirely diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index 077d5d2..0000000 --- a/debian/control.in +++ /dev/null @@ -1,103 +0,0 @@ -Source: soci -Priority: extra -Maintainer: Denis Chapligin -Build-Depends: @cdbs@, cmake, libboost-dev | libboost1.44-dev, - libmysqlclient15-dev, libpq-dev, libsqlite3-dev, unixodbc-dev -Standards-Version: 3.7.3 -Section: libs -Homepage: http://soci.sourceforge.net - -Package: libsoci-core-gcc -Priority: optional -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Database Access Library (core) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the shared library. - -Package: libsoci-core-gcc-dev -Priority: optional -Section: libdevel -Architecture: any -Depends: libsoci-core-gcc (= ${binary:Version}), ${misc:Depends} -Description: C++ Database Access Library (devel) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the development headers. - -Package: libsoci-core-gcc-dbg -Priority: extra -Section: libs -Architecture: any -Depends: libsoci-core-gcc (= ${binary:Version}), ${misc:Depends} -Description: C++ Database Access Library (debug symbols) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the debugging symbols. - -Package: libsoci-mysql-gcc -Priority: optional -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Database Access Library (MySQL backend) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the MySQL backend. - -Package: libsoci-sqlite3-gcc -Priority: optional -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Database Access Library (SQLite3 backend) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the SQLite3 backend. - -Package: libsoci-postgresql-gcc -Priority: optional -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Database Access Library (PostgreSQL backend) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the PostgreSQL backend. - -Package: libsoci-odbc-gcc -Priority: optional -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: C++ Database Access Library (PostgreSQL backend) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package provides the ODBC backend. - -Package: libsoci-doc -Priority: optional -Section: libs -Architecture: all -Description: C++ Database Access Library (Documentation) - Database access library for C++ that makes the illusion of - embedding SQL queries in the regular C++ code, staying entirely - within Standard C++. - . - This package contains SOCI documentation. diff --git a/debian/copyright b/debian/copyright index d60f22d..1bec7b5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,7 @@ This package was downloaded from https://github.com/SOCI/soci Files: debian/* Licence: GPL-3+ -Copyright: 2008 Neil Williams . 2013 Denis Chapligin +Copyright: 2008 Neil Williams Files: * Copyright: 2004-2013 Maciej Sobczak, Stephen Hutton, @@ -33,3 +33,6 @@ Licence: Boost FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +On Debian systems, the complete text of the GNU General +Public License can be found in '/usr/share/common-licenses/GPL-3' diff --git a/debian/docs b/debian/docs deleted file mode 100644 index f036c98..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -src/LICENSE_1_0.txt \ No newline at end of file diff --git a/debian/libsoci-core-gcc-dev.install b/debian/libsoci-core-gcc-dev.install deleted file mode 100644 index 4545602..0000000 --- a/debian/libsoci-core-gcc-dev.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/include/* -debian/tmp/usr/lib/*.a diff --git a/debian/libsoci-core-gcc.install b/debian/libsoci-core-gcc.install deleted file mode 100644 index 3e00755..0000000 --- a/debian/libsoci-core-gcc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libsoci_core*.so* -debian/lintian/overrides/libsoci-core-gcc ./usr/share/lintian/overrides/ diff --git a/debian/libsoci-core3.2.install b/debian/libsoci-core3.2.install new file mode 100644 index 0000000..69539d5 --- /dev/null +++ b/debian/libsoci-core3.2.install @@ -0,0 +1 @@ +usr/lib/*/libsoci_core*.so.* diff --git a/debian/libsoci-mysql-gcc.install b/debian/libsoci-mysql-gcc.install deleted file mode 100644 index 5f3dd07..0000000 --- a/debian/libsoci-mysql-gcc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libsoci_mysql*.so* -debian/lintian/overrides/libsoci-mysql-gcc ./usr/share/lintian/overrides/ diff --git a/debian/libsoci-mysql3.2.install b/debian/libsoci-mysql3.2.install new file mode 100644 index 0000000..90c18fb --- /dev/null +++ b/debian/libsoci-mysql3.2.install @@ -0,0 +1 @@ +usr/lib/*/libsoci_mysql*.so.* diff --git a/debian/libsoci-odbc-gcc.install b/debian/libsoci-odbc-gcc.install deleted file mode 100644 index 546faa8..0000000 --- a/debian/libsoci-odbc-gcc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libsoci_odbc*.so* -debian/lintian/overrides/libsoci-odbc-gcc ./usr/share/lintian/overrides/ diff --git a/debian/libsoci-odbc3.2.install b/debian/libsoci-odbc3.2.install new file mode 100644 index 0000000..2f3efac --- /dev/null +++ b/debian/libsoci-odbc3.2.install @@ -0,0 +1 @@ +usr/lib/*/libsoci_odbc*.so.* diff --git a/debian/libsoci-postgresql-gcc.install b/debian/libsoci-postgresql-gcc.install deleted file mode 100644 index 580a5a2..0000000 --- a/debian/libsoci-postgresql-gcc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libsoci_postgresql*.so* -debian/lintian/overrides/libsoci-postgresql-gcc ./usr/share/lintian/overrides/ diff --git a/debian/libsoci-postgresql3.2.install b/debian/libsoci-postgresql3.2.install new file mode 100644 index 0000000..cf2113d --- /dev/null +++ b/debian/libsoci-postgresql3.2.install @@ -0,0 +1 @@ +usr/lib/*/libsoci_postgresql*.so.* diff --git a/debian/libsoci-sqlite3-3.2.install b/debian/libsoci-sqlite3-3.2.install new file mode 100644 index 0000000..3d42a74 --- /dev/null +++ b/debian/libsoci-sqlite3-3.2.install @@ -0,0 +1 @@ +usr/lib/*/libsoci_sqlite3*.so.* diff --git a/debian/libsoci-sqlite3-gcc.install b/debian/libsoci-sqlite3-gcc.install deleted file mode 100644 index 4fb65f6..0000000 --- a/debian/libsoci-sqlite3-gcc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libsoci_sqlite3*.so* -debian/lintian/overrides/libsoci-sqlite3-gcc ./usr/share/lintian/overrides/ diff --git a/debian/libsoci3.2-dev.install b/debian/libsoci3.2-dev.install new file mode 100644 index 0000000..ec02a3e --- /dev/null +++ b/debian/libsoci3.2-dev.install @@ -0,0 +1,11 @@ +usr/include/* +usr/lib/*/libsoci_core.a +usr/lib/*/libsoci_core.so +usr/lib/*/libsoci_mysql.a +usr/lib/*/libsoci_mysql.so +usr/lib/*/libsoci_odbc.a +usr/lib/*/libsoci_odbc.so +usr/lib/*/libsoci_postgresql.a +usr/lib/*/libsoci_postgresql.so +usr/lib/*/libsoci_sqlite3.a +usr/lib/*/libsoci_sqlite3.so diff --git a/debian/lintian/overrides/libsoci-core-gcc b/debian/lintian/overrides/libsoci-core-gcc deleted file mode 100644 index 3095cbb..0000000 --- a/debian/lintian/overrides/libsoci-core-gcc +++ /dev/null @@ -1 +0,0 @@ -libsoci-core-gcc: package-name-doesnt-match-sonames libsoci-core-gcc-2_2-2.2.0 diff --git a/debian/lintian/overrides/libsoci-mysql-gcc b/debian/lintian/overrides/libsoci-mysql-gcc deleted file mode 100644 index e3e15ef..0000000 --- a/debian/lintian/overrides/libsoci-mysql-gcc +++ /dev/null @@ -1 +0,0 @@ -libsoci-mysql-gcc: package-name-doesnt-match-sonames libsoci-mysql-gcc-2_2-2.2.0 diff --git a/debian/lintian/overrides/libsoci-odbc-gcc b/debian/lintian/overrides/libsoci-odbc-gcc deleted file mode 100644 index 9ecf9ad..0000000 --- a/debian/lintian/overrides/libsoci-odbc-gcc +++ /dev/null @@ -1 +0,0 @@ -libsoci-odbc-gcc: package-name-doesnt-match-sonames libsoci-odbc-gcc-2_2-2.2.0 diff --git a/debian/lintian/overrides/libsoci-postgresql-gcc b/debian/lintian/overrides/libsoci-postgresql-gcc deleted file mode 100644 index fc5d599..0000000 --- a/debian/lintian/overrides/libsoci-postgresql-gcc +++ /dev/null @@ -1 +0,0 @@ -libsoci-postgresql-gcc: package-name-doesnt-match-sonames libsoci-postgresql-gcc-2_2-2.2.0 diff --git a/debian/lintian/overrides/libsoci-sqlite3-gcc b/debian/lintian/overrides/libsoci-sqlite3-gcc deleted file mode 100644 index 71fce8b..0000000 --- a/debian/lintian/overrides/libsoci-sqlite3-gcc +++ /dev/null @@ -1 +0,0 @@ -libsoci-sqlite3-gcc: package-name-doesnt-match-sonames libsoci-sqlite3-gcc-2_2-2.2.0 diff --git a/debian/patches/library_target b/debian/patches/library_target deleted file mode 100644 index 400889c..0000000 --- a/debian/patches/library_target +++ /dev/null @@ -1,16 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -67,11 +67,8 @@ - # Installation - ################################################################################# - --if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) -- set(SOCI_LIBDIR "lib") --else() -- set(SOCI_LIBDIR "lib64") --endif() -+#Debian always uses lib -+set(SOCI_LIBDIR "lib") - - set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") - set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.") diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 722425a..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -library_target diff --git a/debian/rules b/debian/rules index f308896..c4f3d70 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,15 @@ #!/usr/bin/make -f +#export DH_VERBOSE=1 -DEB_SRCDIR=src -DEB_CMAKE_INSTALL_PREFIX=/usr +LDFLAGS += -Wl,--as-needed +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +%: + dh $@ --parallel --sourcedirectory=src + +override_dh_auto_configure: + dh_auto_configure -- -DLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) -DWITH_ORACLE=off -DSOCI_MYSQL_DO_NOT_TEST=TRUE -DSOCI_POSTGRESQL_DO_NOT_TEST=TRUE -DSOCI_ODBC_DO_NOT_TEST=TRUE + +override_dh_auto_test: + dh_auto_test --max-parallel=1 -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/cmake.mk -include /usr/share/cdbs/1/rules/utils.mk diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..8ea9420 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/soci/soci-(.*)\.zip