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

[nomadium-guest at users.alioth.debian.org]

    Date: Thursday, February 3, 2011 @ 21:49:46
  Author: nomadium-guest
Revision: 15443

* New upstream release.
* Migrate to dh_python2 and drop Build-Depends on python-support.
* Fix typo in package descriptions.

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

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2011-02-03 17:59:34 UTC (rev 15442)
+++ packages/pyzmq/trunk/debian/changelog	2011-02-03 21:49:46 UTC (rev 15443)
@@ -1,3 +1,11 @@
+pyzmq (2.0.10.1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Migrate to dh_python2 and drop Build-Depends on python-support.
+  * Fix typo in package descriptions.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 03 Feb 2011 13:50:00 -0430
+
 pyzmq (2.0.10-1) experimental; urgency=low
 
   * New upstream release.

Modified: packages/pyzmq/trunk/debian/control
===================================================================
--- packages/pyzmq/trunk/debian/control	2011-02-03 17:59:34 UTC (rev 15442)
+++ packages/pyzmq/trunk/debian/control	2011-02-03 21:49:46 UTC (rev 15443)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.4), python-support,
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.4),
  python-all-dbg (>= 2.4), python-setuptools, cython-dbg (>= 0.13), libzmq-dev
 Standards-Version: 3.9.1
-XS-Python-Version: all
+X-Python-Version: >= 2.4
 Homepage: http://www.zeromq.org/bindings:python
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/pyzmq/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyzmq/trunk/
@@ -17,7 +17,7 @@
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for 0MQ library
- Python bindings for 0QM. 0MQ is a small, fast, and free
+ Python bindings for 0MQ. 0MQ is a small, fast, and free
  software library that gives you message-passing concurrency
  for applications in most common languages.
  .
@@ -37,7 +37,7 @@
  python-zmq (= ${binary:Version})
 Recommends: python-dbg
 Description: Python bindings for 0MQ library - debugging files
- Python bindings for 0QM. 0MQ is a small, fast, and free
+ Python bindings for 0MQ. 0MQ is a small, fast, and free
  software library that gives you message-passing concurrency
  for applications in most common languages.
  .

Modified: packages/pyzmq/trunk/debian/rules
===================================================================
--- packages/pyzmq/trunk/debian/rules	2011-02-03 17:59:34 UTC (rev 15442)
+++ packages/pyzmq/trunk/debian/rules	2011-02-03 21:49:46 UTC (rev 15443)
@@ -1,15 +1,21 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh --with python2 $@
 
 override_dh_auto_clean:
 	-dh_auto_clean
+	find zmq -name '*.c' -delete
 
 override_dh_install:
-	for python in $(shell pyversions -r); do \
-		$$python setup.py install --root debian/python-zmq --prefix /usr; \
-	done
+	# Install everything excluding the *_d.so debug extensions to python-zmq
+	dh_install -X"*_d.so" "debian/tmp/*" -p python-zmq
 
+	# Install the debug extensions to python-zmq-dbg
+	dh_install "usr/lib/python*/*-packages/zmq/*/*_d.so" -p python-zmq-dbg
+
+	# Continue with regular dh_install
+	dh_install
+
 override_dh_auto_test:
 # Almost all tests are broken because OpenPGM doesn't seem to be initialized
 # correctly or there is not support for OpenPGM in libzmq0. I don't know if
@@ -28,8 +34,10 @@
 #endif
 
 override_dh_strip:
+ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip --dbg-package=python-zmq-dbg
-	cd debian/python-zmq-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
+	find debian/python-zmq-dbg/usr/lib/debug -name '*_d.so' -delete
+endif
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \