Imported Upstream version 0.999upstream/0.999upstream

1 files changed, 0 insertions, 34 deletions

diff --git a/debian/patches/fix_png15.patch b/debian/patches/fix_png15.patch
deleted file mode 100644
index bffc9ee..0000000
--- a/debian/patches/fix_png15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Build with libpng15.
-Author: Nobuhiro Iwamatsu <iwamatsu@debian.org>
-Bug-Debian: http://bugs.debian.org/649800
-Forwarded: no
-
-Index: xsane-0.998/src/xsane-save.c
-===================================================================
---- xsane-0.998.orig/src/xsane-save.c	2013-01-27 01:44:39.000000000 +0100
-+++ xsane-0.998/src/xsane-save.c	2013-01-29 00:17:56.934234295 +0100
-@@ -4928,8 +4928,11 @@
-     xsane_back_gtk_error(buf, TRUE);
-     return -1; /* error */
-   }
--
-+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
-+  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
-+#else
-   if (setjmp(png_ptr->jmpbuf))
-+#endif
-   {
-     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
-     xsane_back_gtk_error(buf, TRUE);
-@@ -5119,7 +5122,11 @@
-     return -1; /* error */
-   }
- 
-+#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4
-+  if ( setjmp( png_jmpbuf ( png_ptr ) ) )
-+#else
-   if (setjmp(png_ptr->jmpbuf))
-+#endif
-   {
-     snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
-     xsane_back_gtk_error(buf, TRUE);