summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-03 13:24:44 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-03 13:24:44 +0100
commita1af7af7aa1ebd4d8fd76a1a5c9d8b46a43b53fd (patch)
tree6250291beb0ed0d993132a899167ab05be33bd7b /debian
parent80718a1e12c6eb5429ae84c1d7e78f9bb4a19b14 (diff)
Refresh debian/patches/01-zlib.patch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/01-zlib.patch6
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f13f0a3..f7ea408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+simple-scan (3.19.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release:
+ - Make PackageKit support optional
+ - Add help about quality, brightness, contrast settings
+ - Fix help references to Wikipedia (currently just say Wiki)
+ - Fix SANE capability logging commas
+ * Refresh debian/patches/01-zlib.patch.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 03 Nov 2015 12:11:19 +0100
+
simple-scan (3.18.0-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch
index 9491a70..93916d6 100644
--- a/debian/patches/01-zlib.patch
+++ b/debian/patches/01-zlib.patch
@@ -6,7 +6,7 @@ Index: trunk/configure.ac
===================================================================
--- trunk.orig/configure.ac
+++ trunk/configure.ac
-@@ -38,6 +38,7 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_c
+@@ -43,6 +43,7 @@ AM_CONDITIONAL(HAVE_PACKAGEKIT, test $ha
AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
@@ -18,9 +18,9 @@ Index: trunk/src/Makefile.am
===================================================================
--- trunk.orig/src/Makefile.am
+++ trunk/src/Makefile.am
-@@ -47,6 +47,7 @@ simple_scan_LDADD = \
- $(SIMPLE_SCAN_LIBS) \
+@@ -57,6 +57,7 @@ simple_scan_LDADD = \
$(COLORD_LIBS) \
+ $(PACKAGEKIT_LIBS) \
-lsane \
+ -lz \
-lm