Package: ace-of-penguins Version: 1.3-3 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 appended the patch that corrected this problem. Could you smoothly cooperate in libpng 1.5 to transition? 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
diff -Nru ace-of-penguins-1.3/debian/changelog ace-of-penguins-1.3/debian/changelog --- ace-of-penguins-1.3/debian/changelog 2011-04-09 22:08:25.000000000 +0900 +++ ace-of-penguins-1.3/debian/changelog 2011-05-30 09:15:07.000000000 +0900 @@ -1,3 +1,10 @@ +ace-of-penguins (1.3-3.1) unstable; urgency=low + + * Non-maintainer upload. + * transition libpng + + -- Nobuhiro Iwamatsu <[email protected]> Mon, 30 May 2011 09:14:49 +0900 + ace-of-penguins (1.3-3) unstable; urgency=low * debian/compat diff -Nru ace-of-penguins-1.3/debian/patches/debian-changes-1.3-3.1 ace-of-penguins-1.3/debian/patches/debian-changes-1.3-3.1 --- ace-of-penguins-1.3/debian/patches/debian-changes-1.3-3.1 1970-01-01 09:00:00.000000000 +0900 +++ ace-of-penguins-1.3/debian/patches/debian-changes-1.3-3.1 2011-05-30 09:19:12.000000000 +0900 @@ -0,0 +1,55 @@ +Description: Upstream changes introduced in version 1.3-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: + . + ace-of-penguins (1.3-3.1) unstable; urgency=low + . + * Non-maintainer upload. + * transition libpng + . + The person named in the Author field signed this changelog entry. +Author: Nobuhiro Iwamatsu <[email protected]> + +--- +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> + +--- ace-of-penguins-1.3.orig/lib/xwin.c ++++ ace-of-penguins-1.3/lib/xwin.c +@@ -825,13 +825,13 @@ build_image (image *src) + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + fprintf(stderr, "Invalid PNG image!\n"); + return; + } + + file_bytes = src->file_data; +- png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader); ++ png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader); + + png_read_info (png_ptr, info_ptr); + +--- ace-of-penguins-1.3.orig/lib/make-imglib.c ++++ ace-of-penguins-1.3/lib/make-imglib.c +@@ -86,7 +86,7 @@ scan_image_directory () + png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0); + info_ptr = png_create_info_struct (png_ptr); + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + fclose (f); + continue; + } diff -Nru ace-of-penguins-1.3/debian/patches/series ace-of-penguins-1.3/debian/patches/series --- ace-of-penguins-1.3/debian/patches/series 2011-04-09 21:39:55.000000000 +0900 +++ ace-of-penguins-1.3/debian/patches/series 2011-05-30 09:15:13.000000000 +0900 @@ -2,3 +2,4 @@ 20-lib--make-imglib.c-closedir.patch 30-spider.c-implicit-pointer-conversion.patch 40-include.patch +debian-changes-1.3-3.1
