Package: python2.6 Version: 2.6.8-0.1 Severity: normal Tags: patch pending Hi Matthias,
I've prepared an NMU for python2.6 (versioned as 2.6.8-0.2) and uploaded it to DELAYED/0. This should hopefully fix FTBFS from -0.1. Cheers, Julien
diff -u python2.6-2.6.8/debian/rules python2.6-2.6.8/debian/rules
--- python2.6-2.6.8/debian/rules
+++ python2.6-2.6.8/debian/rules
@@ -10,6 +10,7 @@
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
+DPKG_VARS := $(shell dpkg-architecture)
DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
DEB_HOST_ARCH_BITS ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_BITS)
DEB_HOST_ARCH_OS ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS)
@@ -164,6 +165,9 @@
ifneq (,$(filter $(DEB_HOST_ARCH), arm armel))
PROFILE_EXCLUDES += test_float
endif
+ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
+ PROFILE_EXCLUDES += test_io
+endif
PROFILE_EXCLUDES += test_zipfile
PROFILE_EXCLUDES += test_xmlrpc
PROFILE_EXCLUDES += test_bsddb3
@@ -343,6 +347,9 @@
ifeq (,$(wildcard /dev/dsp))
TEST_EXCLUDES += test_linuxaudiodev test_ossaudiodev
endif
+ifneq (,$(filter $(DEB_HOST_ARCH), armel hppa powerpc))
+ TEST_EXCLUDES += test_multiprocessing
+endif
ifneq (,$(filter $(DEB_HOST_ARCH), hppa))
TEST_EXCLUDES += test_fork1 test_multiprocessing test_socketserver test_wait3 test_wait4 test_gdb
endif
@@ -357,6 +364,13 @@
TEST_EXCLUDES += test_compiler
endif
endif
+# fails on some buildds
+ifneq (,$(filter $(DEB_HOST_ARCH), amd64))
+ TEST_EXCLUDES += test_io
+endif
+ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386))
+ TEST_EXCLUDES += test_io test_signal
+endif
ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386))
TEST_EXCLUDES += test_random test_signal test_socketserver test_ssl test_threading
endif
diff -u python2.6-2.6.8/debian/changelog python2.6-2.6.8/debian/changelog
--- python2.6-2.6.8/debian/changelog
+++ python2.6-2.6.8/debian/changelog
@@ -1,3 +1,11 @@
+python2.6 (2.6.8-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix Modules/pyexpat.c to not crash when the svn revision's missing.
+ * Disable some tests on kfreebsd.
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 25 Jun 2012 16:03:43 +0200
+
python2.6 (2.6.8-0.1) unstable; urgency=low
[ Matthias Klose ]
diff -u python2.6-2.6.8/debian/patches/series.in python2.6-2.6.8/debian/patches/series.in
--- python2.6-2.6.8/debian/patches/series.in
+++ python2.6-2.6.8/debian/patches/series.in
@@ -67,0 +68 @@
+pyexpat-version.diff
only in patch2:
unchanged:
--- python2.6-2.6.8.orig/debian/patches/pyexpat-version.diff
+++ python2.6-2.6.8/debian/patches/pyexpat-version.diff
@@ -0,0 +1,13 @@
+Index: python2.6-2.6.8/Modules/pyexpat.c
+===================================================================
+--- python2.6-2.6.8.orig/Modules/pyexpat.c
++++ python2.6-2.6.8/Modules/pyexpat.c
+@@ -1862,7 +1862,7 @@ get_version_string(void)
+ char *rev = rcsid;
+ int i = 0;
+
+- while (!isdigit(Py_CHARMASK(*rev)))
++ while (*rev && !isdigit(Py_CHARMASK(*rev)))
+ ++rev;
+ while (rev[i] != ' ' && rev[i] != '\0')
+ ++i;
signature.asc
Description: Digital signature
