[Python-modules-commits] r12317 - in packages/sqlalchemy/trunk/debian (4 files)

Sun Mar 21 15:50:11 UTC 2010

Date: Sunday, March 21, 2010 @ 15:50:07
  Author: piotr
Revision: 12317

* New upstream release
  - now provides Python extension
* Architecture changed to any, python-all-dev added to Build-Depends
* No longer Conflicts/Replaces python2.4-sqlalchemy package

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

Modified: packages/sqlalchemy/trunk/debian/changelog
===================================================================

--- packages/sqlalchemy/trunk/debian/changelog	2010-03-21 12:54:12 UTC (rev 12316)
+++ packages/sqlalchemy/trunk/debian/changelog	2010-03-21 15:50:07 UTC (rev 12317)
@@ -1,3 +1,12 @@
+sqlalchemy (0.6~beta2-1) experimental; urgency=low
+
+  * New upstream release
+    - now provides Python extension
+  * Architecture changed to any, python-all-dev added to Build-Depends
+  * No longer Conflicts/Replaces python2.4-sqlalchemy package
+
+ -- Piotr OÅ¼arowski <piotr at debian.org>  Sat, 20 Mar 2010 21:42:42 +0100
+
 sqlalchemy (0.6~beta1-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/sqlalchemy/trunk/debian/control
===================================================================
--- packages/sqlalchemy/trunk/debian/control	2010-03-21 12:54:12 UTC (rev 12316)
+++ packages/sqlalchemy/trunk/debian/control	2010-03-21 15:50:07 UTC (rev 12317)
@@ -3,9 +3,9 @@
 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)
-Build-Depends-Indep: python-all (>= 2.3.5-11), python-support (>= 0.6.4),
- python-setuptools (>= 0.6b3-1~), python-sphinx (>= 0.6), python-mako
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11),
+ 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/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sqlalchemy/trunk
@@ -13,13 +13,13 @@
 XS-Python-Version: >= 2.4
 
 Package: python-sqlalchemy
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Conflicts: python2.4-sqlalchemy (<< 0.2.3-0.1)
-Replaces: python2.4-sqlalchemy (<< 0.2.3-0.1)
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 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:
@@ -49,7 +49,8 @@
 Package: python-sqlalchemy-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Priority: extra
+Depends: ${misc:Depends}, libjs-jquery
 Recommends: python-sqlalchemy
 Conflicts: python-sqlalchemy (<= 0.3.0-1)
 Description: documentation for the SQLAlchemy Python library

Modified: packages/sqlalchemy/trunk/debian/copyright
===================================================================
--- packages/sqlalchemy/trunk/debian/copyright	2010-03-21 12:54:12 UTC (rev 12316)
+++ packages/sqlalchemy/trunk/debian/copyright	2010-03-21 15:50:07 UTC (rev 12317)
@@ -64,6 +64,15 @@
 
 -----------------------------------------------------------
 
+lib/sqlalchemy/cextension/processors.c and resultproxy.c files:
+
+ Copyright (C) 2010 Gaetan de Menten gdementen at gmail.com
+
+ This module is part of SQLAlchemy and is released under
+ the MIT License: http://www.opensource.org/licenses/mit-license.php
+
+-----------------------------------------------------------
+
 doc/_static/jquery.js file:
  
  Copyright (c) 2008 John Resig (jquery.com)

Modified: packages/sqlalchemy/trunk/debian/rules
===================================================================
--- packages/sqlalchemy/trunk/debian/rules	2010-03-21 12:54:12 UTC (rev 12316)
+++ packages/sqlalchemy/trunk/debian/rules	2010-03-21 15:50:07 UTC (rev 12317)
@@ -5,21 +5,28 @@
 m_name=SQLAlchemy
 
 PYVERS=$(shell pyversions -vr)
--include /usr/share/python/python.mk # for py_setup_install_args (ignore if not available yet)
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -rf $(CURDIR)/lib/${m_name}.egg-info $(CURDIR)/build/
 	find . -name '*\.py[co]' -delete
-	dh_clean build-* $(PYVERS:%=install-python%) install-docs
+	dh_clean build-docs build-stamp install-docs \
+		$(PYVERS:%=install-python%) \
+		$(PYVERS:%=build-python%)
 
-#build: build-docs
-build:
+build: build-stamp
 
+build-stamp: $(PYVERS:%=build-python%)
+	touch $@
+
+build-python%:
+	python$* ./setup.py --with-cextensions build
+	touch $@
+
 build-docs:
 	dh_testdir
-	dh_installdirs
+	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
@@ -27,7 +34,7 @@
 
 install-docs: build-docs
 	dh_testdir
-	dh_installdirs
+	dh_installdirs -i
 	
 	dh_link -p${p_name}-doc /usr/share/doc/${p_name}-doc/html/_sources \
 	       	/usr/share/doc/${p_name}-doc/rst
@@ -40,15 +47,13 @@
 		/usr/share/doc/${p_name}/rst
 	touch $@
 
-install: build install-docs $(PYVERS:%=install-python%)
+install: build $(PYVERS:%=install-python%)
 install-python%:
-	python$* setup.py install \
-		--single-version-externally-managed \
-		--root $(CURDIR)/debian/${p_name} \
-		$(py_setup_install_args)
+	python$* ./setup.py install --skip-build \
+		--root $(CURDIR)/debian/${p_name}
 	touch $@
 
-binary-indep: build install
+binary-indep: build install-docs
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i CHANGES
@@ -56,7 +61,6 @@
 	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
-	dh_pysupport -i
 	dh_compress -i -X.py -X.js -X.html
 	dh_fixperms -i
 	dh_installdeb -i
@@ -64,7 +68,21 @@
 	dh_md5sums -i
 	dh_builddeb -i -- -Z bzip2
 
-binary-arch:
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_pysupport -a
+	dh_makeshlibs -a
+	dh_strip -a
+	dh_compress -a -X.py
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a -- -Z bzip2
 
 binary: binary-indep binary-arch
 


