From 4dfb187ea8ffe6870129bf61bc3ed29fc24c571c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 3 Nov 2015 13:27:25 +0100 Subject: Rename to 0005-zlib.patch --- debian/changelog | 1 + debian/patches/0005-zlib.patch | 28 ++++++++++++++++++++++++++++ debian/patches/01-zlib.patch | 28 ---------------------------- debian/patches/series | 3 +-- 4 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 debian/patches/0005-zlib.patch delete mode 100644 debian/patches/01-zlib.patch diff --git a/debian/changelog b/debian/changelog index f7ea408..e5fea0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ simple-scan (3.19.1-1) UNRELEASED; urgency=medium - Fix help references to Wikipedia (currently just say Wiki) - Fix SANE capability logging commas * Refresh debian/patches/01-zlib.patch. + * Rename debian/patches/01-zlib.patch to debian/patches/0005-zlib.patch. -- Jörg Frings-Fürst Tue, 03 Nov 2015 12:11:19 +0100 diff --git a/debian/patches/0005-zlib.patch b/debian/patches/0005-zlib.patch new file mode 100644 index 0000000..93916d6 --- /dev/null +++ b/debian/patches/0005-zlib.patch @@ -0,0 +1,28 @@ +Description: add zlib +Last-Update: 2015-01-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -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])]) ++AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])]) + + dnl ########################################################################### + dnl Documentation +Index: trunk/src/Makefile.am +=================================================================== +--- trunk.orig/src/Makefile.am ++++ trunk/src/Makefile.am +@@ -57,6 +57,7 @@ simple_scan_LDADD = \ + $(COLORD_LIBS) \ + $(PACKAGEKIT_LIBS) \ + -lsane \ ++ -lz \ + -lm + + CLEANFILES = \ diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch deleted file mode 100644 index 93916d6..0000000 --- a/debian/patches/01-zlib.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: add zlib -Last-Update: 2015-01-19 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/configure.ac -=================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -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])]) -+AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])]) - - dnl ########################################################################### - dnl Documentation -Index: trunk/src/Makefile.am -=================================================================== ---- trunk.orig/src/Makefile.am -+++ trunk/src/Makefile.am -@@ -57,6 +57,7 @@ simple_scan_LDADD = \ - $(COLORD_LIBS) \ - $(PACKAGEKIT_LIBS) \ - -lsane \ -+ -lz \ - -lm - - CLEANFILES = \ diff --git a/debian/patches/series b/debian/patches/series index a5643ae..a71d873 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -#005-keywords_desktop.patch -01-zlib.patch +0005-zlib.patch -- cgit v1.2.3