lp://qastaging/~noskcaj/ubuntu/vivid/gnome-system-tools/merge
- Get this branch:
- bzr branch lp://qastaging/~noskcaj/ubuntu/vivid/gnome-system-tools/merge
Branch merges
- Martin Pitt: Approve
-
Diff: 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)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 126. By Jackson Doak
-
* Merge from Debian, remaining changes:
- debian/rules: Disable services-admin, does not work with upstart.
- Add patches, see patch headers:
+ 10_disable_interfaces. patch
+ 25_sambashare_group_definitio n.patch
+ 26_user_profiles_ conf.patch
+ 80_gst-packages- common. patch
+ 81_gst-packages- shares- admin.patch
+ 82_gst-packages- time-admin. patch
+ 91_shares_services_ detection. patch
+ 95_timezone_point_selection .patch
+ 96_ubuntu_ntp_pool. patch
+ fix-missing-header- ftbfs-amd64. patch
+ remove_g_thread_ init.patch
+ the_admin_group_is_ sudo.patch
+ hide_properties.patch
* New maintainer (Closes: #764266)
* dont-ignore-oobsresult. patch: new patch. Don't ignore OobsResult in a
callback function, show the message dialog instead (Closes: #761824).
* Add 12_fix_exit.patch: Drop unneeded g_object_unref call to fix a
segmentation fault on exit after a new user has been created.
Adjust gst_users_tool_finalize to fix some warnings/error messages
(Closes: #729477).
* debian/control:
- Lower the relations with gnome-control-center to Suggests
(Closes: #753701).
- Bump Standards-Version to 3.9.6 (Fixes lintian warning).
- Remove invalid statements from gnome-system-tools.pc. in (Fixes lintian
error pkg-config-bad-directive) .
- Remove Vcs-* fields due to package adoption, new ones will be added later.
- Remove system-tools-backends from Depends: liboobs depends on it instead.
- Add alternative for policykit-1-gnome: mate-polkit.
* debian/copyright:
- Change to a machine-readable format (for lintian). - 124. By Martin Pitt
-
Add 12_fix_exit.patch: Drop unneeded g_object_unref call to fix a
segmentation fault on exit after a new user has been created. Adjust
gst_users_tool_finalize to fix some warnings/error messages. Thanks
Thaddäus Tintenfisch! (LP: #1185396) - 123. By Sebastien Bacher
-
debian/
patches/ the_admin_ group_is_ sudo.patch: Change no longer used
"admin" group to "sudo", thanks Thaddäus Tintenfisch (LP: #1016932) - 122. By Jackson Doak
-
* Make all files install in gnome-system-tools.
- Regression from 3.0.0-3ubuntu1 - 121. By Jackson Doak
-
* Merge from Debian, remaining changes:
- Drop gnome-control-center to Suggests
- debian/rules: Disable services-admin, does not work with upstart.
- 10_disable_interfaces. patch: gnome-network-admin on UbuntuStudio
doesnt allow to configure either wired networks or wireless. Expose the
connections tab and locations combo box on derivatives that don't use
Network Manager (LP #570828)
- update debian/patches/ 10_disable_ interfaces. patch
- Add patches, see patch headers:
+ 25_sambashare_group_definitio n.patch
+ 26_user_profiles_ conf.patch
+ 80_gst-packages- common. patch
+ 81_gst-packages- shares- admin.patch
+ 82_gst-packages- time-admin. patch
+ 91_shares_services_ detection. patch
+ 95_timezone_point_selection .patch
+ 96_ubuntu_ntp_pool. patch
+ fix-missing-header- ftbfs-amd64. patch
+ remove_g_thread_ init.patch
* Drop underlinking.patch, fixed in debian
* No longer split out gnome-time-admin, gnome-network-admin. Not needed
- Make transition packages for their removal, delete after trusty - 119. By Michael Terry
-
* Merge from Debian, remaining changes:
- Split out gnome-network-admin
- Split out gnome-time-admin
- Drop gnome-control-center to Suggests
- 25_sambashare_group_definitio n.patch
- 26_user_profiles_ conf.patch
- 80_gst-packages- common. patch
- 81_gst-packages- shares- admin.patch
- 82_gst-packages- time-admin. patch
- 91_shares_services_ detection. patch
- 95_timezone_point_selection .patch
- 96_ubuntu_ntp_pool. patch
- fix-missing-header- ftbfs-amd64. patch
* debian/patches/ 80_gst- packages- common. patch,
debian/patches/ 81_gst- packages- shares- admin.patch:
- Update for GTK+ 3
* debian/patches/ 92_fix_ add_needed_ linking. patch,
debian/patches/ 97_fix_ setting_ password_ from_random_ entry.patch:
- Dropped, applied upstream
* debian/patches/ remove_ g_thread_ init.patch:
- Remove obsolete and dropped API g_thread_init() - 117. By Daniel T Chen
-
Add fix-missing-
header- ftbfs-amd64. patch to resolve a missing
header that caused a FTBFS on amd64/ia64. (LP: #766040)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/ubuntu/vivid/gnome-system-tools