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

Created by Jackson Doak on 2013-12-21 and last modified on 2014-01-20
Get this branch:
bzr branch lp:~noskcaj/ubuntu/trusty/gnome-system-tools/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Jackson Doak
Status:
Development

Recent revisions

123. By Jackson Doak on 2014-01-20

Make transition packages for their removal, delete after trusty

122. By Jackson Doak on 2014-01-19

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

121. By Jackson Doak on 2013-12-21

* 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

120. By Robie Basak on 2013-04-05

d/p/underlinking.patch: add missing -lm to time-admin link to fix FTBFS.

119. By Michael Terry on 2011-12-16

* 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
* 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()

118. By Matthias Klose on 2011-12-05

Fix build error with -Werror=format-security.

117. By Daniel T Chen on 2011-08-30

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 on 2011-03-30

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 on 2011-03-14

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 on 2011-02-08

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
This branch contains Public information 
Everyone can see this information.

Subscribers