--- psycopg2-2.4.5.orig/debian/changelog +++ psycopg2-2.4.5/debian/changelog @@ -1,3 +1,194 @@ +psycopg2 (2.4.5-1) unstable; urgency=low + + * Team upload + * New upstream release + - Update debian/copyright + + -- Scott Kitterman Mon, 02 Apr 2012 10:23:45 -0400 + +psycopg2 (2.4.4-4) unstable; urgency=low + + * Team upload + * Rename python-pyscopg2-docs to the more usual python-pyscopg2-doc + - Not creating a transitional package due to the package only existing + for a short period and never in a stable release + * Fix typos in the last debian/changelog entry + * Fix misspellings in package descriptions in debian/control + * Bump standards version to 3.9.3 without further change + + -- Scott Kitterman Sun, 18 Mar 2012 10:31:22 -0400 + +psycopg2 (2.4.4-3) unstable; urgency=low + + * Team upload + * Fix debian/rules so python3-psycopg2-dbg so files are properly marked as + debug versions (Closes: #658219) + * Use local Python objects.inv instead of downloading from python.org + - Add python-doc and python333-doc to Build-Depends-Indep + - Add Quilt use to debian/rules and README.source + - Add debian/patches/local_inventory + + -- Scott Kitterman Thu, 02 Feb 2012 09:04:44 -0500 + +psycopg2 (2.4.4-2) unstable; urgency=low + + * Team upload + * Move python-egenix-mxdatetime from Depends to Recommends since support for + it is now detected at runtime (Closes: #523414) + * Add separate python-pyscopg2-docs package suggested by both python-psycopg2 + and python3-psycopg2 (only ship actual documentation in the binary and + not the source to build the documentation) + - Adjust debian/rules for an arch-indep package and python-sphinx + - Rebuild html and text docs from source instead of shipping provided + files + - Add python-sphinx (>= 1.0.7+dfsg-1~) to build-depends and use + sphinxdoc:Depends + - Add debian/python-psycopg2-docs.install + * Build packages for Python3 (Closes: #645906) + - Add python3-psycopg2/-dbg to debian/control + - Add python3-all-dev and python3-all-dbg to build-depends + - Adjust debian/rules + * Drop build-depends on autoconf (Closes: #589131) + * Drop redundant build-depends on python (python-all-dev covers it) + + -- Scott Kitterman Mon, 30 Jan 2012 09:12:12 -0500 + +psycopg2 (2.4.4-1) unstable; urgency=low + + * Team upload + * New upstream release (Closes: #607714) + - Update debian/copyright + * Add build-arch and build-indep targets to debian/rules + * Adjust debian/rules so docmentation is not compressed (Closes: #589142), + objects.inv is not compressed (Closes: #608745), and the upstream NEWS + file is included in the package (Closes: #651835) + * Exclude redundant COPYING files in the doc directory from being installed + * Remove redundant Section: field from the python-psycopg2 entry in debian/ + control + * Use dh_prep instead of deprecated dh_clean -k + * Remove obsolete debian/pycompat file + + -- Scott Kitterman Wed, 18 Jan 2012 12:59:48 -0500 + +psycopg2 (2.4.2-1) unstable; urgency=low + + [ Jakub Wilk ] + * Add Debian Python Modules Team to Uploaders. + + [ Fabio Tranchitella ] + * New upstream release. + * debian/watch: updated, use pypi. + * debian/control, debian/rules: switched to dh_python2. + * debian/control: bumped Standard-Version to 3.9.2, no changes required. + + -- Fabio Tranchitella Sun, 19 Jun 2011 18:25:53 +0000 + +psycopg2 (2.2.1-1) unstable; urgency=low + + * New upstream release. (Closes: #582823) + * debian/control: + - bumped Standards-Version to 3.9.0, no changes required. + - removed the zope-psycopg2da binary package. (Closes: #583293) + + -- Fabio Tranchitella Fri, 02 Jul 2010 15:04:19 +0200 + +psycopg2 (2.0.14-1) unstable; urgency=low + + * New upstream release. + * debian/control: bumped Standards-Version to 3.8.5, no changes required. + + -- Fabio Tranchitella Sat, 10 Apr 2010 10:32:45 +0200 + +psycopg2 (2.0.13-2) unstable; urgency=low + + [ Piotr Ożarowski ] + * Add XB-Python-Version to python-psycopg2-dbg and zope-psycopgda2 + + [ Fabio Tranchitella ] + * Do not build anymore python-psycopg2da. (Closes: #558204) + + -- Fabio Tranchitella Wed, 06 Jan 2010 15:36:39 +0100 + +psycopg2 (2.0.13-1) unstable; urgency=low + + * New upstream release. + + -- Fabio Tranchitella Mon, 12 Oct 2009 06:50:00 +0000 + +psycopg2 (2.0.12-1) unstable; urgency=low + + [ Fabio Tranchitella ] + * New upstream release. (Closes: #536341, #528529) + * debian/control: bumped Standard-Versions to 3.8.3, no changes required. + + [ Bernd Zeimetz ] + * Make the build process compatible to Python2.6. + + -- Fabio Tranchitella Thu, 27 Aug 2009 18:05:48 +0200 + +psycopg2 (2.0.9-5) unstable; urgency=low + + * debian/control: added dependency on python-egenix-mxdatetime. + (Closes: #521338) + + -- Fabio Tranchitella Fri, 27 Mar 2009 16:05:49 +0100 + +psycopg2 (2.0.9-4) unstable; urgency=low + + * debian/rules: add again support for mx datetime. (Closes: #518948) + * debian/control: new archive sections. + + -- Fabio Tranchitella Wed, 18 Mar 2009 07:03:53 +0100 + +psycopg2 (2.0.9-3) unstable; urgency=low + + * debian/control: do not build against python-egenix-mx-base-dev anymore. + (Closes: #518519) + + -- Fabio Tranchitella Fri, 06 Mar 2009 20:42:04 +0100 + +psycopg2 (2.0.9-2) unstable; urgency=low + + * psycopg/psycopg.h: removed the patch. (Closes: #517895) + + -- Fabio Tranchitella Fri, 06 Mar 2009 13:27:44 +0100 + +psycopg2 (2.0.9-1) unstable; urgency=low + + * New upstream release. (Closes: #516887) + + -- Fabio Tranchitella Fri, 27 Feb 2009 17:38:13 +0100 + +psycopg2 (2.0.8-1) unstable; urgency=low + + [ Fabio Tranchitella ] + [Carlos Galisteo] + * debian/control + - Added Homepage field. + + [ Sandro Tosi ] + * debian/control + - switch Vcs-Browser field to viewsvn + + [ Fabio Tranchitella ] + * New upstream release. (Closes: #499880) + * psycopg/psycopg.h: patched, fixed a typo. (Closes: #479571) + + -- Fabio Tranchitella Tue, 18 Nov 2008 21:05:04 +0100 + +psycopg2 (2.0.7-4) unstable; urgency=low + + * Rebuilt, this should fixes a dependency problem. (Closes: #485868) + + -- Fabio Tranchitella Thu, 12 Jun 2008 09:42:55 +0200 + +psycopg2 (2.0.7-3) unstable; urgency=low + + * ZPsycopgDA/DA.py: updated the patch, which was out of sync with the + upstream tarball. + + -- Fabio Tranchitella Tue, 13 May 2008 17:22:30 +0200 + psycopg2 (2.0.7-2) unstable; urgency=medium * ZPsycopgDA/DA.py: updated the patch. (Closes: #478860) --- psycopg2-2.4.5.orig/debian/rules +++ psycopg2-2.4.5/debian/rules @@ -3,10 +3,22 @@ # GNU copyright 1997 to 1999 by Joey Hess. PYVERS=$(shell pyversions -r debian/control) +PY3VERS=$(shell py3versions -r debian/control) +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) + py_sitename = site-packages + py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages + py_sitename_sh = $(py_sitename) + py_libdir_sh = $(py_libdir) + py_setup_install_args = +endif +DEFAULT_PYTHON = $(shell pyversions -d) +DEFAULT_BUILDIR = $(shell $(DEFAULT_PYTHON) -c 'from distutils.command.build import build; from distutils.core import Distribution; b = build(Distribution()); b.finalize_options(); print(b.build_platlib)') configure: configure-stamp configure-stamp: dh_testdir + dh_quilt_patch rm -f configure touch configure-stamp @@ -16,53 +28,83 @@ for python in $(PYVERS); do \ $$python setup.py build ; \ done + for python3 in $(PY3VERS); do \ + $$python3 setup.py build ; \ + done for python in $(PYVERS); do \ $$python-dbg setup.py build ; \ done + for python3 in $(PY3VERS); do \ + $$python3-dbg setup.py build ; \ + done touch build-stamp clean: configure dh_testdir dh_testroot rm -fr *-stamp build - for python in $(PYVERS); do \ + -for python in $(PYVERS); do \ $$python setup.py clean ; \ done + -for python3 in $(PY3VERS); do \ + $$python3 setup.py clean ; \ + done + rm -rf $(CURDIR)/doc/src/_build + dh_quilt_unpatch dh_clean -install-arch: build +build-arch: build +build-indep: + mv $(CURDIR)/doc/psycopg2.txt $(CURDIR)/doc/psycopg2.txt.old + mv $(CURDIR)/doc/html $(CURDIR)/doc/html.old + export PYTHONPATH=$(CURDIR)/$(DEFAULT_BUILDIR)/; \ + cd $(CURDIR)/doc; \ + make -f Makefile + +install-arch: build-arch dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # psycopg2 for python in $(PYVERS); do \ $$python setup.py install \ - --root=$(CURDIR)/debian/python-psycopg2 --no-compile; \ + --root=$(CURDIR)/debian/python-psycopg2 --no-compile $(py_setup_install_args); \ + done + for python3 in $(PY3VERS); do \ + $$python3 setup.py install \ + --root=$(CURDIR)/debian/python3-psycopg2 --no-compile --install-layout=deb; \ done for python in $(PYVERS); do \ $$python-dbg setup.py install \ - --root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile; \ + --root=$(CURDIR)/debian/python-psycopg2-dbg --no-compile $(py_setup_install_args); \ + done + for python3 in $(PY3VERS); do \ + $$python3-dbg setup.py install \ + --root=$(CURDIR)/debian/python3-psycopg2-dbg --no-compile --install-layout=deb; \ 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 +install-indep: build-indep + dh_testdir + dh_testroot + dh_prep + dh_install # Build architecture-independent files here. binary-indep: build install-indep dh_testdir dh_testroot - dh_installdocs -i AUTHORS - dh_installchangelogs -i + dh_installdocs -i README AUTHORS NEWS + dh_installchangelogs -i ChangeLog + dh_sphinxdoc -i + rm -rf $(CURDIR)/doc/html + mv $(CURDIR)/doc/psycopg2.txt.old $(CURDIR)/doc/psycopg2.txt + mv $(CURDIR)/doc/html.old $(CURDIR)/doc/html dh_link -i dh_compress -i dh_fixperms -i - dh_pycentral -p python-psycopg2da dh_installdeb -i dh_gencontrol -i dh_md5sums -i @@ -72,17 +114,20 @@ binary-arch: build install-arch dh_testdir dh_testroot - dh_installdocs -a README AUTHORS doc tests + dh_installdocs -a README AUTHORS NEWS dh_installchangelogs -a ChangeLog dh_link -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_strip -ppython3-psycopg2 --dbg-package=python3-psycopg2-dbg + rm -rf debian/python3-psycopg2-dbg/usr/share/doc/python3-psycopg2-dbg + ln -s python3-psycopg2 debian/python3-psycopg2-dbg/usr/share/doc/python3-psycopg2-dbg + dh_compress -a -X.js -X_sources -Xobjects.inv dh_fixperms -a dh_makeshlibs -a - dh_pycentral -a - dh_python -a + dh_python2 -a + dh_python3 -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a --- psycopg2-2.4.5.orig/debian/watch +++ psycopg2-2.4.5/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.initd.org/pub/software/psycopg/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate +http://pypi.python.org/packages/source/p/psycopg2/psycopg2-([0-9][0-9\.\-]*).tar.gz debian uupdate --- psycopg2-2.4.5.orig/debian/copyright +++ psycopg2-2.4.5/debian/copyright @@ -11,8 +11,8 @@ Copyright: - Copyright (C) 2001-2006 Federico Di Gregorio - Copyright (C) 2001 Michele Comitini + Copyright (C) 2001-2011 Federico Di Gregorio + Copyright (C) 2010-2011 Daniele Varrazzo For psycopg2da: Copyright (C) 2006 Fabio Tranchitella @@ -21,83 +21,148 @@ Copyright (C) 2001-2005 Federico Di Gregorio Copyright (C) 2002 Tom Jenkins - For the file tests/dbapi20.py: - Copyright (C) 2003 Ian Bicking + For the file psycopg/xid_type.c: + Copyright (C) 2008 Canonical Ltd. - For the file scripts/ext2html.py: - Copyright (C) 2003 Daniele Varrazzo + For the files psycopg/xid.h, tests/test_connection.py, and + tests/test_dates.py: + Copyright (C) 2008-2011 James Henstridge + For the files tests/test_cancel.py and tests/test_async.py + Copyright (C) 2010-2011 Jan Urbański + + For the file lib/errorcodes.py: + Copyright (C) 2006-2010 Johan Dahlin 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - On Debian GNU/Linux systems, the complete text of the GNU General - Public License can be found in '/usr/share/common-licenses/GPL'. - - As a special exception, specific permission is granted for the GPLed - code in this distribition to be linked to OpenSSL and PostgreSQL libpq - without invoking GPL clause 2(b). - - Note that the GPL was chosen to avoid proprietary adapters based on - psycopg code. Using psycopg in a proprietary product (even bundling - psycopg with the proprietary product) is fine as long as: +psycopg2 is free software: you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as published +by the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +psycopg2 is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public +License for more details. + +In addition, as a special exception, the copyright holders give +permission to link this program with the OpenSSL library (or with +modified versions of OpenSSL that use the same license as OpenSSL), +and distribute linked combinations including the two. + +You must obey the GNU Lesser General Public License in all respects for +all of the code used other than OpenSSL. If you modify file(s) with this +exception, you may extend this exception to your version of the file(s), +but you are not obligated to do so. If you do not wish to do so, delete +this exception statement from your version. If you delete this exception +statement from all source files in the program, then also delete it here. + +You should have received a copy of the GNU Lesser General Public License +along with psycopg2 (see the doc/ directory.) +If not, see . + +On Debian systems see /usr/share/common-licenses/LGPL-3 for details + +Alternative licenses +==================== + +If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e., +every file inside the ZPsycopgDA directory) user the ZPL license as +published on the Zope web site, http://www.zope.org/Resources/ZPL. + +Also, the following BSD-like license applies (at your option) to the +files following the pattern psycopg/adapter*.{h,c} and +psycopg/microprotocol*.{h,c}: + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this + software in a product, an acknowledgment in the product documentation + would be appreciated but is not required. - 1. psycopg is called from Python only using only the provided API - (i.e., no linking with C code and no C modules based on it); and + 2. Altered source versions must be plainly marked as such, and must not + be misrepresented as being the original software. - 2. all the other points of the GPL are respected (you offer a copy - of psycopg's source code, and so on.) + 3. This notice may not be removed or altered from any source distribution. -License for the files tests/dbapi20.py and scripts/ext2html.py: +Alternative licenses for psycopg2da: - These modules have been placed in the public domain. + 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. + See above for full license text. -Alternative licenses for ZPsycopgDA: - If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e., - every file inside the ZPsycopgDA directory) user the ZPL license as - published on the Zope web site, http://www.zope.org/Resources/ZPL. +License for the files tests/dbapi20.py and scripts/ext2html.py: + These modules have been placed in the public domain. -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. +doc/pep-0249.txt has been placed in the public domain -Alternative licenses for psycopg/adapter*.{j,c} and -psycopg/microprotocol*.{h.c}: +License and copyright for doc/html/_static/jquery.js: - Also, the following BSD-like license applies (at your option) to the - files following the pattern psycopg/adapter*.{h,c} and - psycopg/microprotocol*.{h,c}: - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product documentation - would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not - be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source distribution. - - psycopg is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + * Copyright 2010,2011 John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010,2011 The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + +Copyright (c) The Regents of the University of California. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +License and copyright for doc/html/_static/doctools.js, sidebar.js, +searchtools.js, basic.css, websupport.js, and default.css + * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :license: BSD, see LICENSE for details. + +See above for full BSD license text + +License and copyright for doc/html/_static/underscore.js +// Underscore.js 1.3.1 +// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. +// Underscore is freely distributable under the MIT license. +// Portions of Underscore are inspired or borrowed from Prototype, +// Oliver Steele's Functional, and John Resig's Micro-Templating. +// For all details and documentation: +// http://documentcloud.github.com/underscore +See above for full BSD license text Proprietary licenses: --- psycopg2-2.4.5.orig/debian/README.source +++ psycopg2-2.4.5/debian/README.source @@ -0,0 +1,58 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. --- psycopg2-2.4.5.orig/debian/control +++ psycopg2-2.4.5/debian/control @@ -1,20 +1,23 @@ Source: psycopg2 Section: python Priority: optional -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) +Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.6.6-3~), + python-all-dbg (>= 2.6.6-3~), python3-all-dev, python3-all-dbg, + python-egenix-mx-base-dev, libpq-dev, python-sphinx (>= 1.0.7+dfsg-1~), quilt (>= 0.46-7) +Build-Depends-Indep: python-doc, python3-doc Maintainer: Fabio Tranchitella -Standards-Version: 3.7.3 -XS-Python-Version: all +Uploaders: Debian Python Modules Team +Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/python-modules/packages/psycopg2/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/psycopg2/trunk/?op=log +Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/psycopg2/trunk/ +Homepage: http://initd.org/projects/psycopg Package: python-psycopg2 Architecture: any -Section: python -Depends: ${python:Depends}, ${shlibs:Depends}, python-egenix-mxdatetime +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Recommends: python-egenix-mxdatetime +Suggests: python-psycopg2-doc Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} Description: Python module for PostgreSQL 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 @@ -25,7 +28,7 @@ psycopg is different from the other database adapter because it was designed for heavily multi-threaded applications that create and destroy lots of cursors and make a conspicuous number of concurrent INSERTs or UPDATEs. - psycopg 2 also provides full asycronous operations for the really brave + psycopg 2 also provides full asynchronous operations for the really brave programmer. . The main advantages of psycopg2 are that it supports the full Python DBAPI-2.0 @@ -35,8 +38,8 @@ Package: python-psycopg2-dbg Priority: extra Architecture: any -Section: python -Depends: python-psycopg2 (= ${binary:Version}), python-dbg, python-egenix-mxdatetime-dbg, ${shlibs:Depends} +Section: debug +Depends: python-psycopg2 (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc: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 @@ -46,19 +49,64 @@ . 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-psycopg2 - The package contains the PostgreSQL database adapter for Zope 2.7, 2.8 and - 2.9 based on the psycopg2 Python module. +Package: python3-psycopg2 +Architecture: any +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends} +Suggests: python-psycopg2-doc +Provides: ${python3:Provides} +Description: Python 3 module for PostgreSQL + psycopg is a PostgreSQL database adapter for the Python3 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. + . + psycopg is different from the other database adapter because it was designed + for heavily multi-threaded applications that create and destroy lots of + cursors and make a conspicuous number of concurrent INSERTs or UPDATEs. + psycopg 2 also provides full asynchronous 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-psycopg2da +Package: python3-psycopg2-dbg +Priority: extra +Architecture: any +Section: debug +Depends: python3-psycopg2 (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends} +Description: Python 3 module for PostgreSQL (debug extension) + psycopg is a PostgreSQL database adapter for the Python3 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: python-psycopg2-doc 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. +Section: doc +Depends: ${sphinxdoc:Depends}, ${misc:Depends} +Suggests: python-psycopg2 | python3-psycopg2 +Replaces: python-psycopg2-docs +Breaks: python-psycopg2-docs +Description: Python module for PostgreSQL (documentation package) + 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. + . + psycopg is different from the other database adapter because it was designed + for heavily multi-threaded applications that create and destroy lots of + cursors and make a conspicuous number of concurrent INSERTs or UPDATEs. + psycopg 2 also provides full asynchronous 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. + . + This package contains the psycopg2 documentation --- psycopg2-2.4.5.orig/debian/python-psycopg2-doc.install +++ psycopg2-2.4.5/debian/python-psycopg2-doc.install @@ -0,0 +1,4 @@ +doc/html usr/share/doc/python-psycopg2-docs/ +doc/psycopg2.txt usr/share/doc/python-psycopg2-docs/ +doc/HACKING usr/share/doc/python-psycopg2-docs/ +doc/pep-0249.txt usr/share/doc/python-psycopg2-docs/ --- psycopg2-2.4.5.orig/debian/source/format +++ psycopg2-2.4.5/debian/source/format @@ -0,0 +1 @@ +1.0 --- psycopg2-2.4.5.orig/debian/patches/series +++ psycopg2-2.4.5/debian/patches/series @@ -0,0 +1 @@ +local_inventory --- psycopg2-2.4.5.orig/debian/patches/local_inventory +++ psycopg2-2.4.5/debian/patches/local_inventory @@ -0,0 +1,18 @@ +Use local copies of object.inv for building documentation. +Doesn't need forwarding. +Patch by Scott Kitterman Feb 2, 2012 +Index: psycopg2-2.4.4/doc/src/conf.py +=================================================================== +--- psycopg2-2.4.4.orig/doc/src/conf.py 2012-02-02 15:07:12.370516809 -0500 ++++ psycopg2-2.4.4/doc/src/conf.py 2012-02-02 15:08:07.238515187 -0500 +@@ -61,8 +61,8 @@ + release = version + + intersphinx_mapping = { +- 'py': ('http://docs.python.org/', None), +- 'py3': ('http://docs.python.org/3.2', None), ++ 'py': ('/usr/share/doc/python2.7-doc/html', None), ++ 'py3': ('/usr/share/doc/python3.2-doc/html', None), + } + + # The language for content autogenerated by Sphinx. Refer to documentation