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

[Artur Rona]

[lp:~ari-tczew/simple-scan/ubuntu]

73. By Robert Ancell on 2014-11-23

* Merge from Debian unstable. (LP: #1394899) Remaining changes:
  - debian/control:
    + Drop Build-Depends on libjpeg-dev and libsqlite3-dev.
  - 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.
* debian/control:
  + Drop Depends on adwaita-icon-theme since it is in universe.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-19 00:28:49 +0000
+++ debian/changelog	2014-11-21 09:09:00 +0000
@@ -1,3 +1,42 @@
+simple-scan (3.15.1-1ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable. (LP: #1394899) Remaining changes:
+    - debian/control:
+      + Drop Build-Depends on libjpeg-dev and libsqlite3-dev.
+    - 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.
+  * debian/control:
+    + Drop Depends on adwaita-icon-theme since it is in universe.
+
+ -- Artur Rona <[e-mail]>  Fri, 21 Nov 2014 10:07:42 +0100
+
+simple-scan (3.15.1-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Updated translations.
+  * debian/simple-scan.bug-script:
+    - Correct typo. (Closes: #764700)
+  * debian/control:
+    - For missing icons gnome-icon-theme-symbolic removed
+      from Depends. (Closes: #761292)
+
+ -- Jörg Frings-Fürst <[e-mail]>  Tue, 28 Oct 2014 09:38:02 +0100
+
+simple-scan (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release:
+    - Version bump.
+  * debian/control:
+    - Replace Depends gnome-icon-theme with
+      gnome-icon-theme-symbolic | adwaita-icon-theme
+      to display missing icons (Closes: #761292).
+      Thanks to Pascal Dormeau <[e-mail]>!
+    - Bump Standards-Version to 3.9.6 (no changes required).
+
+ -- Jörg Frings-Fürst <[e-mail]>  Wed, 24 Sep 2014 16:04:22 +0200
+
 simple-scan (3.14.0-0ubuntu1) utopic; urgency=medium
 
   * New upstream release
@@ -8,6 +47,20 @@
 
  -- Robert Ancell <[e-mail]>  Fri, 19 Sep 2014 12:27:01 +1200
 
+simple-scan (3.13.92-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Updated translations.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Tue, 16 Sep 2014 11:38:05 +0200
+
+simple-scan (3.13.91-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Updated translations.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Sun, 31 Aug 2014 08:37:44 +0200
+
 simple-scan (3.13.91-0ubuntu1) utopic; urgency=medium
 
   * New upstream release:
@@ -18,6 +71,44 @@
 
  -- Robert Ancell <[e-mail]>  Tue, 02 Sep 2014 10:17:24 +1200
 
+simple-scan (3.13.90-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Change Vcs-Browser to cgit.
+  * New debian/patches/015-keywords_desktop.patch:
+    - Add missing Keywords entry to the .desktop file.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Mon, 18 Aug 2014 19:42:34 +0200
+
+simple-scan (3.13.4.2-1) unstable; urgency=medium
+
+  * New maintainer (Closes: #720540).
+  * New upstream release:
+    - Refresh debian/patches/01-zlib.patch
+  * debian/control:
+    - Set myself as maintainer.
+    - Bump Standards-Version to 3.9.5 (no changes required).
+    - Update Build-Depends:
+      + valac <= 0.16 will be removed. Therefore change
+        valac release to >= 0.22 (Closes: #739167, #755204).
+      + Remove unused lsb-release (Closes: #737536).
+    - Add dbus-x11 to Depends for package simple-scan since simple-scan
+      needs dbus even on headless systems (Closes: #750392).
+    - Remove the upstream Vcs-Bzr.
+  * Add debian/source/options:
+    - Set compression to xz & compression-level to 9 to save space.
+  * Add debian/simple-scan.bug-script to automatically add logfiles to
+    bug reports.
+  * debian/copyright:
+    - Add myself to the list of authors for debian/*.
+    - Update copyright years for 2014.
+  * debian/rules:
+    - Enable hardening.
+    - Install NEWS as upstream changelog.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Sat, 19 Jul 2014 11:08:59 +0200
+
 simple-scan (3.13.4.2-0ubuntu1) utopic; urgency=medium
 
   * New upstream release:
@@ -73,6 +164,16 @@
 
  -- Robert Ancell <[e-mail]>  Mon, 28 Apr 2014 12:25:02 +1200
 
+simple-scan (3.12.0-1) unstable; urgency=low
+
+  * QA upload.
+  * Set Maintainer to Debian QA Group.
+  * New upstream release.
+  * Refresh patches.
+  * Drop build dependency on sqlite3, no longer needed.
+
+ -- Alessio Treglia <[e-mail]>  Thu, 10 Apr 2014 15:39:34 +0100
+
 simple-scan (3.12.0-0ubuntu1) trusty; urgency=medium
 
   * New upstream release:
@@ -141,6 +242,15 @@
 
  -- Robert Ancell <[e-mail]>  Fri, 01 Nov 2013 11:51:48 -0700
 
+simple-scan (3.10.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Build-depend on libsqlite3-dev.
+  * Update debian/watch as latest release is being published as XZ file.
+
+ -- Alessio Treglia <[e-mail]>  Sat, 05 Oct 2013 15:33:01 +0100
+
 simple-scan (3.10.0-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
@@ -208,6 +318,15 @@
 
  -- Matthew Fischer <[e-mail]>  Sun, 19 May 2013 20:02:39 -0600
 
+simple-scan (3.6.1-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * New upstream release:
+    - Fix scan no longer working after an ADF scan completes.
+    - Fix erroneous warning about failing to set ADF source.
+
+ -- Alessio Treglia <[e-mail]>  Mon, 13 May 2013 08:59:05 +0100
+
 simple-scan (3.6.1-0ubuntu1) raring; urgency=low
 
   * New upstream bugfix release:

=== modified file 'debian/control'
--- debian/control	2014-09-01 22:17:20 +0000
+++ debian/control	2014-11-21 09:09:00 +0000
@@ -2,10 +2,10 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Alessio Treglia <[e-mail]>
-Standards-Version: 3.9.5
+XSBC-Original-Maintainer: Jörg Frings-Fürst <[e-mail]>
+Standards-Version: 3.9.6
 Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 9),
  dh-autoreconf,
  gnome-common,
  gnome-pkg-tools (>= 0.10),
@@ -17,9 +17,8 @@
  libgtk-3-dev,
  libgudev-1.0-dev,
  libsane-dev,
- lsb-release,
  python-scour,
- valac (>= 0.22.0),
+ valac (>= 0.22),
  yelp-tools,
  zlib1g-dev (>= 1.2.7)
 Homepage: https://launchpad.net/simple-scan
@@ -30,7 +29,7 @@
 Package: simple-scan
 Architecture: any
 Depends:
- gnome-icon-theme,
+ dbus-x11 (>= 1.6),
  xdg-utils,
  ${misc:Depends},
  ${shlibs:Depends}

=== modified file 'debian/copyright'
--- debian/copyright	2012-07-03 02:30:17 +0000
+++ debian/copyright	2014-11-21 09:09:00 +0000
@@ -4,13 +4,14 @@
 Source: https://launchpad.net/simple-scan/+download
 
 Files: *
-Copyright: 2009-2011 Canonical Ltd
+Copyright: 2009-2014 Canonical Ltd
 License: GPL-3+
 
 Files: debian/*
 Copyright:
- 2009-2012, Alessio Treglia <[e-mail]>
- 2009, Robert Ancell <[e-mail]>
+ 2009-2012 Alessio Treglia <[e-mail]>
+ 2009      Robert Ancell <[e-mail]>
+ 2014      Jörg Frings-Fürst <[e-mail]>
 License: GPL-3+
 
 License: GPL-3+

=== modified file 'debian/gbp.conf'
--- debian/gbp.conf	2012-07-03 02:30:17 +0000
+++ debian/gbp.conf	2014-11-21 09:09:00 +0000
@@ -1,2 +1,3 @@
 [DEFAULT]
 pristine-tar = True
+compression = xz

=== added directory 'debian/patches'
=== added file 'debian/patches/005-keywords_desktop.patch'
--- debian/patches/005-keywords_desktop.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/005-keywords_desktop.patch	2014-11-21 09:09:00 +0000
@@ -0,0 +1,15 @@
+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;

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-11-21 09:09:00 +0000
@@ -0,0 +1,1 @@
+005-keywords_desktop.patch

=== modified file 'debian/rules'
--- debian/rules	2013-01-16 05:02:20 +0000
+++ debian/rules	2014-11-21 09:09:00 +0000
@@ -1,11 +1,28 @@
 #!/usr/bin/make -f 
 
-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
+#
+# 2014-07-22 Jörg Frings-Fürst <[e-mail]>
+#
+# - enable hardening
+# - install NEWS as upstream changelog
+#
+#
+
+
+#
+# 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
@@ -33,3 +50,6 @@
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=simple-scan
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS

=== added file 'debian/simple-scan.bug-script'
--- debian/simple-scan.bug-script	1970-01-01 00:00:00 +0000
+++ debian/simple-scan.bug-script	2014-11-21 09:09:00 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+REPORTBUG_VERSION=$(dpkg-query -f '${source:Version}' -W reportbug)
+LOG_FILE='~/.cache/simple-scan/simple-scan.log'
+
+# Depending on whether reportbug is new enough, we either write the output of
+# our various commands to a file and attach them to the report (this needs
+# reportbug ≥ 6.5.0) or just write them to the body of the bug report.
+if dpkg --compare-versions "$REPORTBUG_VERSION" ge "6.5.0"; then
+
+    # We don’t clean up this directory because there is no way to know when
+    # reportbug finished running, and reportbug needs the files around.
+    # Given that those are just a couple of kilobytes in size and people
+    # generally don’t file a lot of bugs, I don’t think it’s a big deal.
+    DIR=$(mktemp -d)
+
+    echo "-- BEGIN ATTACHMENTS --" >&3
+
+    #
+    # logfile
+    #
+    if [ -f ${LOG_FILE} ]; then
+	cat ${LOG_FILE} >$DIR/logfile.user
+	echo $DIR/logfile.user >&3
+    fi
+
+    echo "-- END ATTACHMENTS --" >&3
+fi

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