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

[Artur Rona]

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

76. By Martin Pitt on 2015-01-09

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.
* New upstream release.
* Add year 2015 to debian/copyright.

77. By Martin Pitt on 2015-01-09

releasing package simple-scan version 3.15.3-1ubuntu1

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-06 22:58:13 +0000
+++ debian/changelog	2015-01-08 23:49:20 +0000
@@ -1,3 +1,23 @@
+simple-scan (3.15.3-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]>  Fri, 09 Jan 2015 00:23:18 +0100
+
+simple-scan (3.15.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add year 2015 to debian/copyright.
+
+ -- Jörg Frings-Fürst <[e-mail]>  Mon, 05 Jan 2015 16:08:36 +0100
+
 simple-scan (3.15.2-1ubuntu1) vivid; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'debian/copyright'
--- debian/copyright	2014-11-21 08:48:50 +0000
+++ debian/copyright	2015-01-08 23:49:20 +0000
@@ -4,14 +4,14 @@
 Source: https://launchpad.net/simple-scan/+download
 
 Files: *
-Copyright: 2009-2014 Canonical Ltd
+Copyright: 2009-2015 Canonical Ltd
 License: GPL-3+
 
 Files: debian/*
 Copyright:
  2009-2012 Alessio Treglia <[e-mail]>
  2009      Robert Ancell <[e-mail]>
- 2014      Jörg Frings-Fürst <[e-mail]>
+ 2014-2015 Jörg Frings-Fürst <[e-mail]>
 License: GPL-3+
 
 License: GPL-3+