r13564 - in /desktop/unstable/gnome-system-tools/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Nov 25 13:17:05 UTC 2007
Author: joss
Date: Sun Nov 25 13:17:05 2007
New Revision: 13564
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13564
Log:
thanks to Dann Frazier
* New upstream release.
* Drop 02_amd64_fix.patch, integrated upstream.
* Build-depend on libdbus-1-dev and intltool.
* Drop build-depends on libxml2-dev, patchutils, zlib1g-dev,
libpopt-dev, libgnomeui-dev and python.
* Switch to quilt for patch handling; build-depend on quilt.
* Refresh patches to apply cleanly.
* Make gksu a dependency.
Added:
desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch
- copied, changed from r13563, desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.dpatch
desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch
- copied, changed from r13563, desktop/unstable/gnome-system-tools/debian/patches/22_root_only.dpatch
desktop/unstable/gnome-system-tools/debian/patches/series
- copied, changed from r13563, desktop/unstable/gnome-system-tools/debian/patches/00list
Removed:
desktop/unstable/gnome-system-tools/debian/patches/00list
desktop/unstable/gnome-system-tools/debian/patches/02_amd64_fix.patch
desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.dpatch
desktop/unstable/gnome-system-tools/debian/patches/22_root_only.dpatch
Modified:
desktop/unstable/gnome-system-tools/debian/changelog
desktop/unstable/gnome-system-tools/debian/control
desktop/unstable/gnome-system-tools/debian/control.in
desktop/unstable/gnome-system-tools/debian/rules
Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog Sun Nov 25 13:17:05 2007
@@ -1,11 +1,22 @@
-gnome-system-tools (2.18.1-2) UNRELEASED; urgency=low
-
+gnome-system-tools (2.20.0-1) unstable; urgency=low
+
+ [ Niv Sardi ]
* Add 02_amd64_fix.patch that should prevent segfaults on AMD64 arch
- thanks to Dann Frazier
+ thanks to Dann Frazier
(closes: #423867: gnome-system-tools: get_services_tool_new() implicitly converted to pointer)
(closes: #423868: gnome-system-tools: connectino_combo_get_value() implicitly converted to pointer)
- -- Niv Sardi <xaiki at debian.org> Fri, 18 May 2007 21:02:44 +0200
+ [ Josselin Mouette ]
+ * New upstream release.
+ * Drop 02_amd64_fix.patch, integrated upstream.
+ * Build-depend on libdbus-1-dev and intltool.
+ * Drop build-depends on libxml2-dev, patchutils, zlib1g-dev,
+ libpopt-dev, libgnomeui-dev and python.
+ * Switch to quilt for patch handling; build-depend on quilt.
+ * Refresh patches to apply cleanly.
+ * Make gksu a dependency.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 25 Nov 2007 13:54:54 +0100
gnome-system-tools (2.18.1-1) unstable; urgency=low
Modified: desktop/unstable/gnome-system-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control (original)
+++ desktop/unstable/gnome-system-tools/debian/control Sun Nov 25 13:17:05 2007
@@ -2,21 +2,16 @@
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Dafydd Harries <daf at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>,
+Uploaders: Dafydd Harries <daf at debian.org>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>,
Niv Sardi <xaiki at debian.org>
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
- dpatch,
- patchutils,
+ intltool (>= 0.35.0),
+ quilt,
debhelper (>= 5),
libglade2-dev (>= 1:2.5.1-1),
libgnome2-dev (>= 2.10.0-1),
- zlib1g-dev,
- libpopt-dev,
gettext,
- libgnomeui-dev (>= 2.10.0-1),
- python,
- libxml2-dev,
libgconf2-dev (>= 2.10.0-1),
libxml-parser-perl,
gnome-pkg-tools,
@@ -27,16 +22,17 @@
pkg-config,
liboobs-1-dev (>= 2.17.5),
libart-2.0-dev,
- libiw-dev
+ libiw-dev,
+ libdbus-1-dev (>= 0.32)
Standards-Version: 3.7.2
Package: gnome-system-tools
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- perl
-Recommends: gnome-control-center (>= 1:2.10.1-1),
- gksu
+ perl,
+ gksu
+Recommends: gnome-control-center (>= 1:2.10.1-1)
Conflicts: system-tools-backends (<< 2.2)
Suggests: ntp,
samba-common,
Modified: desktop/unstable/gnome-system-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/control.in?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/control.in (original)
+++ desktop/unstable/gnome-system-tools/debian/control.in Sun Nov 25 13:17:05 2007
@@ -6,17 +6,12 @@
Niv Sardi <xaiki at debian.org>
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
- dpatch,
- patchutils,
+ intltool (>= 0.35.0),
+ quilt,
debhelper (>= 5),
libglade2-dev (>= 1:2.5.1-1),
libgnome2-dev (>= 2.10.0-1),
- zlib1g-dev,
- libpopt-dev,
gettext,
- libgnomeui-dev (>= 2.10.0-1),
- python,
- libxml2-dev,
libgconf2-dev (>= 2.10.0-1),
libxml-parser-perl,
gnome-pkg-tools,
@@ -27,16 +22,17 @@
pkg-config,
liboobs-1-dev (>= 2.17.5),
libart-2.0-dev,
- libiw-dev
+ libiw-dev,
+ libdbus-1-dev (>= 0.32)
Standards-Version: 3.7.2
Package: gnome-system-tools
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- perl
-Recommends: gnome-control-center (>= 1:2.10.1-1),
- gksu
+ perl,
+ gksu
+Recommends: gnome-control-center (>= 1:2.10.1-1)
Conflicts: system-tools-backends (<< 2.2)
Suggests: ntp,
samba-common,
Copied: desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch (from r13563, desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.dpatch (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/18_disable_uid.patch Sun Nov 25 13:17:05 2007
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_disable_uid.dpatch by Sebastien Bacher <seb128 at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-system-tools-2.15.3~/src/users/user-settings.c gnome-system-tools-2.15.3/src/users/user-settings.c
---- gnome-system-tools-2.15.3~/src/users/user-settings.c 2006-08-28 03:58:40.000000000 +0200
-+++ gnome-system-tools-2.15.3/src/users/user-settings.c 2006-09-06 12:32:35.000000000 +0200
-@@ -293,6 +293,7 @@
+Index: gnome-system-tools-2.20.0/src/users/user-settings.c
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/users/user-settings.c 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/users/user-settings.c 2007-11-25 14:09:45.965238454 +0100
+@@ -297,6 +297,7 @@ user_settings_dialog_new (OobsUser *user
uid = find_new_uid (GST_USERS_TOOL (tool)->minimum_uid,
GST_USERS_TOOL (tool)->maximum_uid);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), uid);
@@ -16,7 +10,7 @@
setup_profiles_visibility (tool, TRUE);
} else {
g_object_set_data (G_OBJECT (dialog), "is_new", GINT_TO_POINTER (FALSE));
-@@ -309,6 +310,7 @@
+@@ -313,6 +314,7 @@ user_settings_dialog_new (OobsUser *user
widget = gst_dialog_get_widget (tool->main_dialog, "user_settings_uid");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), oobs_user_get_uid (user));
Copied: desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch (from r13563, desktop/unstable/gnome-system-tools/debian/patches/22_root_only.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/22_root_only.dpatch (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/22_root_only.patch Sun Nov 25 13:17:05 2007
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_root_only.dpatch by <martin.pitt at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-system-tools-2.17.3~/src/network/network.desktop.in.in gnome-system-tools-2.17.3/src/network/network.desktop.in.in
---- gnome-system-tools-2.17.3~/src/network/network.desktop.in.in 2006-11-16 13:33:15.000000000 +0100
-+++ gnome-system-tools-2.17.3/src/network/network.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/network/network.desktop.in.in
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/network/network.desktop.in.in 2007-09-14 11:25:28.000000000 +0200
++++ gnome-system-tools-2.20.0/src/network/network.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Network
@@ -17,15 +11,16 @@
Icon=gnome-fs-network
Terminal=false
Type=Application
-@@ -11,4 +11,5 @@
+@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
X-GNOME-Bugzilla-Component=network-admin
X-GNOME-Bugzilla-Version=@VERSION@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-diff -urNad gnome-system-tools-2.17.3~/src/services/services.desktop.in.in gnome-system-tools-2.17.3/src/services/services.desktop.in.in
---- gnome-system-tools-2.17.3~/src/services/services.desktop.in.in 2006-05-27 17:28:45.000000000 +0200
-+++ gnome-system-tools-2.17.3/src/services/services.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/services/services.desktop.in.in
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/services/services.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/services/services.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Services
@@ -35,16 +30,17 @@
Icon=gnome-fs-server
Terminal=false
Type=Application
-@@ -11,4 +11,5 @@
+@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
X-GNOME-Bugzilla-Component=runlevel-admin
X-GNOME-Bugzilla-Version=@VERSION@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-diff -urNad gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c
---- gnome-system-tools-2.17.3~/src/shares/nautilus/nautilus-shares.c 2006-10-02 17:23:26.000000000 +0200
-+++ gnome-system-tools-2.17.3/src/shares/nautilus/nautilus-shares.c 2007-01-03 19:35:23.000000000 +0100
-@@ -82,7 +82,7 @@
+Index: gnome-system-tools-2.20.0/src/shares/nautilus/nautilus-shares.c
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/shares/nautilus/nautilus-shares.c 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/shares/nautilus/nautilus-shares.c 2007-11-25 14:09:50.753511322 +0100
+@@ -82,7 +82,7 @@ on_menu_item_activate (NautilusMenuItem
GString *cmd;
gchar *dir;
@@ -53,9 +49,10 @@
info = g_object_get_data (G_OBJECT (menu_item), "file");
dir = get_path_from_file_info (info);
-diff -urNad gnome-system-tools-2.17.3~/src/shares/shares-tool.c gnome-system-tools-2.17.3/src/shares/shares-tool.c
---- gnome-system-tools-2.17.3~/src/shares/shares-tool.c 2006-11-10 13:51:26.000000000 +0100
-+++ gnome-system-tools-2.17.3/src/shares/shares-tool.c 2007-01-03 19:35:08.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/shares/shares-tool.c
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/shares/shares-tool.c 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/shares/shares-tool.c 2007-11-25 14:09:50.753511322 +0100
@@ -23,6 +23,9 @@
#include <glib/gi18n.h>
#include "gst.h"
@@ -66,7 +63,7 @@
static void gst_shares_tool_class_init (GstSharesToolClass *class);
static void gst_shares_tool_init (GstSharesTool *tool);
static void gst_shares_tool_finalize (GObject *object);
-@@ -50,6 +53,21 @@
+@@ -50,6 +53,21 @@ gst_shares_tool_init (GstSharesTool *too
{
GstTool *gst_tool = GST_TOOL (tool);
@@ -88,7 +85,7 @@
tool->nfs_config = oobs_nfs_config_get (gst_tool->session);
tool->smb_config = oobs_smb_config_get (gst_tool->session);
-@@ -58,6 +76,9 @@
+@@ -58,6 +76,9 @@ gst_shares_tool_init (GstSharesTool *too
tool->ifaces_config = oobs_ifaces_config_get (gst_tool->session);
gst_shares_tool_update_services_availability (tool);
@@ -98,9 +95,10 @@
}
static void
-diff -urNad gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in
---- gnome-system-tools-2.17.3~/src/shares/shares.desktop.in.in 2006-05-27 17:29:09.000000000 +0200
-+++ gnome-system-tools-2.17.3/src/shares/shares.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/shares/shares.desktop.in.in
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/shares/shares.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/shares/shares.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Shared Folders
@@ -110,16 +108,17 @@
Icon=gnome-fs-share
Terminal=false
Type=Application
-@@ -11,5 +11,6 @@
+@@ -11,5 +11,6 @@ X-GNOME-Bugzilla-Product=gnome-system-to
X-GNOME-Bugzilla-Component=shares-admin
X-GNOME-Bugzilla-Version=@VERSION@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-diff -urNad gnome-system-tools-2.17.3~/src/time/time-tool.c gnome-system-tools-2.17.3/src/time/time-tool.c
---- gnome-system-tools-2.17.3~/src/time/time-tool.c 2007-01-03 19:32:57.000000000 +0100
-+++ gnome-system-tools-2.17.3/src/time/time-tool.c 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/time/time-tool.c
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/time/time-tool.c 2007-09-14 11:25:29.000000000 +0200
++++ gnome-system-tools-2.20.0/src/time/time-tool.c 2007-11-25 14:09:50.753511322 +0100
@@ -19,6 +19,8 @@
* Authors: Carlos Garnacho Parro <carlosg at gnome.org>
*/
@@ -129,7 +128,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
-@@ -108,7 +110,25 @@
+@@ -120,7 +122,25 @@ gst_time_tool_init (GstTimeTool *tool)
OobsList *list;
GstTimeToolPrivate *priv = GST_TIME_TOOL_GET_PRIVATE (tool);
@@ -155,9 +154,10 @@
priv->cookie = 0;
tool->time_config = oobs_time_config_get (GST_TOOL (tool)->session);
-diff -urNad gnome-system-tools-2.17.3~/src/time/time.desktop.in.in gnome-system-tools-2.17.3/src/time/time.desktop.in.in
---- gnome-system-tools-2.17.3~/src/time/time.desktop.in.in 2006-11-15 19:50:19.000000000 +0100
-+++ gnome-system-tools-2.17.3/src/time/time.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/time/time.desktop.in.in
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/time/time.desktop.in.in 2007-09-14 11:25:29.000000000 +0200
++++ gnome-system-tools-2.20.0/src/time/time.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Time and Date
@@ -167,15 +167,16 @@
Icon=config-date
Terminal=false
Type=Application
-@@ -11,4 +11,5 @@
+@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
X-GNOME-Bugzilla-Component=time-admin
X-GNOME-Bugzilla-Version=@VERSION@
StartupNotify=true
+X-KDE-SubstituteUID=true
Encoding=UTF-8
-diff -urNad gnome-system-tools-2.17.3~/src/users/users.desktop.in.in gnome-system-tools-2.17.3/src/users/users.desktop.in.in
---- gnome-system-tools-2.17.3~/src/users/users.desktop.in.in 2006-05-27 17:30:28.000000000 +0200
-+++ gnome-system-tools-2.17.3/src/users/users.desktop.in.in 2007-01-03 19:32:58.000000000 +0100
+Index: gnome-system-tools-2.20.0/src/users/users.desktop.in.in
+===================================================================
+--- gnome-system-tools-2.20.0.orig/src/users/users.desktop.in.in 2007-09-14 11:25:27.000000000 +0200
++++ gnome-system-tools-2.20.0/src/users/users.desktop.in.in 2007-11-25 14:09:50.753511322 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Users and Groups
@@ -185,7 +186,7 @@
Icon=config-users
Terminal=false
Type=Application
-@@ -11,4 +11,5 @@
+@@ -11,4 +11,5 @@ X-GNOME-Bugzilla-Product=gnome-system-to
X-GNOME-Bugzilla-Component=users-admin
X-GNOME-Bugzilla-Version=@VERSION@
StartupNotify=true
Copied: desktop/unstable/gnome-system-tools/debian/patches/series (from r13563, desktop/unstable/gnome-system-tools/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/00list (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series Sun Nov 25 13:17:05 2007
@@ -1,2 +1,2 @@
-18_disable_uid.dpatch
-22_root_only.dpatch
+18_disable_uid.patch
+22_root_only.patch
Modified: desktop/unstable/gnome-system-tools/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/rules?rev=13564&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/rules (original)
+++ desktop/unstable/gnome-system-tools/debian/rules Sun Nov 25 13:17:05 2007
@@ -13,9 +13,7 @@
include /usr/share/cdbs/1/class/gnome.mk
# must be included after "autotools" (which is included in "gnome")
-include /usr/share/cdbs/1/rules/dpatch.mk
-# it seems one needs to setup dpatch manually despite the CDBS support
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
LDFLAGS += -Wl,-z,defs -Wl,-O1
More information about the pkg-gnome-commits
mailing list