summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 12:14:03 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-01-19 12:14:03 +0100
commit3633443938f2dae689c80509281a94e4230eab44 (patch)
treefc1c1026f3ab62b12fc84e7c9f4b4b90ef86d539 /debian/patches
parent4a85dd832e768e0b229d2b6c63c66877c0b22b83 (diff)
Refresh/remove patches, set architecture to linux-any
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/005-keywords_desktop.patch15
-rw-r--r--debian/patches/01-zlib.patch14
-rw-r--r--debian/patches/series2
3 files changed, 8 insertions, 23 deletions
diff --git a/debian/patches/005-keywords_desktop.patch b/debian/patches/005-keywords_desktop.patch
deleted file mode 100644
index 02cb317..0000000
--- a/debian/patches/005-keywords_desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Add _Keywords to .desktop file
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: not-needed
-Last-Update: 2014-08-18
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/data/simple-scan.desktop.in
-===================================================================
---- trunk.orig/data/simple-scan.desktop.in 2013-06-05 08:21:08.000000000 +0200
-+++ trunk/data/simple-scan.desktop.in 2014-08-18 19:31:47.717829473 +0200
-@@ -8,3 +8,4 @@
- StartupNotify=true
- Categories=GNOME;GTK;Graphics;Scanning;
- X-GNOME-Gettext-Domain=simple-scan
-+Keywords=scan;simple;sane;documents;
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch
index 0656f92..9491a70 100644
--- a/debian/patches/01-zlib.patch
+++ b/debian/patches/01-zlib.patch
@@ -1,12 +1,12 @@
Description: add zlib
-Last-Update: 2014-07-19
+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 2014-07-19 15:43:15.000000000 +0200
-+++ trunk/configure.ac 2014-07-19 15:48:14.745109540 +0200
-@@ -38,6 +38,7 @@
+--- trunk.orig/configure.ac
++++ trunk/configure.ac
+@@ -38,6 +38,7 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_c
AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
@@ -16,9 +16,9 @@ Index: trunk/configure.ac
dnl Documentation
Index: trunk/src/Makefile.am
===================================================================
---- trunk.orig/src/Makefile.am 2014-07-19 15:43:15.000000000 +0200
-+++ trunk/src/Makefile.am 2014-07-19 15:47:51.812626560 +0200
-@@ -46,6 +46,7 @@
+--- trunk.orig/src/Makefile.am
++++ trunk/src/Makefile.am
+@@ -47,6 +47,7 @@ simple_scan_LDADD = \
$(SIMPLE_SCAN_LIBS) \
$(COLORD_LIBS) \
-lsane \
diff --git a/debian/patches/series b/debian/patches/series
index 32af344..a5643ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-005-keywords_desktop.patch
+#005-keywords_desktop.patch
01-zlib.patch