Ubuntu
gnome-system-tools package

Merge lp://staging/~noskcaj/ubuntu/trusty/gnome-system-tools/merge into lp://staging/ubuntu/trusty/gnome-system-tools

  1. Trusty (14.04)
  2. merge
  3. Merge into trusty
Proposed by Jackson Doak
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp://staging/~noskcaj/ubuntu/trusty/gnome-system-tools/merge
Merge into: lp://staging/ubuntu/trusty/gnome-system-tools
Diff against target: 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)
To merge this branch: bzr merge lp://staging/~noskcaj/ubuntu/trusty/gnome-system-tools/merge
Reviewer Review Type Date Requested Status
Martin Pitt Needs Fixing
Review via email: mp+199913@code.staging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Artur Rona (ari-tczew) wrote :

Don't forget about merging to https://code.launchpad.net/~ubuntu-desktop/gnome-system-tools/ubuntu as well.

Revision history for this message
Jackson Doak (noskcaj) wrote :

ok

On Mon, Dec 23, 2013 at 12:17 PM, Artur Rona <email address hidden> wrote:

> Don't forget about merging to
> https://code.launchpad.net/~ubuntu-desktop/gnome-system-tools/ubuntu as
> well.
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/trusty/gnome-system-tools/merge/+merge/199913
> You are the owner of lp:~noskcaj/ubuntu/trusty/gnome-system-tools/merge.
>

Revision history for this message
Martin Pitt (pitti) wrote :

- Let's stop splitting out gnome-network-admin and gnome-time-admin. They aren't used any more in Ubuntu, and xubuntu and friends install the complete gnome-system-tools package anyway. Note that this will require some Breaks:/Replaces: and transitional packages, but now in the LTS is a good time as we can drop these after the LTS release.

- Please check the history of gthread.patch and whether it's still necessary. If it builds without, let's drop it. (In particular as remove_g_thread_init.patch drops the g_thread_init() call).

- 80_gst-packages-common.patch: This is still calling synaptic, which we don't install in Ubuntu/Xubuntu/etc. any more., only in lubuntu and Ubuntu Studio still. That might be obsolete?

Thanks!

review: Needs Fixing
Revision history for this message
Martin Pitt (pitti) wrote :

Please set back status to "needs review" when you are done, to make it reappear in the sponsoring queue.

Revision history for this message
Martin Pitt (pitti) wrote :

Oh, and please do this merge against https://code.launchpad.net/~ubuntu-desktop/gnome-system-tools/ubuntu as Vcs-Bzr: says. Closing this MP then.

Unmerged revisions

123. By Jackson Doak

Make transition packages for their removal, delete after trusty

122. By Jackson Doak

No longer split out gnome-time-admin, gnome-network-admin. Not needed

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_definition.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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: