Control: tags 742559 + patch
Control: tags 742559 + pending
Dear maintainer,
I've prepared an NMU for amoeba (versioned as 1.1-29.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru amoeba-1.1/debian/changelog amoeba-1.1/debian/changelog
--- amoeba-1.1/debian/changelog 2015-05-02 05:25:49.000000000 +0200
+++ amoeba-1.1/debian/changelog 2016-01-08 16:18:52.000000000 +0100
@@ -1,3 +1,11 @@
+amoeba (1.1-29.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with libpng16 -- missing include string.h (Closes: #742559)
+ * Add Misc:Depends to the binary package (fix lintian warning)
+
+ -- Tobias Frost <t...@debian.org> Fri, 08 Jan 2016 16:18:52 +0100
+
amoeba (1.1-29) unstable; urgency=medium
* 26-alsa-support.diff: Only try to compile ALSA support if the headers have
diff -Nru amoeba-1.1/debian/control amoeba-1.1/debian/control
--- amoeba-1.1/debian/control 2015-04-30 06:26:35.000000000 +0200
+++ amoeba-1.1/debian/control 2016-01-08 16:15:38.000000000 +0100
@@ -7,7 +7,7 @@
Package: amoeba
Architecture: any
-Depends: ${shlibs:Depends}, amoeba-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, amoeba-data
Recommends: libgtk2.0-0
Conflicts: mesag3
Description: fast-paced, polished OpenGL demonstration by Excess
@@ -21,4 +21,3 @@
.
Note that this is only the demo engine -- to watch the demo itself, you
will also need the package amoeba-data.
-
diff -Nru amoeba-1.1/debian/patches/27-libpng16.patch
amoeba-1.1/debian/patches/27-libpng16.patch
--- amoeba-1.1/debian/patches/27-libpng16.patch 1970-01-01 01:00:00.000000000
+0100
+++ amoeba-1.1/debian/patches/27-libpng16.patch 2016-01-08 16:12:37.000000000
+0100
@@ -0,0 +1,16 @@
+Description: libpng16 does not include certain headers anymore
+Author: Tobias Frost <t...@debian.org>
+Bug-Debian: https://bugs.debian.org/742559
+Last-Update: 2016-01-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/image/png_image.cpp
++++ b/image/png_image.cpp
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
++#include <string.h>
+ #include <png.h>
+ #include "png_image.h"
+ #include "../exception.h"
diff -Nru amoeba-1.1/debian/patches/series amoeba-1.1/debian/patches/series
--- amoeba-1.1/debian/patches/series 2015-04-19 18:22:27.000000000 +0200
+++ amoeba-1.1/debian/patches/series 2016-01-08 16:10:36.000000000 +0100
@@ -24,3 +24,4 @@
24-build-on-kfreebsd.diff
25-libpng-1.5-fixes.diff
26-alsa-support.diff
+27-libpng16.patch
