Control: tags -1 patch Hi, please find attached a patch for this issue. Regards, Markus
diff -Nru devil-1.7.8/debian/changelog devil-1.7.8/debian/changelog
--- devil-1.7.8/debian/changelog 2014-08-20 21:34:04.000000000 +0200
+++ devil-1.7.8/debian/changelog 2015-07-07 01:55:31.000000000 +0200
@@ -1,3 +1,11 @@
+devil (1.7.8-10) unstable; urgency=medium
+
+ * QA upload.
+ * Add GCC-5-FTBFS-il.h.patch and fix build error with GCC-5.
+ * Declare compliance with Debian Policy 3.9.6.
+
+ -- Markus Koschany <apo@gambaru.de> Tue, 07 Jul 2015 01:54:18 +0200
+
devil (1.7.8-9) unstable; urgency=medium
* QA upload.
diff -Nru devil-1.7.8/debian/control devil-1.7.8/debian/control
--- devil-1.7.8/debian/control 2014-06-02 20:28:23.000000000 +0200
+++ devil-1.7.8/debian/control 2015-07-07 01:55:09.000000000 +0200
@@ -15,7 +15,7 @@
libsdl1.2-dev,
libtiff-dev,
zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://openil.sourceforge.net/
Package: libdevil1c2
diff -Nru devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch
--- devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch 1970-01-01 01:00:00.000000000 +0100
+++ devil-1.7.8/debian/patches/GCC-5-FTBFS-il.h.patch 2015-07-07 01:54:07.000000000 +0200
@@ -0,0 +1,26 @@
+From: Markus Koschany <apo@gambaru.de>
+Date: Tue, 7 Jul 2015 01:49:26 +0200
+Subject: GCC-5 FTBFS il.h
+
+Fix FTBFS with GCC-5. Thanks to NetBSD
+http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/devel/devIL/patches/patch-include_IL_il.h
+
+Bug: https://bugs.debian.org/777832
+Forwarded: no
+---
+ include/IL/il.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/IL/il.h b/include/IL/il.h
+index 540a56e..21fd6b2 100644
+--- a/include/IL/il.h
++++ b/include/IL/il.h
+@@ -63,7 +63,7 @@ extern "C" {
+ #endif
+ #endif
+
+-#ifdef RESTRICT_KEYWORD
++#if defined(RESTRICT_KEYWORD) && !defined(__cplusplus)
+ #define RESTRICT restrict
+ #define CONST_RESTRICT const restrict
+ #else
diff -Nru devil-1.7.8/debian/patches/series devil-1.7.8/debian/patches/series
--- devil-1.7.8/debian/patches/series 2014-08-20 21:34:04.000000000 +0200
+++ devil-1.7.8/debian/patches/series 2015-07-07 01:52:00.000000000 +0200
@@ -3,3 +3,4 @@
03_CVE-2009-3994.diff
04_png_set_expand_gray.diff
lcms2.patch
+GCC-5-FTBFS-il.h.patch
Attachment:
signature.asc
Description: OpenPGP digital signature