Source: libicns
Version: 0.7.1-1.1
Severity: important
Tags: patch
User: [email protected]
Usertags: libpng15-transition

Hi,

I uploaded libpng 1.5.2 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng.

I noticed your package FTBFS by libpng 1.5.
I created the patch that revise this problem.
Could you check and apply this patch?

Best regards,
  Nobuhiro

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash


-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6



-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6
diff -u libicns-0.7.1/debian/changelog libicns-0.7.1/debian/changelog
--- libicns-0.7.1/debian/changelog
+++ libicns-0.7.1/debian/changelog
@@ -1,3 +1,10 @@
+libicns (0.7.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * libpng transition.
+
+ -- Nobuhiro Iwamatsu <[email protected]>  Mon, 06 Jun 2011 21:09:03 +0900
+
 libicns (0.7.1-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- libicns-0.7.1.orig/icnsutils/png2icns.c
+++ libicns-0.7.1/icnsutils/png2icns.c
@@ -70,8 +70,11 @@
 	switch (color_type)
 	{
 		case PNG_COLOR_TYPE_GRAY:
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+			png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
 			png_set_gray_1_2_4_to_8(png_ptr);
-
+#endif
 			if (bit_depth == 16) {
 				png_set_strip_16(png_ptr);
 				bit_depth = 8;
@@ -82,8 +85,11 @@
 			break;
 
 		case PNG_COLOR_TYPE_GRAY_ALPHA:
+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+			png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
 			png_set_gray_1_2_4_to_8(png_ptr);
-
+#endif
 			if (bit_depth == 16) {
 				png_set_strip_16(png_ptr);
 				bit_depth = 8;

Reply via email to