← Back to branch summary

~ubuntu-branches/ubuntu/precise/simple-scan/precise

« back to all changes in this revision

Viewing changes to debian/patches/01-zlib.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-08-22 14:39:00 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20110822143900-mas00fbdm5evsv8a
Tags: 3.1.3-0ubuntu1
* New upstream release.
* debian/control: Update build-deps as per configure.ac: valac (>= 0.13.0),
  GTK 2 → 3, drop libgconf2-dev.
* debian/watch: Look for *.tar.bz2.
* 01-zlib.patch: Update for new upstream version.
* Disable 20-lpi.patch for now, needs porting to vala.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01-zlib.patch
3
3
 src/Makefile.am |    1 +
4
4
 2 files changed, 2 insertions(+)
5
5
 
6
 
--- simple-scan.orig/configure.ac
7
 
+++ simple-scan/configure.ac
8
 
@@ -40,6 +40,7 @@ PKG_CHECK_MODULES(SIMPLE_SCAN, [
 
6
Index: simple-scan-3.1.3/configure.ac
 
7
===================================================================
 
8
--- simple-scan-3.1.3.orig/configure.ac 2011-07-10 12:41:38.000000000 +0200
 
9
+++ simple-scan-3.1.3/configure.ac      2011-08-22 14:44:56.867665060 +0200
 
10
@@ -41,6 +41,7 @@
9
11
 
10
12
 AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
11
13
 AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
13
15
 AC_CHECK_HEADERS([jpeglib.h],[],[AC_MSG_ERROR([libjpeg not found])])
14
16
 
15
17
 dnl ###########################################################################
16
 
--- simple-scan.orig/src/Makefile.am
17
 
+++ simple-scan/src/Makefile.am
18
 
@@ -30,6 +30,7 @@ simple_scan_LDADD = \
19
 
        $(SIMPLE_SCAN_LIBS) \
 
18
Index: simple-scan-3.1.3/src/Makefile.am
 
19
===================================================================
 
20
--- simple-scan-3.1.3.orig/src/Makefile.am      2011-07-10 08:54:52.000000000 +0200
 
21
+++ simple-scan-3.1.3/src/Makefile.am   2011-08-22 14:44:56.867665060 +0200
 
22
@@ -40,6 +40,7 @@
 
23
        $(COLORD_LIBS) \
20
24
        -lsane \
21
25
        -ljpeg \
22
26
+       -lz \
23
27
        -lm
24
28
 
25
 
 DISTCLEANFILES = \
 
29
 CLEANFILES = \