Bug#811001: pngtools: diff for NMU version 0.4-1.2

[Tobias Frost]

Control: tags 811001 + patch

Dear maintainer,

I've prepared an NMU for pngtools (versioned as 0.4-1.2). The diff
is attached to this message.

Regards.
diff -u pngtools-0.4/debian/changelog pngtools-0.4/debian/changelog
--- pngtools-0.4/debian/changelog
+++ pngtools-0.4/debian/changelog
@@ -1,3 +1,10 @@
+pngtools (0.4-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix previous upload for libpng12 by conditional compiling (Closes: #811001)
+
+ -- Tobias Frost <t...@debian.org>  Thu, 14 Jan 2016 20:40:19 +0100
+
 pngtools (0.4-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -u pngtools-0.4/pnginfo.c pngtools-0.4/pnginfo.c
--- pngtools-0.4/pnginfo.c
+++ pngtools-0.4/pnginfo.c
@@ -208,7 +208,13 @@
 
   png_get_tRNS(png, info, &trans_alpha, &num_trans, &trans_color);
   png_get_PLTE(png, info, &palette, &num_palette);
-  png_get_pHYs_dpi(png, info, &res_x, &res_y, &unit_type);
+
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+ png_get_pHYs_dpi(png, info, &res_x, &res_y, &unit_type);
+#else
+ res_x = info->x_pixels_per_unit;
+ res_y = info->y_pixels_per_unit;
+#endif
 
   // Photometric interp packs a lot of information
   printf ("  Colour Type (Photometric Interpretation): ");