Package: switzerland
Version: 0.0.7-1
Severity: wishlist
Tags: patch

Python 2.6 will land in unstable soon.
I'm attaching a patch to fix build failures with new major version.

Thank you.


-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.29-2-486
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -u switzerland-0.0.7/debian/control switzerland-0.0.7/debian/control
--- switzerland-0.0.7/debian/control
+++ switzerland-0.0.7/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Andrés Roldán <arol...@debian.org>
 Standards-Version: 3.8.0.0
 XS-Python-Version: >= 2.5
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-dev (>= 2.3.5-11), python-support (>= 0.5.3), libpcap-dev
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-all-dev (>= 2.5.4-1~), python-support (>= 0.5.3), libpcap-dev
 
 Package: switzerland
 Architecture: any
diff -u switzerland-0.0.7/debian/rules switzerland-0.0.7/debian/rules
--- switzerland-0.0.7/debian/rules
+++ switzerland-0.0.7/debian/rules
@@ -5,11 +5,11 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 BASE := $(CURDIR)/debian/switzerland
-DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
+DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --install-layout=deb
 
 binary-indep-post-install/switzerland::
 	# fix python interpreter
-	mv build/scripts-2.5/* $(BASE)/usr/bin/
+	mv build/scripts-2.*/* $(BASE)/usr/bin/
 	rm -rf build switzerland/client/FastCollector
 
 clean::
diff -u switzerland-0.0.7/debian/changelog switzerland-0.0.7/debian/changelog
--- switzerland-0.0.7/debian/changelog
+++ switzerland-0.0.7/debian/changelog
@@ -1,3 +1,13 @@
+switzerland (0.0.7-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Python 2.6 related changes:
+    - Build for every supported Python version.
+    - Add --install-layout=deb to DEB_PYTHON_INSTALL_ARGS_ALL.
+    - Build-depend on python-all-dev (>= 2.5.3-0ubuntu1).
+
+ -- Luca Falavigna <dktrkr...@ubuntu.com>  Thu, 28 May 2009 00:50:51 +0200
+
 switzerland (0.0.7-1) unstable; urgency=low
 
   * Initial release. (Closes: #502286)

Reply via email to