Merge lp://qastaging/~noskcaj/ubuntu/vivid/gnome-system-tools/merge into lp://qastaging/ubuntu/vivid/gnome-system-tools
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Martin Pitt |
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/gnome-system-tools/merge |
Merge into: | lp://qastaging/ubuntu/vivid/gnome-system-tools |
Diff against target: |
9235 lines (+214/-8373) 59 files modified
.pc/01_wait_for_backends.patch/src/common/gst-tool.c (+0/-718) .pc/10_disable_interfaces.patch/interfaces/network.ui (+0/-1817) .pc/10_disable_interfaces.patch/src/network/network-tool.c (+0/-283) .pc/11_dont_show_shares.patch/src/shares/shares.desktop.in.in (+0/-15) .pc/12_fix_exit.patch/src/users/users-tool.c (+0/-304) .pc/25_sambashare_group_definition.patch/src/users/privileges-table.c (+0/-278) .pc/26_user_profiles_conf.patch/src/users/user-profiles.conf.in (+0/-10) .pc/61_outdated_docs.patch/doc/services/Makefile.am (+0/-15) .pc/61_outdated_docs.patch/doc/time/Makefile.am (+0/-18) .pc/62_no_gettext.patch/configure.in (+0/-350) .pc/80_gst-packages-common.patch/src/common/Makefile.am (+0/-28) .pc/80_gst-packages-common.patch/src/common/gst.h (+0/-6) .pc/81_gst-packages-shares-admin.patch/src/shares/shares-tool.c (+0/-240) .pc/82_gst-packages-time-admin.patch/src/time/time-tool.c (+0/-774) .pc/91_shares_services_detection.patch/src/shares/shares-tool.c (+0/-293) .pc/91_shares_services_detection.patch/src/shares/shares-tool.h (+0/-66) .pc/95_timezone_point_selection.patch/src/time/tz-map.c (+0/-432) .pc/96_ubuntu_ntp_pool.patch/src/time/ntp-servers-list.c (+0/-295) .pc/applied-patches (+0/-20) .pc/fix-missing-header-ftbfs-amd64.patch/src/network/connection.c (+0/-927) .pc/gthread.patch/configure.in (+0/-348) .pc/hide_properties.patch/src/users/callbacks.c (+0/-303) .pc/remove_g_thread_init.patch/src/network/main.c (+0/-207) .pc/remove_g_thread_init.patch/src/shares/main.c (+0/-124) .pc/the_admin_group_is_sudo.patch/src/users/user-profiles.conf.in (+0/-10) .pc/the_admin_group_is_sudo.patch/src/users/user-settings.h (+0/-52) .pc/time-libm.patch/src/time/Makefile.am (+0/-29) configure.in (+3/-2) debian/changelog (+50/-0) debian/control (+7/-8) debian/control.in (+6/-7) debian/copyright (+31/-28) debian/patches/50_fix_system_tools_pc.patch (+15/-0) debian/patches/dont-ignore-oobsresult.patch (+19/-0) debian/patches/series (+2/-1) doc/services/Makefile.am (+3/-0) doc/time/Makefile.am (+3/-0) interfaces/network.ui (+2/-2) src/common/Makefile.am (+0/-1) src/common/gst-package.c (+0/-201) src/common/gst-package.h (+0/-35) src/common/gst-tool.c (+0/-7) src/common/gst.h (+0/-1) src/network/connection.c (+0/-1) src/network/main.c (+1/-0) src/network/network-tool.c (+0/-5) src/shares/main.c (+1/-0) src/shares/shares-tool.c (+27/-66) src/shares/shares-tool.h (+1/-0) src/shares/shares.desktop.in.in (+0/-1) src/time/Makefile.am (+1/-1) src/time/ntp-servers-list.c (+27/-6) src/time/time-tool.c (+1/-17) src/time/tz-map.c (+1/-2) src/users/callbacks.c (+3/-8) src/users/privileges-table.c (+0/-1) src/users/user-profiles.conf.in (+2/-2) src/users/user-settings.h (+1/-1) src/users/users-tool.c (+7/-7) |
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/gnome-system-tools/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pitt | Approve | ||
Review via email:
|
Description of the change
Merge from debian
To post a comment you must log in.
This drops 12_fix_exit.patch from debian/ patches/ series, which certainly isn't intended? This looks like a bug in Debian's package.
I uploaded this with putting back the above. Thanks!