Merge lp:~ari-tczew/simple-scan/ubuntu into lp:~ubuntu-desktop/simple-scan/ubuntu

[Artur Rona]

[Dmitry Shachnev (mitya57)]

Thank you, uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-19 02:41:10 +0000
+++ debian/changelog	2015-01-31 19:18:43 +0000
@@ -1,3 +1,33 @@
+simple-scan (3.15.4-1ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control:
+      + Drop Build-Depends on libjpeg-dev and libsqlite3-dev.
+      + Drop Depends on adwaita-icon-theme since it is in universe.
+    - debian/patches/01-zlib.patch:
+      + Dropped, zlib now has a pkg-config file.
+    - debian/source_simple-scan.py:
+      + Add more propietary driver packages to check versions on.
+
+ -- Artur Rona <[e-mail]>  Sat, 31 Jan 2015 19:28:56 +0100
+
+simple-scan (3.15.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    - Remove 005-keywords_desktop.patch, applied upstream.
+    - Refresh 01-zlib.patch.
+  * debian/control:
+    - Change architecture to linux-any since simple-scan build-depends
+      on libgudev-1.0-dev which is part of the systemd source package.
+  * debian/rules:
+    - Remove old style hardening tags.
+    - Remove useless comments.
+  * debian/source/options:
+    - Removed because xz is now standard compression.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Mon, 19 Jan 2015 12:45:02 +0100
+
 simple-scan (3.15.4-0ubuntu1) vivid; urgency=medium
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2014-12-06 22:58:13 +0000
+++ debian/control	2015-01-31 19:18:43 +0000
@@ -23,12 +23,10 @@
  yelp-tools,
  zlib1g-dev (>= 1.2.7)
 Homepage: https://launchpad.net/simple-scan
-Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simple-scan.git
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/simple-scan/ubuntu
 
 Package: simple-scan
-Architecture: any
+Architecture: linux-any
 Depends:
  dbus-x11 (>= 1.6),
  xdg-utils,
@@ -46,7 +44,7 @@
 Package: simple-scan-dbg
 Section: debug
 Priority: extra
-Architecture: any
+Architecture: linux-any
 Depends:
  simple-scan (= ${binary:Version}),
  ${misc:Depends}

=== removed file 'debian/patches/005-keywords_desktop.patch'
--- debian/patches/005-keywords_desktop.patch	2014-11-21 08:48:50 +0000
+++ debian/patches/005-keywords_desktop.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Add _Keywords to .desktop file
-Author: Jörg Frings-Fürst <[e-mail]>
-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;

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-11-21 08:48:50 +0000
+++ debian/patches/series	2015-01-31 19:18:43 +0000
@@ -1,1 +1,1 @@
-005-keywords_desktop.patch
+#005-keywords_desktop.patch

=== modified file 'debian/rules'
--- debian/rules	2014-11-21 08:48:50 +0000
+++ debian/rules	2015-01-31 19:18:43 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f 
+#!/usr/bin/make -f
 
 #
 # 2014-07-22 Jörg Frings-Fürst <[e-mail]>
@@ -6,23 +6,15 @@
 # - enable hardening
 # - install NEWS as upstream changelog
 #
+# 2015-01-19 Jörg Frings-Fürst <[e-mail]>
 #
-
+# - remove old style hardening.
+# - remove useless comments.
 
 #
 # Hardening
 #
-#
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-#export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-#export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-#export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-#export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-#LDFLAGS+=-Wl,--as-needed
 
 %:
 	dh $@ --with=autoreconf,scour

=== removed file 'debian/source/options'
--- debian/source/options	2014-11-21 08:48:50 +0000
+++ debian/source/options	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9