--- libpqxx-2.6.9.orig/src/transaction_base.cxx +++ libpqxx-2.6.9/src/transaction_base.cxx @@ -18,6 +18,7 @@ */ #include "pqxx/compiler-internal.hxx" +#include #include #include "pqxx/connection_base" --- libpqxx-2.6.9.orig/src/binarystring.cxx +++ libpqxx-2.6.9/src/binarystring.cxx @@ -16,6 +16,7 @@ */ #include "pqxx/compiler-internal.hxx" +#include #include #include --- libpqxx-2.6.9.orig/src/result.cxx +++ libpqxx-2.6.9/src/result.cxx @@ -17,6 +17,8 @@ */ #include "pqxx/compiler-internal.hxx" +#include +#include #include #include "libpq-fe.h" @@ -44,7 +46,7 @@ pqxx::internal::result_data::~result_data() { PQclear(data); } -void pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; } +void PQXX_LIBEXPORT pqxx::internal::freemem_result_data(result_data *d) throw () { delete d; } pqxx::result::result(pqxx::internal::pq::PGresult *rhs, --- libpqxx-2.6.9.orig/src/cursor.cxx +++ libpqxx-2.6.9/src/cursor.cxx @@ -18,6 +18,7 @@ #include "pqxx/compiler-internal.hxx" #include +#include #include "pqxx/cursor" #include "pqxx/result" --- libpqxx-2.6.9.orig/src/connection_base.cxx +++ libpqxx-2.6.9/src/connection_base.cxx @@ -21,6 +21,7 @@ #include #include #include +#include #include #include --- libpqxx-2.6.9.orig/test/test003.cxx +++ libpqxx-2.6.9/test/test003.cxx @@ -1,4 +1,5 @@ #include +#include #include #include --- libpqxx-2.6.9.orig/test/test092.cxx +++ libpqxx-2.6.9/test/test092.cxx @@ -1,4 +1,5 @@ #include +#include #include #include --- libpqxx-2.6.9.orig/test/test030.cxx +++ libpqxx-2.6.9/test/test030.cxx @@ -1,4 +1,5 @@ #include +#include #include #include --- libpqxx-2.6.9.orig/test/test022.cxx +++ libpqxx-2.6.9/test/test022.cxx @@ -1,4 +1,5 @@ #include +#include #include #include --- libpqxx-2.6.9.orig/test/test011.cxx +++ libpqxx-2.6.9/test/test011.cxx @@ -1,4 +1,5 @@ #include +#include #include #include --- libpqxx-2.6.9.orig/config/config.sub +++ libpqxx-2.6.9/config/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1219,7 +1258,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- libpqxx-2.6.9.orig/config/config.guess +++ libpqxx-2.6.9/config/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -161,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -329,7 +330,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -531,7 +532,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -780,7 +781,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,12 +791,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -829,7 +836,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -950,6 +964,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1208,6 +1225,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1458,9 +1484,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- libpqxx-2.6.9.orig/debian/copyright +++ libpqxx-2.6.9/debian/copyright @@ -3,9 +3,11 @@ It was downloaded from ; now moved to -Upstream Authors: Jeroen T. Vermeulen +Upstream Author: Jeroen T. Vermeulen -Copyright: +Copyrights: + Copyright © 2001-2007, Jeroen T. Vermeulen. + Copyright © 1994-2008, Free Software Foundation. This project is released under the Berkeley/BSD license. --- libpqxx-2.6.9.orig/debian/libpqxx-doc.install +++ libpqxx-2.6.9/debian/libpqxx-doc.install @@ -0,0 +1,2 @@ +doc/html usr/share/doc/libpqxx-doc +test/*.cxx usr/share/doc/libpqxx-doc/examples --- libpqxx-2.6.9.orig/debian/changelog +++ libpqxx-2.6.9/debian/changelog @@ -1,233 +1,298 @@ -libpqxx (2.6.9-1) stable; urgency=medium +libpqxx (2.6.9-9) unstable; urgency=low - * New upstream release. - - -- Jeroen T. Vermeulen Thu, 01 Feb 2007 17:10:00 +0700 - -libpqxx (2.6.8-1) stable; urgency=medium - - * New upstream release. - - -- Jeroen T. Vermeulen Thu, 07 Sep 2006 17:00:00 +0700 - -libpqxx (2.6.7-1) stable; urgency=high + * As 3rd major version of libpqxx is available (libpqxx3), old version is now + considered deprecated. Moved binary packages to section 'oldlibs' and + set priority to 'extra'. - * New upstream release. - - -- Jeroen T. Vermeulen Fri, 01 Jun 2006 02:30:00 +0700 + -- Eugene V. Lyubimkin Sun, 01 Mar 2009 08:52:43 +0200 -libpqxx (2.6.6-1) stable; urgency=high - - * New upstream release. - * Fixes security problem with string escaping +libpqxx (2.6.9-8) unstable; urgency=low - -- Jeroen T. Vermeulen Sat, 27 May 2006 17:20:00 +0700 - -libpqxx (2.6.5-1) unstable; urgency=medium - - * New upstream release. + * debian/control: + - Bumped 'Conflicts' and 'Replaces' in libpqxx-doc to (<< 2.6.9-7) due to + broken build system of 2.6.9-6. - -- Jeroen T. Vermeulen Mon, 06 Mar 2006 20:00:00 +0700 + -- Eugene V. Lyubimkin Tue, 29 Jul 2008 23:40:12 +0300 -libpqxx (2.6.4-1) unstable; urgency=medium +libpqxx (2.6.9-7) unstable; urgency=low - [ Jeroen T. Vermeulen ] - * New upstream release. - - [ Roger Leigh ] - * debian/control.in: - - Build-Depend upon debhelper v4, and libpq-dev rather than - postgresql-dev. - - libpqxx-dev: Depend upon libpq-dev rather than postgresql-dev. - * debian/libpqxx-dev.docs: Include README-UPGRADE. + * Introduced debug package: libpqxx2.6.9ldbl-dbg. + * Removed static library from -dev package, I see no objections to use + shared version of library. + * Patch: used PQXX_LIBEXPORT in function + 'void pqxx::internal::freemem_result_data(result_data *d)'. + Now 'make check'-tests are passed fully. * debian/rules: - - Use debhelper v4 compatibility mode. + - Now library compiles with '-D_REENTRANT'. + - Add deleting of author-provided 'libpqxx-dev.doc-base.*' in + 'autoconfigure' rule to avoid incorrect doc-base entries in 'libpqxx-dev' + package. (Closes: #492174) + + -- Eugene V. Lyubimkin Fri, 11 Jul 2008 11:10:12 +0300 + +libpqxx (2.6.9-6) unstable; urgency=low + + * New maintainer. (Closes: #479399) + - Thanks for work, Roger Leigh! + * Moved all documentation stuff to new binary package 'libpqxx-doc'. + * debian/rules: + - Some cleanup. + - Added support for 'parallel=n' in DEB_BUILD_OPTIONS. + - Fixed support for 'noopt' in DEB_BUILD_OPTIONS. + * debian/control.in: + - Fixed using "${binary:Version}" in new builds. + - Bumped 'Standards-Version' to 3.8.0. + - Added 'Homepage' field. + - Added debian/watch. + - Added 'parallel=n' support (see above). + - Changed 'doc-base' sections to 'Programming/C++'. + * debian/copyright: + - Fixed a typo: 'Authors' -> 'Author'. + - Renewed copyrights. - -- Roger Leigh Sat, 11 Feb 2006 14:14:05 +0000 + -- Eugene V. Lyubimkin Sat, 09 Jul 2008 02:09:30 +0300 -libpqxx (2.6.3-1) unstable; urgency=medium +libpqxx (2.6.9-5) unstable; urgency=low - * New upstream release. + * src/binarystring.cxx, src/connection_base.cxx, src/cursor.cxx, + src/result.cxx, src/transaction_base.cxx, test/test003.cxx, + test/test011.cxx, test/test022.cxx, test/test030.cxx, + test/test092.cxx: Include and to prototype + string, memory, and maths functions needed to build with + GCC 4.3 (Closes: #441558). + * debian/rules: Remove redundant "make distclean" in clean target. + * debian/control: Use ${binary:Version} in place of + ${Source-Version}. - -- Jeroen T. Vermeulen Sat, 11 Feb 2006 16:00:00 +0700 + -- Roger Leigh Tue, 11 Sep 2007 09:38:15 +0100 -libpqxx (2.6.2-1) unstable; urgency=medium +libpqxx (2.6.9-4) unstable; urgency=low - * New upstream release. + * debian/rules: Add "ldbl" suffix to LIBRARY_VERSION for the "long + double" ABI transition (Closes: #430294). + * debian/control.in: libpqxx: Conflict with libpqxx-2.6.9. - -- Jeroen T. Vermeulen Sun, 13 Nov 2005 11:30:00 +0700 + -- Roger Leigh Sun, 24 Jun 2007 12:18:44 +0100 -libpqxx (2.6.1-1) unstable; urgency=medium +libpqxx (2.6.9-3) unstable; urgency=low - * New upstream release. + * src/result.cxx: Really include missing cstdlib header, needed to build + with GCC 4.3 (Closes: #417360). - -- Jeroen T. Vermeulen Mon, 17 Jul 2005 19:30:00 +0700 + -- Roger Leigh Fri, 27 Apr 2007 20:58:53 +0100 -libpqxx (2.6.0-1) unstable; urgency=low +libpqxx (2.6.9-2) unstable; urgency=low - * New upstream release. + * src/result.cxx: Include missing cstdlib header, needed to build with + GCC 4.3 (Closes: #417360). + * debian/compat: New file. Set debhelper compatibility level to 5. + * debian/control: Build-Depend on debhelper >> 5.0.0. - -- Jeroen T. Vermeulen Mon, 17 Jul 2005 19:30:00 +0700 + -- Roger Leigh Sun, 22 Apr 2007 16:16:39 +0100 -libpqxx (2.5.6-1) stable; urgency=high +libpqxx (2.6.9-1) experimental; urgency=low * New upstream release. - -- Jeroen T. Vermeulen Fri, 01 Jul 2005 20:30:00 +0700 + -- Roger Leigh Sat, 3 Feb 2007 11:52:31 +0000 -libpqxx (2.5.5-1) stable; urgency=high +libpqxx (2.6.8-1) unstable; urgency=low * New upstream release. - -- Jeroen T. Vermeulen Tue, 28 Jun 2005 16:00:00 +0700 + -- Roger Leigh Thu, 7 Sep 2006 10:05:55 +0100 -libpqxx (2.5.4-1) stable; urgency=medium +libpqxx (2.6.7-1) unstable; urgency=low * New upstream release. + * debian/libpqxx-dev.docs: Include README-UPGRADE. + * debian/rules: Drop c2a library suffix. + * debian/control: + - Drop c2a library suffix. + - Update to Standards-Version 3.7.2. + - Added Martin Pitt to Uploaders. - -- Jeroen T. Vermeulen Tue, 20 Jun 2005 16:00:00 +0700 + -- Roger Leigh Sun, 9 Jul 2006 13:04:15 +0100 -libpqxx (2.5.3-1) stable; urgency=low +libpqxx (2.5.5-2) unstable; urgency=low - * New upstream release. + * debian/control.in: + - Add a "c2a" suffix to the library package name, and conflict + with the previous name. This is for rebuilding against the + new libstdc++ allocator, which changes the C++ ABI + (Closes: #339216). + - Build-Depend upon at least debhelper version 4. + * debian/rules: + - Create and remove package symlinks with a "c2a" suffix. + - Use debhelper v4 compatibility mode. - -- Jeroen T. Vermeulen Mon, 16 May 2005 19:00:00 +0700 + -- Roger Leigh Thu, 17 Nov 2005 12:48:21 +0000 -libpqxx (2.5.2-1) stable; urgency=medium +libpqxx (2.5.5-1) unstable; urgency=low * New upstream release. + * Update to Standards-Version 3.6.2. + * The package is built with g++ 4.0, but no "c2" suffix has + been added because the soname has also changed. - -- Jeroen T. Vermeulen Mon, 09 May 2005 12:00:00 +0700 + -- Roger Leigh Sat, 9 Jul 2005 14:49:05 +0100 -libpqxx (2.5.1-1) stable; urgency=low +libpqxx (2.4.3-2) unstable; urgency=low - * New upstream release. + * PostgreSQL 8.0 transition. + - Build-Depend upon libpq-dev rather than postgresql-dev. + - libpqxx-dev: Depend upon libpq-dev rather than postgresql-dev. - -- Jeroen T. Vermeulen Thu, 31 Mar 2005 14:00:00 +0700 + -- Roger Leigh Thu, 9 Jun 2005 19:37:04 +0100 -libpqxx (2.5.0-1) stable; urgency=medium +libpqxx (2.4.3-1) unstable; urgency=low * New upstream release. - -- Jeroen T. Vermeulen Sat, 05 Mar 2005 14:35:00 +0700 + -- Roger Leigh Thu, 10 Feb 2005 21:30:15 +0000 -libpqxx (2.4.4-1) stable; urgency=medium +libpqxx (2.4.1-2) unstable; urgency=low - * New upstream release. + * Regenerate debian/control to ensure packages names are + correct. - -- Jeroen T. Vermeulen Mon, 28 Feb 2005 10:32:00 +0700 + -- Roger Leigh Wed, 24 Nov 2004 23:55:55 +0000 -libpqxx (2.4.3-1) stable; urgency=medium +libpqxx (2.4.1-1) unstable; urgency=low * New upstream release. + * Dropped all patches; these are now incorporated upstream. + * Build-Depend on postgresql-dev (>= 7.4.6-1) in order to + guarantee ABI compatibility with postgresql on all arches. - -- Jeroen T. Vermeulen Mon, 07 Feb 2005 16:40:00 +0700 + -- Roger Leigh Sun, 7 Nov 2004 22:44:23 +0000 -libpqxx (2.4.2-1) stable; urgency=medium +libpqxx (2.4.0-2) unstable; urgency=low - * New upstream release. + * Really bootstrap with the current autotools. - -- Jeroen T. Vermeulen Mon, 15 Nov 2004 17:30:00 +0700 + -- Roger Leigh Sun, 31 Oct 2004 14:02:07 +0000 -libpqxx (2.4.1-1) stable; urgency=medium +libpqxx (2.4.0-1) unstable; urgency=low * New upstream release. + * Retained patches from previous release: + - include/pqxx/Makefile.am (installed headers) + - debian/rules (delete examples using internal headers) + - debian/control.in (version Build-Depends on postgresql-dev + and chrpath, libpqxx-dev depends on versioned postgresql-dev + and pkg-config). + * Re-bootstrapped with current autotools. - -- Jeroen T. Vermeulen Wed, 03 Nov 2004 14:10:00 +0700 + -- Roger Leigh Sun, 31 Oct 2004 12:14:11 +0000 -libpqxx (2.4.0-1) unstable; urgency=medium +libpqxx (2.3.0-3) unstable; urgency=low - * New upstream release. + * libpqxx-dev: + - Depend upon pkg-config. + - Don't install compiler.h, which includes internal headers + that are not installed. + Thanks to Dennis Lubert for reporting these problems. + - Remove all examples that include private headers; the + deletion rules were outdated due to header renaming. - -- Jeroen T. Vermeulen Thu, 14 Oct 2004 16:40:00 +0700 + -- Roger Leigh Sun, 10 Oct 2004 15:59:52 +0100 libpqxx (2.3.0-2) unstable; urgency=low - * debian/control.in: - - Add chrpath to build dependencies to strip rpath from binaries - - Depend on at least version 7.4.2-1 of postgresql for binary - compatibility reasons (libpq dependency). - * debian/rules: - - Don't package tests which make use of internal headers as - examples. - - -- Roger Leigh Thu, 02 Sep 2004 00:09:51 +0100 - -libpqxx (2.3.0-1) unstable; urgency=medium + * Don't install private headers which are only for internal + use for the duration of the build. Only install + config-public-*.h. + * Patch configure.ac.in to work with automake-1.9 (added + a tar-ustar option to ensure portable tarballs may be + generated). - * New upstream release. - - -- Jeroen T. Vermeulen Sat, 21 Aug 2004 03:50:00 +0200 + -- Roger Leigh Tue, 28 Sep 2004 22:38:24 +0100 -libpqxx (2.2.9-1) unstable; urgency=medium +libpqxx (2.3.0-1) unstable; urgency=low - * New upstream release. + * New upstream release (Closes: #265639). + * This release builds with GCC 3.4 (Closes: #260467). + * configure.ac.in and tools/Makefile.am required minor changes to + allow VPATH building. The changes have been submitted upstream. - -- Jeroen T. Vermeulen Thu, 12 Aug 2004 21:15:00 +0200 + -- Roger Leigh Wed, 1 Sep 2004 23:16:10 +0100 -libpqxx (2.2.8-1) unstable; urgency=low +libpqxx (2.2.2-1) unstable; urgency=low * New upstream release. + * debian/rules: Removed deletion of include/pqxx/config.h and + include/pqxx/libconfig.h, which are no longer distributed. + * debian/rules: libpqxx-dev includes the regression tests as + example code. Some tests use the internal headers internalconfig.h + and compiler.h. These tests are now removed from libpqxx-dev + (Closes: #240499). - -- Jeroen T. Vermeulen Mon, 9 Aug 2004 00:50:00 +0200 + -- Roger Leigh Sat, 8 May 2004 14:55:23 +0100 -libpqxx (2.2.7-1) stable; urgency=medium +libpqxx (2.2.1-2) unstable; urgency=low - * New upstream release. + * tools/Makefile.am: add -I$(top_builddir)/include to INCLUDES to + fix VPATH build. Regenerate Makefile.ins with automake. - -- Jeroen T. Vermeulen Fri, 2 Jul 2004 21:40:31 +0200 + -- Roger Leigh Sun, 4 Apr 2004 17:52:32 +0100 -libpqxx (2.2.6-1) unstable; urgency=low +libpqxx (2.2.1-1) unstable; urgency=low * New upstream release. - -- Jeroen T. Vermeulen Thu, 19 Jun 2004 23:55:55 +0200 + -- Roger Leigh Mon, 22 Mar 2004 20:43:26 +0000 -libpqxx (2.2.5-1) unstable; urgency=low +libpqxx (2.2.0-1) unstable; urgency=low * New upstream release. + * pqxx::result memory leak present in 2.1.3 is fixed with this + release (Closes: #239195). - -- Jeroen T. Vermeulen Thu, 17 Jun 2004 19:00:00 +0200 + -- Roger Leigh Sun, 21 Mar 2004 15:08:01 +0000 -libpqxx (2.2.4-1) unstable; urgency=low +libpqxx (2.1.3-5) unstable; urgency=low - * New upstream release. + * libpqxx-dev depends upon postgresql-dev. This should solve + some potential build environment incompatibilities. - -- Jeroen T. Vermeulen Sun, 6 Jun 2004 20:45:00 +0200 + -- Roger Leigh Wed, 17 Mar 2004 20:41:59 +0000 -libpqxx (2.2.3-1) stable; urgency=low +libpqxx (2.1.3-4) unstable; urgency=low - * New upstream release. + * Force building with the correct version of postgresql-dev by + Build-Depending upon postgresql-dev (>= 7.4.1-3). - -- Jeroen T. Vermeulen Tue, 27 Apr 2004 02:45:00 +0200 + -- Roger Leigh Sun, 8 Feb 2004 20:25:43 +0000 -libpqxx (2.2.2-1) stable; urgency=low +libpqxx (2.1.3-3) unstable; urgency=low - * New upstream release. + * Rebuild to fix a dependency issue due to an outdated libpq3 shlibs + file (Bug #230259, which was reassigned to postgresql). This + caused run-time linker errors when used with older libpq3 versions, + due to missing symbols only present with PostgreSQL 7.4.x. - -- Jeroen T. Vermeulen Tue, 27 Apr 2004 01:25:00 +0200 + -- Roger Leigh Sun, 8 Feb 2004 17:58:54 +0000 -libpqxx (2.2.1-1) stable; urgency=low +libpqxx (2.1.3-2) unstable; urgency=low - * New upstream release. - - -- Jeroen T. Vermeulen Mon, 23 Feb 2004 15:20:00 +0200 - -libpqxx (2.2.0-1) stable; urgency=low + * Fix failure when converting a pqxx::result::tuple into + a bool. The fix was backported from libpqxx CVS. - * New upstream release. - - -- Roger Leigh Tue, 13 Jan 2004 21:58:03 +0000 + -- Roger Leigh Thu, 15 Jan 2004 11:09:35 +0000 -libpqxx (2.1.3-1) stable; urgency=low +libpqxx (2.1.3-1) unstable; urgency=low - * New upstream release. + * New upstream release (Closes: #219389). + * Acknowledge bugs closed by previous NMUs + (Closes: #217203, #198441, #201263). * Switched to using the new library versioning scheme with package version string in the library DT_SONAME. This requires preprocessing of debian/control, and versioned symlinks are created at build time. + * Added pkg-config libpqxx.pc file. - -- Roger Leigh Sat, 6 Dec 2003 20:09:44 +0000 + -- Roger Leigh Thu, 8 Jan 2004 15:05:44 +0000 libpqxx (2.0.0-1) unstable; urgency=low @@ -237,9 +302,8 @@ - 1.7.6-1: Example packaging to be used with libpqxx development version 1.7.6 (Greg Hookey). - 1.9.6-1: Source changes (Jeroen T. Vermeulen). - - 2.0.0-1: [debian/control, dedian/rules] Use chrpath to get rid of RPATH + - 2.0.0-1: [debian/control, debian/rules] Use chrpath to get rid of RPATH in the shared library (J.H.M. Dassen (Ray)) - * Merge changes made in pervious NMUs (Closes: #217203, #198441, #201263) * Added the new tutorial to libpqxx-dev. -- Roger Leigh Thu, 20 Nov 2003 21:09:06 +0000 @@ -275,7 +339,7 @@ libpqxx (1.5.1-1) unstable; urgency=low - * Initial Release. (closes: #170932) + * Initial Release. (closes: #170932) -- Greg Hookey Sat, 22 Mar 2003 16:00:10 -0800 --- libpqxx-2.6.9.orig/debian/compat +++ libpqxx-2.6.9/debian/compat @@ -0,0 +1 @@ +5 --- libpqxx-2.6.9.orig/debian/libpqxx-doc.doc-base.tutorial +++ libpqxx-2.6.9/debian/libpqxx-doc.doc-base.tutorial @@ -0,0 +1,9 @@ +Document: libpqxx-tutorial +Title: libpqxx Tutorial +Author: Jeroen T. Vermeulen +Abstract: Tutorial for libpqxx, a C++ API to the PostgreSQL database management system. +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/libpqxx-doc/html/Tutorial/index.html +Files: /usr/share/doc/libpqxx-doc/html/Tutorial/* --- libpqxx-2.6.9.orig/debian/libpqxx-doc.doc-base.reference +++ libpqxx-2.6.9/debian/libpqxx-doc.doc-base.reference @@ -0,0 +1,9 @@ +Document: libpqxx-reference +Title: libpqxx Reference Manual +Author: Jeroen T. Vermeulen +Abstract: A C++ API to the PostgreSQL database management system. +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/libpqxx-doc/html/Reference/index.html +Files: /usr/share/doc/libpqxx-doc/html/Reference/* --- libpqxx-2.6.9.orig/debian/watch +++ libpqxx-2.6.9/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://pqxx.org/software/libpqxx/libpqxx-(.+)\.tar\.gz --- libpqxx-2.6.9.orig/debian/control.in +++ libpqxx-2.6.9/debian/control.in @@ -1,24 +1,57 @@ Source: libpqxx Section: libs Priority: optional -Maintainer: Roger Leigh -Build-Depends: debhelper (>> 4.0.0), libpq-dev (>= 8.0.3), chrpath -Standards-Version: 3.6.2 +Maintainer: Eugene V. Lyubimkin +Uploaders: Martin Pitt +Build-Depends: debhelper (>> 5.0.0), libpq-dev (>= 8.0.3), chrpath +Standards-Version: 3.8.0 +Homepage: http://pqxx.org Package: libpqxx-dev Section: libdevel Architecture: any -Depends: libpq-dev (>= 8.0.3-1), libpqxx#LIBRARY_VERSION# (= ${Source-Version}), pkg-config +Depends: libpq-dev (>= 8.0.3-1), libpqxx#LIBRARY_VERSION# (= ${binary:Version}), pkg-config +Suggests: libpqxx-doc Description: C++ library to connect to PostgreSQL (development files) - Header files for linking against libpqxx. This package obsoletes + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains header files for linking against libpqxx. Obsoletes the libpqpp-dev package. +Package: libpqxx-doc +Section: doc +Architecture: all +Suggests: libpqxx-dev (>= ${binary:Version}) +Conflicts: libpqxx-dev (<< 2.6.9-6) +Replaces: libpqxx-dev (<< 2.6.9-6) +Description: C++ library to connect to PostgreSQL (documentation) + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains documentation and examples. + Package: libpqxx#LIBRARY_VERSION# Section: libs Architecture: any Depends: ${shlibs:Depends} +Conflicts: libpqxx-2.6.9 Description: C++ library to connect to PostgreSQL C++ library to enable user programs to communicate with - the PostgreSQL database backend. The database backend can + the PostgreSQL database back-end. The database back-end can be local or it may be on another machine, accessed via TCP/IP. This package obsoletes the libpqpp package. + +Package: libpqxx#LIBRARY_VERSION#-dbg +Section: libs +Priority: extra +Architecture: any +Depends: libpqxx#LIBRARY_VERSION# (= ${binary:Version}) +Description: C++ library to connect to PostgreSQL (debugging symbols) + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains debugging symbols for the libpqxx library. It is usually + needed to get a useful backtrace when applications using the libpqxx library + crashes. + --- libpqxx-2.6.9.orig/debian/control +++ libpqxx-2.6.9/debian/control @@ -1,24 +1,56 @@ Source: libpqxx -Section: libs -Priority: optional -Maintainer: Roger Leigh -Build-Depends: debhelper (>> 4.0.0), libpq-dev (>= 8.0.3), chrpath -Standards-Version: 3.6.2 +Section: oldlibs +Priority: extra +Maintainer: Eugene V. Lyubimkin +Uploaders: Martin Pitt +Build-Depends: debhelper (>> 5.0.0), libpq-dev (>= 8.0.3), chrpath +Standards-Version: 3.8.0 +Homepage: http://pqxx.org Package: libpqxx-dev Section: libdevel Architecture: any -Depends: libpq-dev (>= 8.0.3-1), libpqxx-2.6.9 (= ${Source-Version}), pkg-config +Depends: libpq-dev (>= 8.0.3-1), libpqxx-2.6.9ldbl (= ${binary:Version}), pkg-config +Suggests: libpqxx-doc Description: C++ library to connect to PostgreSQL (development files) - Header files for linking against libpqxx. This package obsoletes + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains header files for linking against libpqxx. Obsoletes the libpqpp-dev package. -Package: libpqxx-2.6.9 -Section: libs +Package: libpqxx-doc +Section: doc +Architecture: all +Suggests: libpqxx-dev (>= ${binary:Version}) +Conflicts: libpqxx-dev (<< 2.6.9-7) +Replaces: libpqxx-dev (<< 2.6.9-7) +Description: C++ library to connect to PostgreSQL (documentation) + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains documentation and examples. + +Package: libpqxx-2.6.9ldbl +Section: oldlibs Architecture: any Depends: ${shlibs:Depends} +Conflicts: libpqxx-2.6.9 Description: C++ library to connect to PostgreSQL C++ library to enable user programs to communicate with - the PostgreSQL database backend. The database backend can + the PostgreSQL database back-end. The database back-end can be local or it may be on another machine, accessed via TCP/IP. This package obsoletes the libpqpp package. + +Package: libpqxx-2.6.9ldbl-dbg +Section: libdevel +Architecture: any +Depends: libpqxx-2.6.9ldbl (= ${binary:Version}) +Description: C++ library to connect to PostgreSQL (debugging symbols) + C++ library to enable user programs to communicate with + the PostgreSQL database back-end. + . + This package contains debugging symbols for the libpqxx library. It is usually + needed to get a useful backtrace when applications using the libpqxx library + crashes. + --- libpqxx-2.6.9.orig/debian/libpqxx-dev.install +++ libpqxx-2.6.9/debian/libpqxx-dev.install @@ -1,7 +1,4 @@ debian/install/usr/include usr -debian/install/usr/lib/libpqxx.a usr/lib debian/install/usr/lib/libpqxx.la usr/lib debian/install/usr/lib/libpqxx.so usr/lib debian/install/usr/lib/pkgconfig usr/lib -doc/html usr/share/doc/libpqxx-dev -test/*.cxx usr/share/doc/libpqxx-dev/examples --- libpqxx-2.6.9.orig/debian/rules +++ libpqxx-2.6.9/debian/rules @@ -1,33 +1,27 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g - +CXXFLAGS += -D_REENTRANT ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 + CXXFLAGS += -O0 else - CFLAGS += -O2 + CXXFLAGS += -O2 endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) endif + # Get upstream version, and define libpqxx suffix UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//") -LIBRARY_VERSION = -$(UPSTREAM_VERSION) -#LIBRARY_VERSION = 1 +LIBRARY_VERSION = -$(UPSTREAM_VERSION)ldbl autoconfigure: autoconfigure-stamp autoconfigure-stamp: debian/control @@ -39,10 +33,11 @@ ln -sf $$file `echo $$file | sed -e 's/libpqxx/libpqxx$(LIBRARY_VERSION)/'`; \ done -rm debian/libpqxx$(LIBRARY_VERSION)*.in + -rm -f debian/libpqxx-dev.doc-base.* - mkdir debian/build; \ - cd debian/build; \ - ../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-static --enable-shared + mkdir debian/build && \ + cd debian/build && \ + ../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-shared --disable-static CXXFLAGS="$(CXXFLAGS)" touch autoconfigure-stamp @@ -60,7 +55,6 @@ dh_testroot rm -f build-stamp autoconfigure-stamp - -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config/config.sub endif @@ -88,34 +82,27 @@ cd debian/build; \ $(MAKE) install DESTDIR=$(CURDIR)/debian/install + # We don't want an RPATH in a Debian package chrpath --delete debian/install/usr/lib/lib*.so dh_install # Remove examples which include internal headers - rm -f `grep -l config\\.h debian/libpqxx-dev/usr/share/doc/libpqxx-dev/examples/*.cxx` - rm -f `grep -l config-internal debian/libpqxx-dev/usr/share/doc/libpqxx-dev/examples/*.cxx` - rm -f `grep -l compiler\\.h debian/libpqxx-dev/usr/share/doc/libpqxx-dev/examples/*.cxx` + rm -f `grep -l config\\.h debian/libpqxx-doc/usr/share/doc/libpqxx-doc/examples/*.cxx` + rm -f `grep -l config-internal debian/libpqxx-doc/usr/share/doc/libpqxx-doc/examples/*.cxx` + rm -f `grep -l compiler\\.h debian/libpqxx-doc/usr/share/doc/libpqxx-doc/examples/*.cxx` -# Build architecture-independent files here. binary-indep: install -# We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: install dh_testdir dh_testroot - dh_installdocs dh_installexamples - dh_installmenu - dh_installcron - dh_installman - dh_installinfo dh_installchangelogs ChangeLog dh_link - dh_strip + dh_strip --dbg-package=libpqxx$(LIBRARY_VERSION)-dbg dh_compress dh_fixperms dh_makeshlibs