From e744242fe103f22bf266fd1b81ffd706df5cec24 Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Thu, 17 Jan 2008 23:59:42 +0000 Subject: [PATCH] Update the debian directory (debian release 2.0.6-3). --- debian/changelog | 59 ++++++++++++++++++++++++++++++ debian/control | 39 +++++++++++++++++--- debian/copyright | 12 +++++- debian/python-psycopg2da.dzproduct | 3 ++ debian/rules | 25 ++++++++++--- debian/watch | 2 + debian/zope-psycopgda2.dzproduct | 2 +- 7 files changed, 130 insertions(+), 12 deletions(-) create mode 100644 debian/python-psycopg2da.dzproduct create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog index 1b370e99..1e14a18b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,62 @@ +psycopg2 (2.0.6-3) unstable; urgency=low + + [ Piotr Ożarowski ] + * XS-Vcs-Svn field renamed to Vcs-Svn + * Vcs-Browser field added + + [ Fabio Tranchitella ] + * Mention DB-API 2.0 compatibility in the long description. + (Closes: #430763) + + -- Fabio Tranchitella Thu, 08 Nov 2007 15:07:05 +0100 + +psycopg2 (2.0.6-2) unstable; urgency=low + + * Build a python-psycopg-dbg package + + -- Scott Kitterman Tue, 03 Ju1 2007 16:55:48 -0400 + +psycopg2 (2.0.6-1) unstable; urgency=low + + * New upstream release. + * psycopg2da: removed, merged upstream. + + -- Fabio Tranchitella Sat, 09 Jun 2007 22:38:23 +0200 + +psycopg2 (2.0.5.1-7) UNRELEASED; urgency=low + + * debian/watch: added. + + -- Fabio Tranchitella Fri, 9 Feb 2007 12:35:55 +0100 + +psycopg2 (2.0.5.1-6) unstable; urgency=high + + * debian/zope-psycopgda2.dzproduct: requires Zope 2.9 or higher: previous + versions use python2.3 which is not supported anymore in psycopg. + + -- Fabio Tranchitella Mon, 15 Jan 2007 11:39:15 +0100 + +psycopg2 (2.0.5.1-5) unstable; urgency=medium + + * Do not run dh_pycentral on zope-psycopgda2. (Closes: #400846) + + -- Fabio Tranchitella Wed, 29 Nov 2006 09:04:09 +0100 + +psycopg2 (2.0.5.1-4) unstable; urgency=medium + + * Fixed a bug in psycopg2da. + * debian/control: bumped build-dependency on zope-debhelper. + * Added XS-Vcs-Svn field + + -- Fabio Tranchitella Fri, 24 Nov 2006 13:50:11 +0100 + +psycopg2 (2.0.5.1-3) unstable; urgency=low + + * psycopgda: imported upstream psycopg2da database adapter from SVN, which + builds a new binary package, python-psycopg2da. + + -- Fabio Tranchitella Fri, 10 Nov 2006 08:56:05 +0100 + psycopg2 (2.0.5.1-2) unstable; urgency=low * debian/control: added again a dependency on python-egenix-mxdatetime. diff --git a/debian/control b/debian/control index 390489e0..8f916ccd 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,13 @@ Source: psycopg2 Section: python Priority: optional -Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-central (>= 0.5.0), python (>= 2.3.5-7), python-egenix-mx-base-dev, autoconf, libpq-dev -Build-Depends-Indep: zope-debhelper (>= 0.3.2.7) +Build-Depends: debhelper (>= 5.0.37.2), python-all-dev, python-all-dbg, python-central (>= 0.5.0), python (>= 2.3.5-7), python-egenix-mx-base-dev, autoconf, libpq-dev +Build-Depends-Indep: zope-debhelper (>= 0.3.4) Maintainer: Fabio Tranchitella -Standards-Version: 3.7.2 +Standards-Version: 3.7.2.1 XS-Python-Version: all +Vcs-Svn: svn://svn.debian.org/python-modules/packages/psycopg2/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/psycopg2/?op=log Package: python-psycopg2 Architecture: any @@ -25,11 +27,38 @@ Description: Python module for PostgreSQL cursors and make a conspicuous number of concurrent INSERTs or UPDATEs. psycopg 2 also provides full asycronous operations for the really brave programmer. + . + The main advantages of psycopg2 are that it supports the full Python DBAPI-2.0 + and being thread safe at level 2. It also includes some extensions to the + standard DBAPI-2.0 to allow for better thread performance. + +Package: python-psycopg2-dbg +Priority: extra +Architecture: any +Section: python +Depends: python-psycopg2 (= ${Source-Version}), python-dbg, python-egenix-mxdatetime-dbg, ${shlibs:Depends} +Description: Python module for PostgreSQL (debug extension) + psycopg is a PostgreSQL database adapter for the Python programming language + (just like pygresql and popy.) This is version 2, a complete rewrite of the + original code to provide new-style classes for connection and cursor objects + and other sweet candies. Like the original, psycopg 2 was written with the + aim of being very small and fast, and stable as a rock. + . + This package contains the extensions built for the python debug interpreter. Package: zope-psycopgda2 Architecture: all Section: python -Depends: ${zope:Depends}, python-psycopg2 (>= ${Source-Version}) -Description: Zope database adapter based on python-psycopg +Depends: ${zope:Depends}, python-psycopg2 (>= ${source:Version}) +Description: Zope database adapter based on python-psycopg2 The package contains the PostgreSQL database adapter for Zope 2.7, 2.8 and 2.9 based on the psycopg2 Python module. + +Package: python-psycopg2da +Architecture: all +Section: python +Depends: ${zope:Depends}, python-psycopg2 (>= ${source:Version}) +XB-Python-Version: ${zope:PythonVersion} +Description: Zope database adapter based on python-psycopg2 -- zope3 version + The package contains the PostgreSQL database adapter for Zope 3 based on + the psycopg2 Python module. diff --git a/debian/copyright b/debian/copyright index 4aea47df..0f2211d0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,6 +14,9 @@ Copyright: Copyright (C) 2001-2006 Federico Di Gregorio Copyright (C) 2001 Michele Comitini + For psycopg2da: + Copyright (C) 2006 Fabio Tranchitella + For the files doc/copy_from.py and doc/copy_to.py: Copyright (C) 2001-2005 Federico Di Gregorio Copyright (C) 2002 Tom Jenkins @@ -25,7 +28,7 @@ Copyright: Copyright (C) 2003 Daniele Varrazzo -License for psycopg2 and ZPsycopgDA: +License for psycopg2, ZPsycopgDA and psycopg2da: psycopg is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,6 +65,13 @@ Alternative licenses for ZPsycopgDA: published on the Zope web site, http://www.zope.org/Resources/ZPL. +Alternative licenses for psycopg2da: + + If you prefer you can use the Zope3 Database Adapter psycopg2da (i.e., + every file inside the psycopg2da directory) user the ZPL license as + published on the Zope web site, http://www.zope.org/Resources/ZPL. + + Alternative licenses for psycopg/adapter*.{j,c} and psycopg/microprotocol*.{h.c}: diff --git a/debian/python-psycopg2da.dzproduct b/debian/python-psycopg2da.dzproduct new file mode 100644 index 00000000..d7d9206a --- /dev/null +++ b/debian/python-psycopg2da.dzproduct @@ -0,0 +1,3 @@ +Name: psycopg2da +ZopeVersions: 3 +Global: yes diff --git a/debian/rules b/debian/rules index cbc615fb..f33dd46d 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ build-stamp: for python in $(PYVERS); do \ $$python setup.py build ; \ done + for python in $(PYVERS); do \ + $$python-dbg setup.py build ; \ + done touch build-stamp clean: configure @@ -33,23 +36,33 @@ install-arch: build dh_clean -k dh_installdirs # psycopg2 - for python in $(PYVERS); \ - do $$python setup.py install --root=$(CURDIR)/debian/python-psycopg2 --no-compile; \ - done + for python in $(PYVERS); do \ + $$python setup.py install \ + --root=$(CURDIR)/debian/python-psycopg2 --no-compile; \ + done + for python in $(PYVERS); do \ + $$python-dbg setup.py install \ + --root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile; \ + done + find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f + find debian/python-*-dbg -depth -empty -exec rmdir {} \; install-indep: build # Zope package dh_installzope -p zope-psycopgda2 ZPsycopgDA + # Zope3 package + dh_installzope -p python-psycopg2da psycopg2da # Build architecture-independent files here. binary-indep: build install-indep dh_testdir dh_testroot - dh_installdocs -i AUTHORS debian/README.zpsycopgda2 + dh_installdocs -i AUTHORS dh_installchangelogs -i dh_link -i dh_compress -i dh_fixperms -i + dh_pycentral -p python-psycopg2da dh_installdeb -i dh_gencontrol -i dh_md5sums -i @@ -62,7 +75,9 @@ binary-arch: build install-arch dh_installdocs -a README AUTHORS doc tests dh_installchangelogs -a ChangeLog dh_link -a - dh_strip -a + dh_strip -ppython-psycopg2 --dbg-package=python-psycopg2-dbg + rm -rf debian/python-psycopg2-dbg/usr/share/doc/python-psycopg2-dbg + ln -s python-psycopg2 debian/python-psycopg2-dbg/usr/share/doc/python-psycopg2-dbg dh_compress -a dh_fixperms -a dh_makeshlibs -a diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..7441da9e --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.initd.org/pub/software/psycopg/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate diff --git a/debian/zope-psycopgda2.dzproduct b/debian/zope-psycopgda2.dzproduct index e0064efd..e5634e4c 100644 --- a/debian/zope-psycopgda2.dzproduct +++ b/debian/zope-psycopgda2.dzproduct @@ -1,4 +1,4 @@ Name: ZPsycopgDA Directory: ZPsycopgDA:2 Package: zope-psycopgda2 -ZopeVersions: 2.9 2.8 2.7 +ZopeVersions: >= 2.9