Dear maintainer,
I've prepared an NMU for autotrace (versioned as 0.31.1-16+nmu1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru autotrace-0.31.1/debian/changelog autotrace-0.31.1/debian/changelog
--- autotrace-0.31.1/debian/changelog 2014-12-16 23:24:46.000000000 +0100
+++ autotrace-0.31.1/debian/changelog 2016-01-25 12:33:31.000000000 +0100
@@ -1,3 +1,12 @@
+autotrace (0.31.1-16+nmu1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fixes for the libpng 1.6 library transition: (Closes: #662273)
+ - Build-Depends on libpng-dev, instead of libpng12-dev
+ - Add patch from Fedora for the library's API
+
+ -- Tobias Frost <t...@debian.org> Mon, 25 Jan 2016 12:32:10 +0100
+
autotrace (0.31.1-16+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru autotrace-0.31.1/debian/control autotrace-0.31.1/debian/control
--- autotrace-0.31.1/debian/control 2011-08-08 02:40:01.000000000 +0200
+++ autotrace-0.31.1/debian/control 2016-01-25 13:19:13.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Edgar Antonio Palma de la Cruz <xbyt...@gmail.com>
Build-Depends: debhelper (>= 8), autotools-dev, pkg-config,
- libpng12-dev, libpstoedit-dev (>= 3.42-1.1),
+ libpng-dev, libpstoedit-dev (>= 3.42-1.1),
libmagickcore-dev, dh-autoreconf
Standards-Version: 3.9.2
Homepage: http://autotrace.sourceforge.net/
@@ -25,7 +25,7 @@
Description: bitmap to vector graphics converter, shared library files
Runtime shared library files needed by programs that link with the
AutoTrace bitmap-to-vector graphics converter.
- About the usage of the library
+ About the usage of the library
see http://autotrace.sourceforge.net/frontline
diff -Nru autotrace-0.31.1/debian/patches/libpng16.patch
autotrace-0.31.1/debian/patches/libpng16.patch
--- autotrace-0.31.1/debian/patches/libpng16.patch 1970-01-01
01:00:00.000000000 +0100
+++ autotrace-0.31.1/debian/patches/libpng16.patch 2016-01-25
12:43:34.000000000 +0100
@@ -0,0 +1,61 @@
+Description: Fix for libpng 1.6
+ libpng1.6 hides some implementation details, getters/setters are now to be
uded.
+Origin:
http://pkgs.fedoraproject.org/cgit/rpms/autotrace.git/plain/autotrace-0.31.1-libpng15.patch?id=0fbea0205eddba3b39fcf17ac91984dd2aa5ab1e
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662273
+Last-Update: 2016-01-25 by t...@debian.org
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/input-png.c
++++ b/input-png.c
+@@ -42,7 +42,7 @@
+
+ static void handle_warning(png_structp png, const at_string message) {
+ LOG1("PNG warning: %s", message);
+- at_exception_warning((at_exception_type *)png->error_ptr,
++ at_exception_warning((at_exception_type *)png_get_error_ptr(png),
+ message);
+ /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
+ "PNG warning"); */
+@@ -50,7 +50,7 @@
+
+ static void handle_error(png_structp png, const at_string message) {
+ LOG1("PNG error: %s", message);
+- at_exception_fatal((at_exception_type *)png->error_ptr,
++ at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
+ message);
+ /* at_exception_fatal((at_exception_type *)at_png->error_ptr,
+ "PNG error"); */
+@@ -157,8 +157,8 @@
+
+ png_set_strip_16(png_ptr);
+ png_set_packing(png_ptr);
+- if ((png_ptr->bit_depth < 8) ||
+- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
++ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
++ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
+ (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
+ png_set_expand(png_ptr);
+
+@@ -181,20 +181,10 @@
+ PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+ } else
+ png_set_strip_alpha(png_ptr);
++ png_set_interlace_handling(png_ptr);
+ png_read_update_info(png_ptr, info_ptr);
+
+-
+- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
+- info_ptr->height *
sizeof(png_bytep));
+-#ifdef PNG_FREE_ME_SUPPORTED
+- info_ptr->free_me |= PNG_FREE_ROWS;
+-#endif
+- for (row = 0; row < (int)info_ptr->height; row++)
+- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
+-
png_get_rowbytes(png_ptr, info_ptr));
+-
+- png_read_image(png_ptr, info_ptr->row_pointers);
+- info_ptr->valid |= PNG_INFO_IDAT;
++ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
+ png_read_end(png_ptr, info_ptr);
+ return png_get_rows(png_ptr, info_ptr);
+ }
diff -Nru autotrace-0.31.1/debian/patches/series
autotrace-0.31.1/debian/patches/series
--- autotrace-0.31.1/debian/patches/series 2014-12-16 23:24:46.000000000
+0100
+++ autotrace-0.31.1/debian/patches/series 2016-01-25 11:45:11.000000000
+0100
@@ -11,3 +11,4 @@
output-pstoedit.h.patch
README.patch
CVE-2013-1953.patch
+libpng16.patch
