lp:~noskcaj/ubuntu/trusty/gnome-system-tools/merge
- Get this branch:
- bzr branch lp:~noskcaj/ubuntu/trusty/gnome-system-tools/merge
Branch merges
- Martin Pitt: Needs Fixing
-
Diff: 8011 lines (+154/-7326)53 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/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/-16)
.pc/fix-missing-header-ftbfs-amd64.patch/src/network/connection.c (+0/-927)
.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/underlinking.patch/src/time/Makefile.am (+0/-29)
configure.in (+3/-1)
debian/changelog (+33/-3)
debian/control (+2/-2)
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/patches/underlinking.patch (+0/-18)
debian/rules (+2/-0)
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/privileges-table.c (+0/-1)
src/users/user-profiles.conf.in (+2/-2)
Branch information
- Owner:
- Jackson Doak
- Status:
- Development
Recent revisions
- 121. By Jackson Doak
-
* 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
- remove_g_thread_ init.patch
* Drop underlinking.patch, fixed in debian - 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) - 116. By Lorenzo De Liso
-
debian/
patches/ 97_fix_ setting_ password_ from_random_ entry.patch:
Fix setting password from random entry, patch taken from upstream
(LP: #742598) - 115. By Michael Terry
-
Split time-admin into its own package, gnome-time-admin, so we can
include it in certain flavors but not others. LP: 732757 - 114. By Martin Pitt
-
Add 96_ubuntu_
ntp_pool. patch: Offer Ubuntu specific NTP servers;
pool.ntp.org offers geolocation and automatic QA. Thanks Xavier Robin for
coordinating the setup of the Ubuntu ntp.org pool and preparing the patch!
(LP: #104525)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/trusty/gnome-system-tools