Source: jkmeter
Version: 0.4.0-3
Severity: important
Tags: patch
User: lib...@packages.debian.org
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 -Nru jkmeter-0.4.0/debian/changelog jkmeter-0.4.0/debian/changelog
--- jkmeter-0.4.0/debian/changelog 2010-12-04 09:22:42.000000000 +0900
+++ jkmeter-0.4.0/debian/changelog 2011-06-06 16:18:39.000000000 +0900
@@ -1,3 +1,10 @@
+jkmeter (0.4.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * libpng transition.
+
+ -- Nobuhiro Iwamatsu <iwama...@nigauri.org> Mon, 06 Jun 2011 16:18:29 +0900
+
jkmeter (0.4.0-3) unstable; urgency=low
* Pass -pthread flag to the linker to fix FTBFS with binutils-gold.
diff -Nru jkmeter-0.4.0/debian/patches/debian-changes-0.4.0-3.1 jkmeter-0.4.0/debian/patches/debian-changes-0.4.0-3.1
--- jkmeter-0.4.0/debian/patches/debian-changes-0.4.0-3.1 1970-01-01 09:00:00.000000000 +0900
+++ jkmeter-0.4.0/debian/patches/debian-changes-0.4.0-3.1 2011-06-06 16:25:41.000000000 +0900
@@ -0,0 +1,44 @@
+Description: Upstream changes introduced in version 0.4.0-3.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ jkmeter (0.4.0-3.1) unstable; urgency=low
+ .
+ * Non-maintainer upload.
+ * libpng transition.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Nobuhiro Iwamatsu <iwama...@nigauri.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- jkmeter-0.4.0.orig/source/mkimage.cc
++++ jkmeter-0.4.0/source/mkimage.cc
+@@ -73,9 +73,15 @@ XImage *mkimage (const char *file, X_dis
+ PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND,
+ 0);
+
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++ dx = png_get_image_width(png_ptr, png_info);
++ dy = png_get_image_height(png_ptr, png_info);
++ dp = (png_get_color_type(png_ptr, png_info) & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
++#else
+ dx = png_info->width;
+ dy = png_info->height;
+ dp = (png_info->color_type & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
++#endif
+ data = (const unsigned char **)(png_get_rows (png_ptr, png_info));
+
+ image = XCreateImage (disp->dpy (),
diff -Nru jkmeter-0.4.0/debian/patches/series jkmeter-0.4.0/debian/patches/series
--- jkmeter-0.4.0/debian/patches/series 2010-08-07 17:05:28.000000000 +0900
+++ jkmeter-0.4.0/debian/patches/series 2011-06-06 16:22:06.000000000 +0900
@@ -1 +1,2 @@
01-makefile.patch
+debian-changes-0.4.0-3.1
