Bug#734974: prima: diff for NMU version 1.28-1.2

2014-01-17 Thread Sebastian Ramacher 
On 2014-01-11 13:03:14, t...@coldtobi.de wrote:
> Package: prima
> Version: 1.28-1.1
> Severity: normal
> Tags: patch pending
> 
> Dear maintainer,
> 
> I've prepared an NMU for prima (versioned as 1.28-1.2) and
> uploaded it to DELAYED/5. Please feel free to tell me if I
> should delay it longer.
> 
> Regards.
> diff -u prima-1.28/debian/changelog prima-1.28/debian/changelog
> --- prima-1.28/debian/changelog
> +++ prima-1.28/debian/changelog
> @@ -1,3 +1,10 @@
> +prima (1.28-1.2) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Fix FTBFS (Closes: #732405, #650575) using patch from BTS. 
> +
> + --  Tobias Frost   Sat, 11 Jan 2014 11:17:16 +
> +
>  prima (1.28-1.1) unstable; urgency=medium
>  
>* Non-maintainer upload.
> only in patch2:
> unchanged:
> --- prima-1.28.orig/img/codec_png.c
> +++ prima-1.28/img/codec_png.c
> @@ -279,7 +279,11 @@
>  {
> char * buf = ( char *) png_get_error_ptr( png_ptr); 
> if ( buf) strncpy( buf, msg, 256);
> +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 5
> longjmp( png_ptr-> jmpbuf, 1);
> +#else
> +   png_longjmp( png_ptr, 1);
> +#endif
>  }

That's actually not enough. The second part of [1] is also needed.

Regards

[1] https://github.com/dk/Prima/commit/8bf6b3b905db57b1bcc4feff416dbff847c1481a
-- 
Sebastian Ramacher


signature.asc
Description: Digital signature

Bug#734974: prima: diff for NMU version 1.28-1.2

2014-01-11 Thread tobi 
Package: prima
Version: 1.28-1.1
Severity: normal
Tags: patch pending

Dear maintainer,

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

Regards.
diff -u prima-1.28/debian/changelog prima-1.28/debian/changelog
--- prima-1.28/debian/changelog
+++ prima-1.28/debian/changelog
@@ -1,3 +1,10 @@
+prima (1.28-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS (Closes: #732405, #650575) using patch from BTS. 
+
+ --  Tobias Frost   Sat, 11 Jan 2014 11:17:16 +
+
 prima (1.28-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- prima-1.28.orig/img/codec_png.c
+++ prima-1.28/img/codec_png.c
@@ -279,7 +279,11 @@
 {
char * buf = ( char *) png_get_error_ptr( png_ptr); 
if ( buf) strncpy( buf, msg, 256);
+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 5
longjmp( png_ptr-> jmpbuf, 1);
+#else
+   png_longjmp( png_ptr, 1);
+#endif
 }
 
 static void
only in patch2:
unchanged:
--- prima-1.28.orig/img/codec_tiff.c
+++ prima-1.28/img/codec_tiff.c
@@ -161,6 +161,10 @@
   { COMPRESSION_SGILOG24, "SGILOG24"},
 };
 
+#ifndef TIFF_VERSION
+#define TIFF_VERSION TIFF_VERSION_CLASSIC
+#endif
+
 static ImgCodecInfo codec_info = {
"TIFF Bitmap",
"www.libtiff.org",


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org