[Python-modules-commits] r20199 - in packages/psycopg2/trunk/debian (4 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Mon Jan 30 21:52:53 UTC 2012
Date: Monday, January 30, 2012 @ 21:52:50
Author: kitterman
Revision: 20199
* 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)
Added:
packages/psycopg2/trunk/debian/python-psycopg2-docs.install
Modified:
packages/psycopg2/trunk/debian/changelog
packages/psycopg2/trunk/debian/control
packages/psycopg2/trunk/debian/rules
Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog 2012-01-30 21:46:26 UTC (rev 20198)
+++ packages/psycopg2/trunk/debian/changelog 2012-01-30 21:52:50 UTC (rev 20199)
@@ -1,3 +1,26 @@
+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 <scott at kitterman.com> Mon, 30 Jan 2012 09:12:12 -0500
+
psycopg2 (2.4.4-1) unstable; urgency=low
* Team upload
Modified: packages/psycopg2/trunk/debian/control
===================================================================
--- packages/psycopg2/trunk/debian/control 2012-01-30 21:46:26 UTC (rev 20198)
+++ packages/psycopg2/trunk/debian/control 2012-01-30 21:52:50 UTC (rev 20199)
@@ -1,7 +1,8 @@
Source: psycopg2
Section: python
Priority: optional
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python (>= 2.3.5-7), python-egenix-mx-base-dev, autoconf, libpq-dev
+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~)
Maintainer: Fabio Tranchitella <kobold at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Standards-Version: 3.9.2
@@ -11,7 +12,9 @@
Package: python-psycopg2
Architecture: any
-Depends: python-egenix-mxdatetime, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: python-egenix-mxdatetime
+Suggests: python-psycopg2-docs
Provides: ${python:Provides}
Description: Python module for PostgreSQL
psycopg is a PostgreSQL database adapter for the Python programming language
@@ -43,3 +46,63 @@
aim of being very small and fast, and stable as a rock.
.
This package contains the extensions built for the Python debug interpreter.
+
+Package: python3-psycopg2
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: python-psycopg2-docs
+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 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: 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-docs
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Suggests: python-psycopg2 | python3-psycopg2
+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 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.
+ .
+ This package contains the psycopg2 documentation
Added: packages/psycopg2/trunk/debian/python-psycopg2-docs.install
===================================================================
--- packages/psycopg2/trunk/debian/python-psycopg2-docs.install (rev 0)
+++ packages/psycopg2/trunk/debian/python-psycopg2-docs.install 2012-01-30 21:52:50 UTC (rev 20199)
@@ -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/
Modified: packages/psycopg2/trunk/debian/rules
===================================================================
--- packages/psycopg2/trunk/debian/rules 2012-01-30 21:46:26 UTC (rev 20198)
+++ packages/psycopg2/trunk/debian/rules 2012-01-30 21:52:50 UTC (rev 20199)
@@ -3,6 +3,7 @@
# 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
@@ -11,6 +12,8 @@
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:
@@ -24,9 +27,15 @@
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
@@ -36,10 +45,19 @@
-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_clean
build-arch: build
-build-indep: 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
@@ -51,21 +69,37 @@
$$python setup.py install \
--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 $(py_setup_install_args); \
done
+ for python3 in $(PY3VERS); do \
+ $$python3 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
+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
@@ -78,16 +112,20 @@
binary-arch: build install-arch
dh_testdir
dh_testroot
- dh_installdocs -a README AUTHORS NEWS doc tests -Xdoc/COPYING*
+ 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_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_python2 -a
+ dh_python3 -a
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the Python-modules-commits
mailing list