[Python-modules-commits] r12430 - in packages/sqlalchemy/trunk/debian (changelog control rules)

piotr at users.alioth.debian.org piotr at users.alioth.debian.org
Sun Mar 28 19:35:27 UTC 2010


    Date: Sunday, March 28, 2010 @ 19:35:08
  Author: piotr
Revision: 12430

* New upstream release
* Move Python extensions to new python-sqlalchemy-ext binary package

Modified:
  packages/sqlalchemy/trunk/debian/changelog
  packages/sqlalchemy/trunk/debian/control
  packages/sqlalchemy/trunk/debian/rules

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================
--- packages/sqlalchemy/trunk/debian/changelog	2010-03-27 22:57:57 UTC (rev 12429)
+++ packages/sqlalchemy/trunk/debian/changelog	2010-03-28 19:35:08 UTC (rev 12430)
@@ -1,3 +1,10 @@
+sqlalchemy (0.6~beta3-1) experimental; urgency=low
+
+  * New upstream release
+  * Move Python extensions to new python-sqlalchemy-ext binary package
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 28 Mar 2010 19:55:23 +0200
+
 sqlalchemy (0.6~beta2-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/sqlalchemy/trunk/debian/control
===================================================================
--- packages/sqlalchemy/trunk/debian/control	2010-03-27 22:57:57 UTC (rev 12429)
+++ packages/sqlalchemy/trunk/debian/control	2010-03-28 19:35:08 UTC (rev 12430)
@@ -4,7 +4,7 @@
 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-all-dev (>= 2.3.5-11),
- python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~),
+ python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~)
 Build-Depends-Indep: python-sphinx (>= 0.6), python-mako
 Standards-Version: 3.8.4
 Homepage: http://www.sqlalchemy.org/
@@ -13,13 +13,12 @@
 XS-Python-Version: >= 2.4
 
 Package: python-sqlalchemy
-Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Recommends: python-sqlalchemy-ext
 Suggests: python-sqlalchemy-doc, python-psycopg2, python-mysqldb (>= 1.2.1-p2-2),
  python (>= 2.5) | python-pysqlite2 (>= 2.3.0-1) | python-pysqlite1.1 (>= 1.1.7-2) | python-sqlite (>= 1.0.1-5),
  python-kinterbasdb (>= 3.1.2-0.3), python-pymssql
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: SQL toolkit and Object Relational Mapper for Python
  SQLAlchemy is an SQL database abstraction library for Python.
  Its strengths are:
@@ -46,6 +45,28 @@
     an architecture that supports custom datatypes, custom SQL extensions, and
     ORM plugins which can augment or extend mapping functionality.
 
+Package: python-sqlalchemy-ext
+Architecture: any
+Depends: python-sqlalchemy (= ${source:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: SQL toolkit and Object Relational Mapper for Python - C extension
+ SQLAlchemy is an SQL database abstraction library for Python.
+ .
+ This package contains C coded extension accelerator for SQLAlchemy.
+
+#Package: python-sqlalchemy-dbg
+#Architecture: any
+#Section: debug
+#Priority: extra
+#Depends: python-sqlalchemy-ext (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
+#Provides: ${python:Provides}
+#XB-Python-Version: ${python:Versions}
+#Description: SQL toolkit and Object Relational Mapper for Python - debug
+# SQLAlchemy is an SQL database abstraction library for Python.
+# .
+# This package contains the extension built for the Python debug interpreter.
+
 Package: python-sqlalchemy-doc
 Section: doc
 Architecture: all
@@ -59,4 +80,3 @@
  This package contains the documentation for SQLAlchemy in HTML format.
  It's usable as a comprehensive reference, a user guide and a tutorial
  all-in-one.
-

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2010-03-27 22:57:57 UTC (rev 12429)
+++ packages/sqlalchemy/trunk/debian/rules	2010-03-28 19:35:08 UTC (rev 12430)
@@ -5,6 +5,8 @@
 m_name=SQLAlchemy
 
 PYVERS=$(shell pyversions -vr)
+PKGDIR=$(CURDIR)/debian/${p_name}
+#-include /usr/share/python/python.mk # for py_setup_install_args (ignore if not available yet)
 
 clean:
 	dh_testdir
@@ -12,8 +14,8 @@
 	rm -rf $(CURDIR)/lib/${m_name}.egg-info $(CURDIR)/build/
 	find . -name '*\.py[co]' -delete
 	dh_clean build-docs build-stamp install-docs \
-		$(PYVERS:%=install-python%) \
-		$(PYVERS:%=build-python%)
+		$(PYVERS:%=install-python%) $(PYVERS:%=build-python%) \
+		$(PYVERS:%=install-debug-python%) $(PYVERS:%=build-debug-python%)
 
 build: build-stamp
 
@@ -24,12 +26,16 @@
 	python$* ./setup.py --with-cextensions build
 	touch $@
 
+build-debug-python%:
+	python$*-dbg setup.py --with-cextensions build
+	touch $@
+
 build-docs:
 	dh_testdir
 	dh_installdirs -i
 	cd doc/build && sphinx-build -N -q -E -b html . \
-	 $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/html/
-	rm -rf $(CURDIR)/debian/${p_name}-doc/usr/share/doc/${p_name}-doc/html/.doctrees
+	 $(PKGDIR)-doc/usr/share/doc/${p_name}-doc/html/
+	rm -rf $(PKGDIR)-doc/usr/share/doc/${p_name}-doc/html/.doctrees
 	touch $@
 
 install-docs: build-docs
@@ -48,22 +54,27 @@
 	touch $@
 
 install: build $(PYVERS:%=install-python%)
-install-python%:
+install-python%: build
 	#python$* ./setup.py install --skip-build \
-	#	--root $(CURDIR)/debian/${p_name}
+	#	--root $(PKGDIR) $(py_setup_install_args)
 	#touch $@
+	mkdir -p $(PKGDIR)-ext/usr/lib/python$*/site-packages/sqlalchemy
+	mv $(CURDIR)/build/lib.*-$*/sqlalchemy/*.so \
+	 $(PKGDIR)-ext/usr/lib/python$*/site-packages/sqlalchemy/
 	# hack to workaround distutils/setuptools bug:
-	mkdir -p $(CURDIR)/debian/${p_name}/usr/lib/python$*/site-packages/
-	cp -R $(CURDIR)/build/lib.*-$*/* $(CURDIR)/debian/${p_name}/usr/lib/python$*/site-packages/
+	mkdir -p $(PKGDIR)/usr/lib/python$*/site-packages/
+	cp -R $(CURDIR)/build/lib.*-$*/* $(PKGDIR)/usr/lib/python$*/site-packages/
 
-binary-indep: build install-docs
+binary-indep: build install install-docs
 	dh_testdir -i
 	dh_testroot -i
-	dh_installchangelogs -i CHANGES
+	dh_installchangelogs -i -p python-sqlalchemy-doc CHANGES
+	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installexamples -i
-	rm -rf debian/${p_name}-doc/usr/share/doc/${p_name}-doc/doc/build \
-	       debian/${p_name}-doc/usr/share/doc/${p_name}-doc/examples/README
+	rm -rf $(PKGDIR)-doc/usr/share/doc/${p_name}-doc/doc/build \
+	       $(PKGDIR)-doc/usr/share/doc/${p_name}-doc/examples/README
+	dh_pysupport -i
 	dh_compress -i -X.py -X.js -X.html
 	dh_fixperms -i
 	dh_installdeb -i




More information about the Python-modules-commits mailing list