Refresh/remove patches, set architecture to linux-any

5 files changed, 22 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index cc5c260..dd40392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+simple-scan (3.15.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    - Remove upstream applied 005-keywords_desktop.patch.
+    - Refresh 01-zlib.patch.
+  * debian/control:
+    - Change Architecture to linux-any to prevent build error
+      on systems with no systemd.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 19 Jan 2015 09:43:33 +0100
+
 simple-scan (3.15.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 34b1c0d..4789449 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/simple-scan.git
 
 Package: simple-scan
-Architecture: any
+Architecture: linux-any
 Depends:
  dbus-x11 (>= 1.6),
  adwaita-icon-theme,
@@ -47,7 +47,7 @@ Description: Simple Scanning Utility
 Package: simple-scan-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any
 Depends:
  simple-scan (= ${binary:Version}),
  ${misc:Depends}
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