[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#703360: marked as done (unblock: zbar/0.10+doc-8)

Your message dated Mon, 18 Mar 2013 20:45:05 +0000
with message-id <1363639505.15207.3.camel@jacala.jungle.funky-badger.org>
and subject line Re: Bug#703360: unblock: zbar/0.10+doc-8
has caused the Debian Bug report #703360,
regarding unblock: zbar/0.10+doc-8
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
703360: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703360
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@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 <bzed@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 <bzed@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

--- End Message ---
--- Begin Message --- 
On Mon, 2013-03-18 at 20:26 +0100, Bernd Zeimetz wrote:
> 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.

Unblocked earlier today; thanks.

Regards,

Adam

--- End Message ---
Reply to: