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

[Jackson Doak]

Merge from debian

[lp:~noskcaj/gnome-system-tools/merge]

71. By Jackson Doak on 2014-01-21

Change to oldlibs and extra

[Martin Pitt (pitti)]

Thanks! Merged with some changelog updates and cleaning up of debian/control.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-15 13:57:46 +0000
+++ debian/changelog	2014-01-21 01:43:18 +0000
@@ -1,3 +1,36 @@
+gnome-system-tools (3.0.0-3ubuntu1) trusty; urgency=medium
+
+  * Merge from Debian, remaining changes:
+    - 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
+   * No longer split out gnome-time-admin, gnome-network-admin. Not needed
+     - Make transition packages for their removal, delete after trusty
+
+ -- Jackson Doak <[e-mail]>  Sat, 21 Dec 2013 13:06:54 +1100
+
+gnome-system-tools (3.0.0-3) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Update repository URL.
+
+  [ Andreas Henriksson ]
+  * Set TARBALL_EXT = tar.bz2 in debian/rules since there are no xz tarball
+    for gnome-system-tools 3.0.0.
+  * Add debian/patches/gthread.patch (Closes: #713720)
+  * Add debian/patches/time-libm.patch
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 03 Oct 2013 23:10:42 +0200
+
 gnome-system-tools (3.0.0-2ubuntu2) raring; urgency=low
 
   * d/p/underlinking.patch: add missing -lm to time-admin link to fix FTBFS.
@@ -1210,6 +1243,3 @@
 
  -- Jose Carlos Garcia Sogo <[e-mail]>  Sun, 05 Aug 2001 11:45:14 +0200
 
-Local variables:
-mode: debian-changelog
-End:

=== modified file 'debian/control'
--- debian/control	2014-01-15 13:57:46 +0000
+++ debian/control	2014-01-21 01:43:18 +0000
@@ -6,8 +6,8 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
-XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Michael Biebl <[e-mail]>,
+XSBC-Original-Maintainer: Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Michael Biebl <[e-mail]>, Sebastian Dröge <[e-mail]>,
            Niv Sardi <[e-mail]>
 Build-Depends: cdbs (>= 0.4.41),
                autotools-dev,
@@ -37,7 +37,9 @@
          system-tools-backends (>= 2.10.1),
          policykit-1-gnome
 Suggests: ntp, gnome-control-center (>= 1:2.10.1-1)
-Replaces: ximian-setup-tools
+Replaces: ximian-setup-tools, gnome-network-admin (<< 3.0.0-3ubuntu1), gnome-time-admin (<< 3.0.0-3ubuntu1)
+Breaks: gnome-network-admin (<< 3.0.0-3ubuntu1), gnome-time-admin (<< 3.0.0-3ubuntu1)
+Provides: gnome-network-admin, gnome-time-admin
 Description: Cross-platform configuration utilities for GNOME
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.
@@ -57,9 +59,10 @@
   - Shares (NFS and Samba)
 
 Package: gnome-network-admin
-Architecture: any
+Section: oldlibs
+Priority: extra
+Architecture: all
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
          gnome-system-tools
 Conflicts: gnome-system-tools (<< 2.29.1-0ubuntu1)
 Replaces: gnome-system-tools (<< 2.29.1-0ubuntu1)
@@ -71,11 +74,14 @@
  .
  This package provides network-admin, a program to specify the way your
  system connects to other computers and to the Internet.
+ .
+ This is a transitional package
 
 Package: gnome-time-admin
-Architecture: any
+Section: oldlibs
+Priority: extra
+Architecture: all
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
          gnome-system-tools
 Conflicts: gnome-system-tools (<< 2.32.0-0ubuntu6)
 Replaces: gnome-system-tools (<< 2.32.0-0ubuntu6)
@@ -87,3 +93,5 @@
  .
  This package provides time-admin, a program to specify the time and date
  of your system.
+ .
+ This is a transitional package
\ No newline at end of file

=== modified file 'debian/control.in'
--- debian/control.in	2011-12-16 22:20:48 +0000
+++ debian/control.in	2014-01-21 01:43:18 +0000
@@ -33,7 +33,9 @@
          system-tools-backends (>= 2.10.1),
          policykit-1-gnome
 Suggests: ntp, gnome-control-center (>= 1:2.10.1-1)
-Replaces: ximian-setup-tools
+Replaces: ximian-setup-tools, gnome-network-admin (<< 3.0.0-3ubuntu1), gnome-time-admin (<< 3.0.0-3ubuntu1)
+Breaks: gnome-network-admin (<< 3.0.0-3ubuntu1), gnome-time-admin (<< 3.0.0-3ubuntu1)
+Provides: gnome-network-admin, gnome-time-admin
 Description: Cross-platform configuration utilities for GNOME
  The GNOME System Tools are a fully integrated set of tools aimed to make easy
  the job that means the computer administration on an UNIX or Linux system.
@@ -53,9 +55,10 @@
   - Shares (NFS and Samba)
 
 Package: gnome-network-admin
-Architecture: any
+Section: oldlibs
+Priority: extra
+Architecture: all
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
          gnome-system-tools
 Conflicts: gnome-system-tools (<< 2.29.1-0ubuntu1)
 Replaces: gnome-system-tools (<< 2.29.1-0ubuntu1)
@@ -67,11 +70,14 @@
  .
  This package provides network-admin, a program to specify the way your
  system connects to other computers and to the Internet.
+ .
+ This is a transitional package
 
 Package: gnome-time-admin
-Architecture: any
+Section: oldlibs
+Priority: extra
+Architecture: all
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
          gnome-system-tools
 Conflicts: gnome-system-tools (<< 2.32.0-0ubuntu6)
 Replaces: gnome-system-tools (<< 2.32.0-0ubuntu6)
@@ -83,3 +89,5 @@
  .
  This package provides time-admin, a program to specify the time and date
  of your system.
+ .
+ This is a transitional package
\ No newline at end of file

=== removed file 'debian/gnome-network-admin.install'
--- debian/gnome-network-admin.install	2009-07-19 22:53:50 +0000
+++ debian/gnome-network-admin.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-debian/pixmaps/network.xpm usr/share/gnome-system-tools/pixmaps/
-debian/tmp/usr/bin/network-admin
-debian/tmp/usr/share/applications/network.desktop
-debian/tmp/usr/share/gnome/help/network-admin
-debian/tmp/usr/share/omf/network-admin

=== removed file 'debian/gnome-network-admin.manpages'
--- debian/gnome-network-admin.manpages	2009-12-14 02:56:13 +0000
+++ debian/gnome-network-admin.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/network-admin.1

=== removed file 'debian/gnome-network-admin.menu'
--- debian/gnome-network-admin.menu	2009-07-19 22:53:50 +0000
+++ debian/gnome-network-admin.menu	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-?package(gnome-network-admin):needs="X11" section="Applications/System/Administration"\
-  hints="Network"\
-  title="Network Admin" command="/usr/bin/network-admin"\
-  icon="/usr/share/gnome-system-tools/pixmaps/network.xpm"

=== modified file 'debian/gnome-system-tools.install'
--- debian/gnome-system-tools.install	2011-03-15 11:51:54 +0000
+++ debian/gnome-system-tools.install	2014-01-21 01:43:18 +0000
@@ -1,17 +1,1 @@
-debian/pixmaps/shares.xpm usr/share/gnome-system-tools/pixmaps/
-debian/pixmaps/users.xpm usr/share/gnome-system-tools/pixmaps/
-debian/tmp/usr/share/glib-2.0/schemas
-debian/tmp/etc/gnome-system-tools
-debian/tmp/usr/bin/shares-admin
-debian/tmp/usr/bin/users-admin
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/share/locale
-debian/tmp/usr/share/icons/hicolor
-debian/tmp/usr/share/omf/services-admin
-debian/tmp/usr/share/omf/users-admin
-debian/tmp/usr/share/omf/shares-admin
-debian/tmp/usr/share/gnome-system-tools
-debian/tmp/usr/share/applications/shares.desktop
-debian/tmp/usr/share/applications/users.desktop
-debian/tmp/usr/share/gnome/help/shares-admin
-debian/tmp/usr/share/gnome/help/users-admin
+debian/pixmaps/*.xpm usr/share/gnome-system-tools/pixmaps/

=== modified file 'debian/gnome-system-tools.manpages'
--- debian/gnome-system-tools.manpages	2011-03-15 11:51:54 +0000
+++ debian/gnome-system-tools.manpages	2014-01-21 01:43:18 +0000
@@ -1,2 +1,5 @@
+debian/network-admin.1
+debian/services-admin.1
 debian/shares-admin.1
+debian/time-admin.1
 debian/users-admin.1

=== modified file 'debian/gnome-system-tools.menu'
--- debian/gnome-system-tools.menu	2011-03-15 11:51:54 +0000
+++ debian/gnome-system-tools.menu	2014-01-21 01:43:18 +0000
@@ -1,4 +1,9 @@
 ?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\
+  hints="Time"\
+  title="Time Admin" command="/usr/bin/time-admin"\
+  icon="/usr/share/gnome-system-tools/pixmaps/time.xpm"
+
+?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\
   hints="Network"\
   title="Shares Admin" command="/usr/bin/shares-admin"\
   icon="/usr/share/gnome-system-tools/pixmaps/shares.xpm"
@@ -7,3 +12,13 @@
   hints="Users"\
   title="User accounts Admin" command="/usr/bin/users-admin"\
   icon="/usr/share/gnome-system-tools/pixmaps/users.xpm"
+
+?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\
+  hints="RunLevel"\
+  title="Services Admin" command="/usr/bin/services-admin"\
+  icon="/usr/share/gnome-system-tools/pixmaps/services.xpm"
+
+?package(gnome-system-tools):needs="X11" section="Applications/System/Administration"\
+  hints="Network"\
+  title="Network Admin" command="/usr/bin/network-admin"\
+  icon="/usr/share/gnome-system-tools/pixmaps/network.xpm"

=== removed file 'debian/gnome-time-admin.install'
--- debian/gnome-time-admin.install	2011-03-15 11:51:54 +0000
+++ debian/gnome-time-admin.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/applications/time.desktop
-debian/pixmaps/time.xpm usr/share/gnome-system-tools/pixmaps/
-debian/tmp/usr/bin/time-admin
-debian/tmp/usr/share/omf/time-admin
-debian/tmp/usr/share/gnome/help/time-admin

=== removed file 'debian/gnome-time-admin.manpages'
--- debian/gnome-time-admin.manpages	2011-03-15 11:51:54 +0000
+++ debian/gnome-time-admin.manpages	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/time-admin.1

=== removed file 'debian/gnome-time-admin.menu'
--- debian/gnome-time-admin.menu	2011-03-15 11:51:54 +0000
+++ debian/gnome-time-admin.menu	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-?package(gnome-time-admin):needs="X11" section="Applications/System/Administration"\
-  hints="Time"\
-  title="Time Admin" command="/usr/bin/time-admin"\
-  icon="/usr/share/gnome-system-tools/pixmaps/time.xpm"

=== modified file 'debian/patches/25_sambashare_group_definition.patch'
--- debian/patches/25_sambashare_group_definition.patch	2010-06-11 06:18:46 +0000
+++ debian/patches/25_sambashare_group_definition.patch	2014-01-21 01:43:18 +0000
@@ -1,11 +1,13 @@
 Description: Add sambashare to known groups
 Author: ?
 
-Index: gnome-system-tools-2.29.3/src/users/privileges-table.c
-===================================================================
---- gnome-system-tools-2.29.3.orig/src/users/privileges-table.c	2010-01-11 18:53:30.000000000 +0000
-+++ gnome-system-tools-2.29.3/src/users/privileges-table.c	2010-02-05 15:50:16.090834805 +0000
-@@ -65,6 +65,7 @@
+---
+ src/users/privileges-table.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/users/privileges-table.c
++++ b/src/users/privileges-table.c
+@@ -67,6 +67,7 @@ static const PrivilegeDescription descri
  	{ "plugdev", N_("Access external storage devices automatically") },
  	{ "powerdev", N_("Suspend and hibernate the computer") },
  	{ "proc", N_("Access /proc filesystem") },

=== modified file 'debian/patches/82_gst-packages-time-admin.patch'
--- debian/patches/82_gst-packages-time-admin.patch	2010-09-01 08:41:57 +0000
+++ debian/patches/82_gst-packages-time-admin.patch	2014-01-21 01:43:18 +0000
@@ -1,11 +1,13 @@
 Description: Install ntp package on demand
 Author: ?
 
-Index: gnome-system-tools-2.31.91/src/time/time-tool.c
-===================================================================
---- gnome-system-tools-2.31.91.orig/src/time/time-tool.c	2010-05-25 03:09:57.000000000 +1000
-+++ gnome-system-tools-2.31.91/src/time/time-tool.c	2010-09-01 18:36:02.102617000 +1000
-@@ -374,6 +374,7 @@
+---
+ src/time/time-tool.c |   18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+--- a/src/time/time-tool.c
++++ b/src/time/time-tool.c
+@@ -370,6 +370,7 @@ check_ntp_support (GstTool  *tool)
  {
  	GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
  	GtkWidget *message, *widget;
@@ -13,7 +15,7 @@
  
  	if (GST_TIME_TOOL (tool)->ntp_service)
  		return TRUE;
-@@ -400,9 +401,24 @@
+@@ -396,9 +397,24 @@ check_ntp_support (GstTool  *tool)
  						  _("Please install and activate NTP support in the system to enable "
  						    "synchronization of your local time server with "
  						    "internet time servers."));

=== added file 'debian/patches/gthread.patch'
--- debian/patches/gthread.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/gthread.patch	2014-01-21 01:43:18 +0000
@@ -0,0 +1,13 @@
+From: Andreas Henriksson <[e-mail]>
+Subject: add gthread to linker flags
+
+--- gnome-system-tools-3.0.0.orig/configure.in
++++ gnome-system-tools-3.0.0/configure.in
+@@ -79,6 +79,7 @@ dnl ====================================
+ PKG_CHECK_MODULES(GST_DEPENDS,[
+ 			   gtk+-3.0 >= $GTK_REQUIRED
+ 			   gmodule-export-2.0
++			   gthread-2.0
+ 			   gio-2.0 >= $GLIB_REQUIRED
+ 			   pango
+ 			   liboobs-1 >= $LIBOOBS_REQUIRED

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-01-15 13:57:46 +0000
+++ debian/patches/series	2014-01-21 01:43:18 +0000
@@ -13,4 +13,5 @@
 96_ubuntu_ntp_pool.patch
 fix-missing-header-ftbfs-amd64.patch
 remove_g_thread_init.patch
-underlinking.patch
+gthread.patch
+time-libm.patch

=== added file 'debian/patches/time-libm.patch'
--- debian/patches/time-libm.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/time-libm.patch	2014-01-21 01:43:18 +0000
@@ -0,0 +1,14 @@
+From: Andreas Henriksson <[e-mail]>
+Subject: using floor should link with libm
+
+--- gnome-system-tools-3.0.0.orig/src/time/Makefile.am
++++ gnome-system-tools-3.0.0/src/time/Makefile.am
+@@ -15,7 +15,7 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CF
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+ 
+-time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
++time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS) -lm
+ time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
+ time_admin_SOURCES = \
+ 	time-tool.c	time-tool.h \

=== modified file 'debian/rules'
--- debian/rules	2011-12-16 22:20:48 +0000
+++ debian/rules	2014-01-21 01:43:18 +0000
@@ -13,6 +13,8 @@
 	--disable-scrollkeeper \
 	--disable-services
 
+TARBALL_EXT = tar.bz2
+
 DEB_DH_MAKESHLIBS_ARGS_gnome-system-tools += --no-act
 
 binary-install/gnome-system-tools::