[vdr-plugin-skinenigmang] 01/06: NMU

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-skinenigmang.

commit e60f81fe0550cbdb6f8de01fe4e75567a8fdaa17
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 26 13:11:18 2014 +0100

    NMU
    
    * NMU
    * Fix FTBFS with newer imagemagick (Closes: #760989).
---
 debian/changelog                          |  7 +++++++
 debian/patches/fix-imagemagick-path.patch | 17 +++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1156aaf..9d67e5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vdr-plugin-skinenigmang (0.1.2+git20130305-5.1) unstable; urgency=medium
+
+  * NMU
+  * Fix FTBFS with newer imagemagick (Closes: #760989).
+
+ -- Bastien Roucariès <roucaries.bastien+debian at gmail.com>  Tue, 09 Sep 2014 20:32:12 +0200
+
 vdr-plugin-skinenigmang (0.1.2+git20130305-5) unstable; urgency=low
 
   * Build-depend on vdr-dev (>= 2.0.0)
diff --git a/debian/patches/fix-imagemagick-path.patch b/debian/patches/fix-imagemagick-path.patch
new file mode 100644
index 0000000..aae510a
--- /dev/null
+++ b/debian/patches/fix-imagemagick-path.patch
@@ -0,0 +1,17 @@
+Fix compilation error for imagemagick by using pkg-config
+
+Index: vdr-plugin-skinenigmang-0.1.2+git20130305/Makefile
+===================================================================
+--- vdr-plugin-skinenigmang-0.1.2+git20130305.orig/Makefile
++++ vdr-plugin-skinenigmang-0.1.2+git20130305/Makefile
+@@ -130,8 +130,8 @@ OBJS = $(PLUGIN).o enigma.o config.o log
+ ifdef HAVE_IMAGEMAGICK
+ OBJS += bitmap.o
+ ifneq ($(HAVE_IMAGEMAGICK), GRAPHICS)
+-LIBS += -lMagick++
+-INCLUDES += -I/usr/include/ImageMagick -I/usr/local/include/ImageMagick
++LIBS += $(shell pkg-config --libs Magick++)
++INCLUDES += $(shell pkg-config --cflags Magick++)
+ else
+ LIBS += $(shell pkg-config --libs GraphicsMagick++)
+ INCLUDES += $(shell pkg-config --cflags GraphicsMagick++)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7520774
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-imagemagick-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-skinenigmang.git