Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hi release team, please unblock the package zbar as the last upload makes the Python extension actually work on arm* (and maybe other architectures). See #702499 for details. I'm also fixing #634774 with the upload as I had it commited already, replacing [!kfreebsd-* !hurd-*] by [linux-any]. Hope thats okay, although absolutely not release critical. Full diff between -7 and -8 is attached. Thanks, Bernd unblock zbar/0.10+doc-8 -- Bernd Zeimetz Debian GNU/Linux Developer http://bzed.de http://www.debian.org GPG Fingerprint: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
diff --git a/debian/changelog b/debian/changelog index e27a8ee..2ddb8ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +zbar (0.10+doc-8) unstable; urgency=low + + * [5c38da40] Use [linux-any] instead of [!kfreebsd-*]. + Thanks to Robert Millan (Closes: #634774) + * [1f15f52e] Add sentinel to PyGetSetDef imagescanner_getset[]. + Ensure that the loop is terminated which reads the + imagescanner_getset[] array on import - otherwise we'll run into + a segfault, at least on arm. + Thanks to Anton Gladky and Peter Green (Closes: #702499) + + -- Bernd Zeimetz <b...@debian.org> Sun, 17 Mar 2013 22:46:47 +0100 + zbar (0.10+doc-7) unstable; urgency=low * [48425c37] Ack'ing NMU. diff --git a/debian/control b/debian/control index 452084f..e25d6ef 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: zbar Section: libs Priority: optional Maintainer: Bernd Zeimetz <b...@debian.org> -Build-Depends: debhelper (>= 7), autotools-dev (>= 20100122.1~), libgtk2.0-dev, libmagick++-dev, libqt4-dev, libx11-dev, pkg-config, python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python-gtk2-dev, perl, dpkg-dev (>= 1.15.6), dh-autoreconf, quilt (>= 0.46-7~), libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] +Build-Depends: debhelper (>= 7), autotools-dev (>= 20100122.1~), libgtk2.0-dev, libmagick++-dev, libqt4-dev, libx11-dev, pkg-config, python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), python-gtk2-dev, perl, dpkg-dev (>= 1.15.6), dh-autoreconf, quilt (>= 0.46-7~), libv4l-dev [linux-any] Standards-Version: 3.8.4 Homepage: http://zbar.sourceforge.net/ XS-Python-Version: >= 2.4 diff --git a/debian/patches/python-zbar-import-fix-am.patch b/debian/patches/python-zbar-import-fix-am.patch new file mode 100644 index 0000000..5d632a6 --- /dev/null +++ b/debian/patches/python-zbar-import-fix-am.patch @@ -0,0 +1,12 @@ +--- a/python/imagescanner.c ++++ b/python/imagescanner.c +@@ -67,7 +67,8 @@ imagescanner_get_results (zbarImageScann + } + + static PyGetSetDef imagescanner_getset[] = { +- { "results", (getter)imagescanner_get_results, }, ++ { "results", (getter)imagescanner_get_results, NULL, NULL, NULL}, ++ {NULL} /* Sentinel */ + }; + + static PyObject* diff --git a/debian/patches/series b/debian/patches/series index 7f82554..027a79b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Description-Linux-2.6.38-and-later-do-not-support-th.patch +python-zbar-import-fix-am.patch
