From 1ae892c05104bba333dbd0b677e331431b7ea789 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Mon, 16 Aug 2010 14:44:06 +0200
Subject: Update patch.

---
 debian/patches/02-zlib.patch | 60 +++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

(limited to 'debian/patches')

diff --git a/debian/patches/02-zlib.patch b/debian/patches/02-zlib.patch
index c853fc0..fb64fb6 100644
--- a/debian/patches/02-zlib.patch
+++ b/debian/patches/02-zlib.patch
@@ -1,39 +1,25 @@
 ---
- debian/patches/02_zlib.patch |   32 ++++++++++++++++++++++++++++++++
- 1 file changed, 32 insertions(+)
+ configure.ac    |    1 +
+ src/Makefile.am |    1 +
+ 2 files changed, 2 insertions(+)
 
---- /dev/null
-+++ simple-scan/debian/patches/02_zlib.patch
-@@ -0,0 +1,32 @@
-+Index: simple-scan-2.31.4/configure.ac
-+===================================================================
-+--- simple-scan-2.31.4.orig/configure.ac	2010-07-01 10:41:07.647854281 +1000
-++++ simple-scan-2.31.4/configure.ac	2010-07-01 10:41:47.307854280 +1000
-+@@ -30,7 +30,6 @@
-+     gconf-2.0
-+     gmodule-export-2.0
-+     gthread-2.0
-+-    zlib,
-+     cairo
-+     gdk-pixbuf-2.0
-+     cairo-pdf
-+@@ -41,6 +40,7 @@
-+
-+ AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
-+ AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
-++AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
-+ AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
-+
-+ dnl ###########################################################################
-+Index: simple-scan-2.31.4/src/Makefile.am
-+===================================================================
-+--- simple-scan-2.31.4.orig/src/Makefile.am	2010-07-01 10:41:14.017854282 +1000
-++++ simple-scan-2.31.4/src/Makefile.am	2010-07-01 10:41:23.817854281 +1000
-+@@ -30,6 +30,7 @@
-+ 	$(SIMPLE_SCAN_LIBS) \
-+ 	-lsane \
-+ 	-ljpeg \
-++	-lz \
-+ 	-lm
-+
-+ DISTCLEANFILES = \
+--- simple-scan.orig/configure.ac
++++ simple-scan/configure.ac
+@@ -40,6 +40,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
+ 
+ AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
+ AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
++AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
+ AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
+ 
+ dnl ###########################################################################
+--- simple-scan.orig/src/Makefile.am
++++ simple-scan/src/Makefile.am
+@@ -30,6 +30,7 @@ simple_scan_LDADD = \
+ 	$(SIMPLE_SCAN_LIBS) \
+ 	-lsane \
+ 	-ljpeg \
++	-lz \
+ 	-lm
+ 
+ DISTCLEANFILES = \
-- 
cgit v1.2.3