Merge lp://qastaging/~mfisch/ubuntu/saucy/simple-scan/update-to-3.8.0 into lp://qastaging/ubuntu/saucy/simple-scan

Proposed by Matt Fischer
Status: Superseded
Proposed branch: lp://qastaging/~mfisch/ubuntu/saucy/simple-scan/update-to-3.8.0
Merge into: lp://qastaging/ubuntu/saucy/simple-scan
Diff against target: 9943 lines (+5436/-2344)
64 files modified
.pc/.quilt_patches (+0/-1)
.pc/.quilt_series (+0/-1)
.pc/.version (+0/-1)
.pc/01-zlib.patch/configure.ac (+0/-68)
.pc/01-zlib.patch/src/Makefile.am (+0/-50)
.pc/applied-patches (+0/-1)
AUTHORS (+0/-1)
ChangeLog (+0/-1)
INSTALL (+0/-365)
Makefile.am (+2/-1)
Makefile.in (+29/-48)
NEWS (+11/-2)
README (+0/-1)
README.md (+107/-0)
aclocal.m4 (+0/-12)
config.h.in (+0/-67)
configure (+664/-854)
configure.ac (+5/-7)
data/Makefile.in (+2/-3)
data/icons/Makefile.in (+2/-3)
data/org.gnome.SimpleScan.gschema.xml.in (+10/-0)
data/simple-scan.ui (+73/-1)
debian/changelog (+14/-0)
debian/control (+1/-1)
debian/patches/01-zlib.patch (+0/-25)
debian/patches/series (+0/-1)
help/C/adf.page (+37/-3)
help/C/crop.page (+33/-12)
help/C/dpi.page (+44/-2)
help/C/email.page (+6/-3)
help/C/index.page (+9/-1)
help/C/print.page (+17/-1)
help/C/reorder.page (+8/-4)
help/C/rotate.page (+45/-3)
help/C/save.page (+57/-21)
help/C/scanner.page (+5/-4)
help/C/scanning.page (+16/-31)
help/Makefile.in (+2/-3)
help/de/adf.page (+37/-3)
help/de/crop.page (+32/-4)
help/de/dpi.page (+44/-2)
help/de/email.page (+9/-4)
help/de/index.page (+9/-1)
help/de/print.page (+17/-1)
help/de/reorder.page (+8/-4)
help/de/rotate.page (+45/-3)
help/de/save.page (+57/-21)
help/de/scanner.page (+5/-4)
help/de/scanning.page (+16/-27)
src/Makefile.am (+5/-3)
src/Makefile.in (+35/-12)
src/autosave-manager.c (+2156/-0)
src/autosave-manager.vala (+519/-0)
src/book.c (+0/-1)
src/book.vala (+1/-1)
src/config.vapi (+7/-10)
src/page.c (+36/-4)
src/page.vala (+9/-0)
src/scanner.c (+454/-241)
src/scanner.vala (+52/-5)
src/simple-scan.c (+2/-1)
src/simple-scan.vala (+6/-6)
src/ui.c (+616/-380)
src/ui.vala (+60/-3)
To merge this branch: bzr merge lp://qastaging/~mfisch/ubuntu/saucy/simple-scan/update-to-3.8.0
Reviewer Review Type Date Requested Status
Matt Fischer (community) Needs Resubmitting
Robert Ancell (community) Needs Fixing
Ubuntu branches Pending
Review via email: mp+164663@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2013-05-20.

Description of the change

Upgrade to 3.8.0. I was able to drop the only patch remaining. The diff of /debian is here, it is much easier to digest: http://paste.ubuntu.com/5682452/

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks good to me

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Actually, you should copy the updated NEWS information into the changelog and mark bugs as fixes, i.e. from this list:

https://bugs.launchpad.net/ubuntu/+source/simple-scan

review: Needs Fixing
22. By Matt Fischer

updated changelog with fixes listed in NEWS file

Revision history for this message
Matt Fischer (mfisch) wrote :

Updated

review: Needs Resubmitting
23. By Matt Fischer

fixed changelog format

Revision history for this message
Matt Fischer (mfisch) wrote :

Formatting fixed

review: Needs Resubmitting

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: