[Python-modules-commits] r13461 - in packages/sqlalchemy/trunk/debian (7 files)

[piotr at users.alioth.debian.org]

    Date: Thursday, June 17, 2010 @ 22:53:35
  Author: piotr
Revision: 13461

* Convert to dh_python2
* Add pydist file in python-sqlalchemy and python3-sqlalchemy
  (packages that build depend on these packages and use dh_python* will get
  correct dependencies via ${python:Depends})

Added:
  packages/sqlalchemy/trunk/debian/python-sqlalchemy.pydist
  packages/sqlalchemy/trunk/debian/python3-sqlalchemy.pydist
Modified:
  packages/sqlalchemy/trunk/debian/changelog
  packages/sqlalchemy/trunk/debian/control
  packages/sqlalchemy/trunk/debian/rules
Deleted:
  packages/sqlalchemy/trunk/debian/python3-sqlalchemy.postinst
  packages/sqlalchemy/trunk/debian/python3-sqlalchemy.prerm

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================
--- packages/sqlalchemy/trunk/debian/changelog	2010-06-17 18:41:16 UTC (rev 13460)
+++ packages/sqlalchemy/trunk/debian/changelog	2010-06-17 22:53:35 UTC (rev 13461)
@@ -1,3 +1,12 @@
+sqlalchemy (0.6.1-2) UNRELEASED; urgency=low
+
+  * Convert to dh_python2
+  * Add pydist file in python-sqlalchemy and python3-sqlalchemy
+    (packages that build depend on these packages and use dh_python* will get
+    correct dependencies via ${python:Depends})
+
+ -- Piotr Ożarowski <piotr at debian.org>  Thu, 17 Jun 2010 23:02:58 +0200
+
 sqlalchemy (0.6.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/sqlalchemy/trunk/debian/control
===================================================================
--- packages/sqlalchemy/trunk/debian/control	2010-06-17 18:41:16 UTC (rev 13460)
+++ packages/sqlalchemy/trunk/debian/control	2010-06-17 22:53:35 UTC (rev 13461)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Piotr Ożarowski <piotr at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-support (>= 0.6.4),
- python-all-dev (>= 2.3.5-11), python3-all-dev,
+Build-Depends: debhelper (>= 5.0.38),
+ python-all-dev (>= 2.6.5-2~), python3-all-dev (>= 3.1.2-1~),
  python-setuptools (>= 0.6b3-1~), python3-setuptools
 Build-Depends-Indep: python-sphinx (>= 0.6), python-mako
 Standards-Version: 3.8.4
@@ -85,7 +85,6 @@
 Package: python3-sqlalchemy
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python3-sqlalchemy-ext
 Suggests: python-sqlalchemy-doc
 Description: SQL toolkit and Object Relational Mapper for Python 3
  SQLAlchemy is an SQL database abstraction library for Python.

Added: packages/sqlalchemy/trunk/debian/python-sqlalchemy.pydist
===================================================================
--- packages/sqlalchemy/trunk/debian/python-sqlalchemy.pydist	                        (rev 0)
+++ packages/sqlalchemy/trunk/debian/python-sqlalchemy.pydist	2010-06-17 22:53:35 UTC (rev 13461)
@@ -0,0 +1 @@
+SQLAlchemy python-sqlalchemy (>= 0.6~), python-sqlalchemy (<< 0.7)

Deleted: packages/sqlalchemy/trunk/debian/python3-sqlalchemy.postinst
===================================================================
--- packages/sqlalchemy/trunk/debian/python3-sqlalchemy.postinst	2010-06-17 18:41:16 UTC (rev 13460)
+++ packages/sqlalchemy/trunk/debian/python3-sqlalchemy.postinst	2010-06-17 22:53:35 UTC (rev 13461)
@@ -1,8 +0,0 @@
-#! /bin/sh -e
-
-#if which pycompile >/dev/null 2>&1; then
-#	pycompile -p python3-sqlalchemy
-#fi
-dpkg -L python3-sqlalchemy | grep 3.1/dist-packages/sqlalchemy.*\.py$ | python3.1 -m compileall -qi -
-
-#DEBHELPER#

Deleted: packages/sqlalchemy/trunk/debian/python3-sqlalchemy.prerm
===================================================================
--- packages/sqlalchemy/trunk/debian/python3-sqlalchemy.prerm	2010-06-17 18:41:16 UTC (rev 13460)
+++ packages/sqlalchemy/trunk/debian/python3-sqlalchemy.prerm	2010-06-17 22:53:35 UTC (rev 13461)
@@ -1,8 +0,0 @@
-#! /bin/sh -e
-
-#if which pyclean >/dev/null 2>&1; then
-#	pyclean -p python3-sqlalchemy
-#fi
-find /usr/lib/python3.1/dist-packages/sqlalchemy/ -name '*\.pyc' -delete >/dev/null
-
-#DEBHELPER#

Added: packages/sqlalchemy/trunk/debian/python3-sqlalchemy.pydist
===================================================================
--- packages/sqlalchemy/trunk/debian/python3-sqlalchemy.pydist	                        (rev 0)
+++ packages/sqlalchemy/trunk/debian/python3-sqlalchemy.pydist	2010-06-17 22:53:35 UTC (rev 13461)
@@ -0,0 +1 @@
+SQLAlchemy python3-sqlalchemy (>= 0.6~), python3-sqlalchemy (<< 0.7)

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2010-06-17 18:41:16 UTC (rev 13460)
+++ packages/sqlalchemy/trunk/debian/rules	2010-06-17 22:53:35 UTC (rev 13461)
@@ -4,6 +4,7 @@
 p_name=python-sqlalchemy
 
 PYVERS=$(shell pyversions -vr)
+PY3VERS=$(shell py3versions -vr '>= 3.0')
 pkgdir = $(CURDIR)/debian/python$(if $(patsubst 3.%,,$(1)),,3)-sqlalchemy
 
 -include /usr/share/python/python.mk
@@ -56,7 +57,7 @@
 		/usr/share/doc/${p_name}/rst
 	touch $@
 
-install: build $(PYVERS:%=install-python%) install-python3.1
+install: build $(PYVERS:%=install-python%) $(PY3VERS:%=install-python%)
 install-python%: build
 	python$* ./setup.py install --skip-build \
 		--root $(call pkgdir,$*) $(py_setup_install_args)
@@ -92,7 +93,8 @@
 	       $(call pkgdir,2.X)-doc/usr/share/doc/${p_name}-doc/examples/README
 	rm -f $(call pkgdir,3.X)/usr/share/doc/python3-sqlalchemy/NEWS.Debian
 	find $(CURDIR)/debian/ -name '*.py[co]' -delete
-	dh_pysupport -i
+	dh_python2 -i
+	dh_python3 -i
 	dh_compress -i -X.py -X.js -X.html
 	dh_fixperms -i
 	dh_installdeb -i
@@ -105,7 +107,8 @@
 	dh_testroot
 	dh_installchangelogs -a
 	dh_installdocs -a
-	dh_pysupport -a
+	dh_python2 -a
+	dh_python3 -a
 	dh_makeshlibs -a
 	dh_strip -a
 	dh_compress -a -X.py