Merge lp://staging/~noskcaj/gnome-system-tools/merge into lp://staging/~ubuntu-desktop/gnome-system-tools/ubuntu
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merged at revision: | 70 |
Proposed branch: | lp://staging/~noskcaj/gnome-system-tools/merge |
Merge into: | lp://staging/~ubuntu-desktop/gnome-system-tools/ubuntu |
Diff against target: |
389 lines (+126/-64) 18 files modified
debian/changelog (+33/-3) debian/control (+15/-7) debian/control.in (+13/-5) debian/gnome-network-admin.install (+0/-5) debian/gnome-network-admin.manpages (+0/-1) debian/gnome-network-admin.menu (+0/-4) debian/gnome-system-tools.install (+1/-17) debian/gnome-system-tools.manpages (+3/-0) debian/gnome-system-tools.menu (+15/-0) debian/gnome-time-admin.install (+0/-5) debian/gnome-time-admin.manpages (+0/-1) debian/gnome-time-admin.menu (+0/-4) debian/patches/25_sambashare_group_definition.patch (+7/-5) debian/patches/82_gst-packages-time-admin.patch (+8/-6) debian/patches/gthread.patch (+13/-0) debian/patches/series (+2/-1) debian/patches/time-libm.patch (+14/-0) debian/rules (+2/-0) |
To merge this branch: | bzr merge lp://staging/~noskcaj/gnome-system-tools/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email: mp+202377@code.staging.launchpad.net |
Description of the change
Merge from debian
To post a comment you must log in.
Thanks! Merged with some changelog updates and cleaning up of debian/control.