Merge lp://qastaging/~noskcaj/file-roller/3.16 into lp://qastaging/~ubuntu-desktop/file-roller/ubuntu
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Merged at revision: | 165 |
| Proposed branch: | lp://qastaging/~noskcaj/file-roller/3.16 |
| Merge into: | lp://qastaging/~ubuntu-desktop/file-roller/ubuntu |
| Diff against target: |
187 lines (+47/-51) 7 files modified
debian/changelog (+33/-0) debian/compat (+1/-1) debian/control (+4/-5) debian/control.in (+3/-4) debian/patches/99_ltmain_as-needed.patch (+0/-35) debian/patches/series (+0/-1) debian/rules (+6/-5) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/file-roller/3.16 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Ancell | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian.
Significant changes:
* Drop the Depends on nautilus-data. It's no longer strictly necessary since
file-roller has been updated to not crash if the nautilus GSettings schema
is not present. This makes file-roller more suitable for non-GNOME
environments, where nautilus is not wanted.
* Drop ltmain patch, dh-autoreconf makes this unneeded
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks Jackson!