* Scott Kitterman <[email protected]>, 2011-05-04, 00:18:
Currently unbound will FTBFS once the default Python version is switched to python2.7 (which will happen during the wheezy development cycle).

And here's a patch that actually works.


--
Jakub Wilk
diffstat for unbound-1.4.10 unbound-1.4.10

 changelog              |   13 +++++++++++++
 control                |    1 -
 python-unbound.dirs    |    2 --
 python-unbound.install |    2 +-
 rules                  |    3 ++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff -Nru unbound-1.4.10/debian/changelog unbound-1.4.10/debian/changelog
--- unbound-1.4.10/debian/changelog	2011-05-26 00:50:37.000000000 +0200
+++ unbound-1.4.10/debian/changelog	2011-06-29 17:46:28.000000000 +0200
@@ -1,3 +1,16 @@
+unbound (1.4.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS with Python 2.7 (closes: #625520):
+    + Update python-unbound.install, so that all Python modules (including
+      *.so) are installed before dh_pysupport call. That way python-support
+       can can generate proper versioned depedency on python.
+    + Drop python-unbound.dirs, let python-support create these directories.
+    + Drop XB-Python-Versions.
+    + Don't hardcode Python version in debian/rules, use pyversions instead.
+
+ -- Jakub Wilk <[email protected]>  Wed, 29 Jun 2011 17:46:27 +0200
+
 unbound (1.4.10-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru unbound-1.4.10/debian/control unbound-1.4.10/debian/control
--- unbound-1.4.10/debian/control	2011-05-26 00:50:37.000000000 +0200
+++ unbound-1.4.10/debian/control	2011-06-29 17:18:48.000000000 +0200
@@ -56,7 +56,6 @@
 Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-XB-Python-Version: 2.6
 Description: library implementing DNS resolution and validation (Python bindings)
  Python extension module for libunbound.
  .
diff -Nru unbound-1.4.10/debian/python-unbound.dirs unbound-1.4.10/debian/python-unbound.dirs
--- unbound-1.4.10/debian/python-unbound.dirs	2011-05-26 00:50:37.000000000 +0200
+++ unbound-1.4.10/debian/python-unbound.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/pyshared/python2.6
-usr/share/pyshared
diff -Nru unbound-1.4.10/debian/python-unbound.install unbound-1.4.10/debian/python-unbound.install
--- unbound-1.4.10/debian/python-unbound.install	2011-05-26 00:50:37.000000000 +0200
+++ unbound-1.4.10/debian/python-unbound.install	2011-06-29 17:17:17.000000000 +0200
@@ -1 +1 @@
-usr/lib/python2.6/dist-packages/unbound.py usr/share/pyshared
+usr/lib/python2.*/*-packages/
diff -Nru unbound-1.4.10/debian/rules unbound-1.4.10/debian/rules
--- unbound-1.4.10/debian/rules	2011-05-26 00:50:37.000000000 +0200
+++ unbound-1.4.10/debian/rules	2011-06-29 17:18:10.000000000 +0200
@@ -31,8 +31,9 @@
 	rm -f _unbound.la
 	sed -i -e 's/^dependency_libs=.*/dependency_libs=''/' libunbound.la
 	make _unbound.la LIBS=""
+	rm debian/python-unbound/usr/lib/pyshared/$(shell pyversions -d)/*.so*
 	install -m 0644 .libs/_unbound.so.2.*.* \
-		debian/python-unbound/usr/lib/pyshared/python2.6/_unbound.so
+		debian/python-unbound/usr/lib/pyshared/$(shell pyversions -d)/_unbound.so
 
 binary-arch: install
 	dh binary-arch

Reply via email to