Bug#743391: silly: diff for NMU version 0.1.0-3.3

2016-01-22 Thread Tobias Frost
Control: tags 743391 + patch
Control: tags 743391 + pending

Dear maintainer,

(Fixing this also in sid)

I've prepared an NMU for silly (versioned as 0.1.0-3.3) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

-- 
tobi


Regards.
diff -Nru silly-0.1.0/debian/changelog silly-0.1.0/debian/changelog
--- silly-0.1.0/debian/changelog2015-08-05 06:50:19.0 +0200
+++ silly-0.1.0/debian/changelog2016-01-22 11:44:47.0 +0100
@@ -1,3 +1,10 @@
+silly (0.1.0-3.3) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with libpng1.6 (Closes: #743391)
+
+ -- Tobias Frost   Fri, 22 Jan 2016 11:42:07 +0100
+
 silly (0.1.0-3.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru silly-0.1.0/debian/patches/02_libpng16.patch 
silly-0.1.0/debian/patches/02_libpng16.patch
--- silly-0.1.0/debian/patches/02_libpng16.patch1970-01-01 
01:00:00.0 +0100
+++ silly-0.1.0/debian/patches/02_libpng16.patch2016-01-22 
11:46:33.0 +0100
@@ -0,0 +1,10 @@
+--- a/src/loaders/SILLYPNGImageLoader.cpp
 b/src/loaders/SILLYPNGImageLoader.cpp
+@@ -40,6 +40,7 @@
+ #endif
+ 
+ #include "loaders/SILLYPNGImageContext.h" 
++#include 
+ #include 
+ // Start section of namespace SILLY
+ namespace SILLY
diff -Nru silly-0.1.0/debian/patches/series silly-0.1.0/debian/patches/series
--- silly-0.1.0/debian/patches/series   2014-10-28 04:19:49.0 +0100
+++ silly-0.1.0/debian/patches/series   2016-01-22 11:45:23.0 +0100
@@ -1,2 +1,3 @@
 01_SILLYPNGImageLoader.patch
 autoreconf-fixups.patch
+02_libpng16.patch



Bug#743391: silly: diff for NMU version 0.1.0-3.3

2016-01-22 Thread Muammar El Khatib
Dear Tobias,

On Fri, Jan 22, 2016 at 11:49:49AM +0100, Tobias Frost wrote:
> Control: tags 743391 + patch
> Control: tags 743391 + pending
>
> Dear maintainer,
>
> (Fixing this also in sid)
>
> I've prepared an NMU for silly (versioned as 0.1.0-3.3) and
> uploaded it to DELAYED/5. Please feel free to tell me if I
> should delay it longer.

Thank you very much for this NMU. Please, go ahead.


Regards,

--
Muammar El Khatib.
http://muammar.me | http://proyectociencia.org