Simple Scan

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

ubuntu
Merge into ubuntu

Proposed by Artur Rona on 2015-01-08

Status:	Merged
Merge reported by:	Martin Pitt
Merged at revision:	not available
Proposed branch:	lp://qastaging/~ari-tczew/simple-scan/ubuntu
Merge into:	lp://qastaging/~ubuntu-desktop/simple-scan/ubuntu
Diff against target:	48 lines (+22/-2) 2 files modified debian/changelog (+20/-0) debian/copyright (+2/-2)
To merge this branch:	bzr merge lp://qastaging/~ari-tczew/simple-scan/ubuntu
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Martin Pitt	2015-01-08	Approve on 2015-01-09
Ubuntu Sponsors	2015-01-08	Pending
Review via email: mp+245917@code.qastaging.launchpad.net

lp://qastaging/~ari-tczew/simple-scan/ubuntu updated on 2015-01-09

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