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

Bug#928295: marked as done (unblock: pythonmagick/0.9.19-3)

Your message dated Thu, 2 May 2019 18:41:35 +0200
with message-id <cfbe7b5f-55fb-51e4-c937-0a8c5b62b6fc@debian.org>
and subject line Re: Bug#928295: unblock: pythonmagick/0.9.19-3
has caused the Debian Bug report #928295,
regarding unblock: pythonmagick/0.9.19-3
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.)


-- 
928295: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=928295
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

Please unblock package pythonmagick

pythonmagick was patched to compile with ImageMagick 7 in 0.9.19-1
whereas buster is still on 6. This resulted the package failing to
import, see #928103 (missed to close this in the changelog).
I disabled the autopkgtest as it was failing because autopep8 doesn't
support module names different to packages names.

unblock pythonmagick/0.9.19-3

-- System Information:
Debian Release: 10.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: armhf (armv7l)

Kernel: Linux 4.19.0-4-armmp (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/debian/changelog b/debian/changelog
index 9a93a17..a20d793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pythonmagick (0.9.19-3) unstable; urgency=medium
+
+  * Team upload.
+  * Disable failing autopkgtest
+  * Add patch for ImageMagick < 7
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Wed, 01 May 2019 14:45:43 +0200
+
 pythonmagick (0.9.19-2) unstable; urgency=medium
 
   * Fix debci
diff --git a/debian/control b/debian/control
index 4bbea2f..e3795c1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Depends:
  python3-setuptools
 Standards-Version: 4.3.0
 Homepage: http://www.imagemagick.org
-Testsuite: autopkgtest-pkg-python
 
 Package: python-pythonmagick
 Architecture: any
diff --git a/debian/patches/0002-Partly-revert-f4772d8-for-ImageMagick-7.patch b/debian/patches/0002-Partly-revert-f4772d8-for-ImageMagick-7.patch
new file mode 100644
index 0000000..25d9e84
--- /dev/null
+++ b/debian/patches/0002-Partly-revert-f4772d8-for-ImageMagick-7.patch
@@ -0,0 +1,110 @@
+From 0c0e1e9a038d7e66669f79f567714ab5054c9345 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <jspricke@debian.org>
+Date: Wed, 1 May 2019 12:28:12 +0200
+Subject: [PATCH] Partly revert f4772d8 for ImageMagick < 7
+
+---
+ PythonMagick/__init__.py   |  8 ++++----
+ pythonmagick_src/_main.cpp | 16 ++++++++--------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/PythonMagick/__init__.py b/PythonMagick/__init__.py
+index 61ba8d4..6750c2e 100644
+--- a/PythonMagick/__init__.py
++++ b/PythonMagick/__init__.py
+@@ -51,10 +51,10 @@ class DrawableColor(_PythonMagick.DrawableColor):
+ class DrawableCompositeImage(_PythonMagick.DrawableCompositeImage):
+    pass
+ 
+-class DrawableStrokeDashArray(_PythonMagick.DrawableStrokeDashArray):
++class DrawableDashArray(_PythonMagick.DrawableDashArray):
+    pass
+ 
+-class DrawableStrokeDashOffset(_PythonMagick.DrawableStrokeDashOffset):
++class DrawableDashOffset(_PythonMagick.DrawableDashOffset):
+    pass
+ 
+ class DrawableEllipse(_PythonMagick.DrawableEllipse):
+@@ -78,7 +78,7 @@ class DrawableGravity(_PythonMagick.DrawableGravity):
+ class DrawableLine(_PythonMagick.DrawableLine):
+    pass
+ 
+-class DrawableAlpha(_PythonMagick.DrawableAlpha):
++class DrawableMatte(_PythonMagick.DrawableMatte):
+    pass
+ 
+ class DrawableMiterLimit(_PythonMagick.DrawableMiterLimit):
+@@ -174,7 +174,7 @@ class DrawableViewbox(_PythonMagick.DrawableViewbox):
+ class Exception(_PythonMagick.Exception):
+    pass
+ 
+-class FilterType(_PythonMagick.FilterType):
++class FilterTypes(_PythonMagick.FilterTypes):
+    pass
+ 
+ class Geometry(_PythonMagick.Geometry):
+diff --git a/pythonmagick_src/_main.cpp b/pythonmagick_src/_main.cpp
+index a7d3cce..449f0b1 100644
+--- a/pythonmagick_src/_main.cpp
++++ b/pythonmagick_src/_main.cpp
+@@ -30,7 +30,7 @@ void Export_pyste_src_PathArcAbs();
+ void Export_pyste_src_Image();
+ void Export_pyste_src_GravityType();
+ void Export_pyste_src_Geometry();
+-void Export_pyste_src_FilterType();
++void Export_pyste_src_FilterTypes();
+ void Export_pyste_src_Exception();
+ void Export_pyste_src_DrawableViewbox();
+ void Export_pyste_src_DrawableTranslation();
+@@ -62,7 +62,7 @@ void Export_pyste_src_DrawablePointSize();
+ void Export_pyste_src_DrawablePoint();
+ void Export_pyste_src_DrawablePath();
+ void Export_pyste_src_DrawableMiterLimit();
+-void Export_pyste_src_DrawableAlpha();
++void Export_pyste_src_DrawableMatte();
+ void Export_pyste_src_DrawableLine();
+ void Export_pyste_src_DrawableGravity();
+ void Export_pyste_src_DrawableFont();
+@@ -70,8 +70,8 @@ void Export_pyste_src_DrawableFillRule();
+ void Export_pyste_src_DrawableFillOpacity();
+ void Export_pyste_src_DrawableFillColor();
+ void Export_pyste_src_DrawableEllipse();
+-void Export_pyste_src_DrawableStrokeDashOffset();
+-void Export_pyste_src_DrawableStrokeDashArray();
++void Export_pyste_src_DrawableDashOffset();
++void Export_pyste_src_DrawableDashArray();
+ void Export_pyste_src_DrawableCompositeImage();
+ void Export_pyste_src_DrawableColor();
+ void Export_pyste_src_DrawableClipPath();
+@@ -119,7 +119,7 @@ BOOST_PYTHON_MODULE(_PythonMagick)
+     Export_pyste_src_Image();
+     Export_pyste_src_GravityType();
+     Export_pyste_src_Geometry();
+-    Export_pyste_src_FilterType();
++    Export_pyste_src_FilterTypes();
+     Export_pyste_src_Exception();
+     Export_pyste_src_DrawableViewbox();
+     Export_pyste_src_DrawableTranslation();
+@@ -151,7 +151,7 @@ BOOST_PYTHON_MODULE(_PythonMagick)
+     Export_pyste_src_DrawablePoint();
+     Export_pyste_src_DrawablePath();
+     Export_pyste_src_DrawableMiterLimit();
+-    Export_pyste_src_DrawableAlpha();
++    Export_pyste_src_DrawableMatte();
+     Export_pyste_src_DrawableLine();
+     Export_pyste_src_DrawableGravity();
+     Export_pyste_src_DrawableFont();
+@@ -159,8 +159,8 @@ BOOST_PYTHON_MODULE(_PythonMagick)
+     Export_pyste_src_DrawableFillOpacity();
+     Export_pyste_src_DrawableFillColor();
+     Export_pyste_src_DrawableEllipse();
+-    Export_pyste_src_DrawableStrokeDashOffset();
+-    Export_pyste_src_DrawableStrokeDashArray();
++    Export_pyste_src_DrawableDashOffset();
++    Export_pyste_src_DrawableDashArray();
+     Export_pyste_src_DrawableCompositeImage();
+     Export_pyste_src_DrawableColor();
+     Export_pyste_src_DrawableClipPath();
+-- 
+2.20.1
+
diff --git a/debian/patches/series b/debian/patches/series
index c6c3857..9a1a153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Remove-obsolete-m4-files.patch
+0002-Partly-revert-f4772d8-for-ImageMagick-7.patch

--- End Message ---
--- Begin Message --- 
Hi Jochen,

On 01-05-2019 20:45, Jochen Sprickerhof wrote:
> There was one already, but it failed as well. I uploaded a fixed version
> in -4. Diff against the version in buster attached.

unblocked. Thanks.

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
Reply to: