Merge lp://staging/~osomon/gconf/merge_3.2.6-4 into lp://staging/~ubuntu-desktop/gconf/ubuntu
Proposed by
Olivier Tilloy
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 119 |
| Merged at revision: | 119 |
| Proposed branch: | lp://staging/~osomon/gconf/merge_3.2.6-4 |
| Merge into: | lp://staging/~ubuntu-desktop/gconf/ubuntu |
| Diff against target: |
279 lines (+100/-34) 10 files modified
debian/changelog (+59/-0) debian/control (+7/-7) debian/control.in (+6/-6) debian/copyright (+1/-2) debian/default.path.md5sum (+0/-2) debian/patches/02_fix_wrong_return_value.patch (+4/-6) debian/patches/25_gconf-path-max-hurd.patch (+4/-8) debian/rules (+0/-1) debian/update-gconf-defaults (+16/-0) debian/watch (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~osomon/gconf/merge_3.2.6-4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from Debian unstable.
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 & good work! I got slightly confused by the autoreconf rules deleted from debian/rules but it looks like it was a duplicate and the change is right, usually we would mention that in the changelog summary (like a "debian/rules: removed duplicated rules from the Ubuntu delta")