r30978 - in /desktop/unstable/gnome-system-tools/debian: changelog patches/01_wait_for_backends.patch patches/10_disable_interfaces.patch patches/61_outdated_docs.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat Oct 22 18:11:14 UTC 2011
Author: biebl
Date: Sat Oct 22 18:11:14 2011
New Revision: 30978
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30978
Log:
Refresh patches.
Modified:
desktop/unstable/gnome-system-tools/debian/changelog
desktop/unstable/gnome-system-tools/debian/patches/01_wait_for_backends.patch
desktop/unstable/gnome-system-tools/debian/patches/10_disable_interfaces.patch
desktop/unstable/gnome-system-tools/debian/patches/61_outdated_docs.patch
desktop/unstable/gnome-system-tools/debian/patches/series
Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=30978&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog [utf-8] Sat Oct 22 18:11:14 2011
@@ -21,6 +21,7 @@
* debian/patches/62_no_gettext.patch:
- Don't use both intltool and gettext since newer versions of intltool
conflict with gettext.
+ * Refresh patches.
-- Michael Biebl <biebl at debian.org> Sat, 22 Oct 2011 17:59:33 +0200
Modified: desktop/unstable/gnome-system-tools/debian/patches/01_wait_for_backends.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/01_wait_for_backends.patch?rev=30978&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/01_wait_for_backends.patch [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/01_wait_for_backends.patch [utf-8] Sat Oct 22 18:11:14 2011
@@ -1,6 +1,8 @@
---- a/src/common/gst-tool.c
-+++ b/src/common/gst-tool.c
-@@ -223,6 +223,7 @@
+Index: gnome-system-tools-3.0.0/src/common/gst-tool.c
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/common/gst-tool.c 2011-02-26 18:52:42.000000000 +0100
++++ gnome-system-tools-3.0.0/src/common/gst-tool.c 2011-10-22 18:23:29.742506332 +0200
+@@ -221,6 +221,7 @@
gchar *widget_name;
GtkWidget *dialog;
OobsResult result;
@@ -8,7 +10,7 @@
object = (* G_OBJECT_CLASS (gst_tool_parent_class)->constructor) (type,
n_construct_properties,
-@@ -243,6 +244,12 @@
+@@ -241,6 +242,12 @@
g_free (widget_name);
}
Modified: desktop/unstable/gnome-system-tools/debian/patches/10_disable_interfaces.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/10_disable_interfaces.patch?rev=30978&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/10_disable_interfaces.patch [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/10_disable_interfaces.patch [utf-8] Sat Oct 22 18:11:14 2011
@@ -1,5 +1,7 @@
---- a/interfaces/network.ui
-+++ b/interfaces/network.ui
+Index: gnome-system-tools-3.0.0/interfaces/network.ui
+===================================================================
+--- gnome-system-tools-3.0.0.orig/interfaces/network.ui 2011-10-22 19:42:20.567031813 +0200
++++ gnome-system-tools-3.0.0/interfaces/network.ui 2011-10-22 19:42:47.846688861 +0200
@@ -86,147 +86,10 @@
<property name="border_width">6</property>
<property name="spacing">12</property>
@@ -148,10 +150,12 @@
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="border_width">12</property>
---- a/configure.in
-+++ b/configure.in
-@@ -285,23 +285,6 @@
- dnl END: GIO
+Index: gnome-system-tools-3.0.0/configure.in
+===================================================================
+--- gnome-system-tools-3.0.0.orig/configure.in 2011-10-22 19:42:20.543032116 +0200
++++ gnome-system-tools-3.0.0/configure.in 2011-10-22 19:42:47.846688861 +0200
+@@ -251,23 +251,6 @@
+ dnl END: GST_LIBS & GST_FLAGS
dnl ==================================
-dnl ==================================
@@ -174,8 +178,10 @@
dnl ===========================
dnl NAUTILUS EXTENSION
dnl ===========================
---- a/src/network/Makefile.am
-+++ b/src/network/Makefile.am
+Index: gnome-system-tools-3.0.0/src/network/Makefile.am
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/Makefile.am 2011-10-22 19:42:20.471033021 +0200
++++ gnome-system-tools-3.0.0/src/network/Makefile.am 2011-10-22 19:42:47.846688861 +0200
@@ -15,23 +15,14 @@
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -201,8 +207,10 @@
hosts.c hosts.h \
main.c
---- a/src/network/callbacks.c
-+++ b/src/network/callbacks.c
+Index: gnome-system-tools-3.0.0/src/network/callbacks.c
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/callbacks.c 2011-10-22 19:42:20.511032518 +0200
++++ gnome-system-tools-3.0.0/src/network/callbacks.c 2011-10-22 19:52:22.879459722 +0200
@@ -22,294 +22,11 @@
#include "gst.h"
@@ -460,12 +468,12 @@
- dialog = network_tool->dialog;
-
- /* give some feedback to let know the user that the tool is busy */
-- gtk_entry_set_text (GTK_ENTRY (GTK_BIN (GTK_COMBO_BOX (dialog->serial_port))->child), "");
+- gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GTK_COMBO_BOX (dialog->serial_port)))), "");
- gtk_widget_set_sensitive (dialog->serial_port, FALSE);
- gtk_widget_set_sensitive (dialog->detect_modem, FALSE);
-
- cursor = gdk_cursor_new (GDK_WATCH);
-- gdk_window_set_cursor (GTK_WIDGET (dialog->dialog)->window, cursor);
+- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (dialog->dialog)), cursor);
- gdk_cursor_unref (cursor);
-
- dev = connection_detect_modem ();
@@ -473,7 +481,7 @@
- /* remove the user feedback */
- gtk_widget_set_sensitive (dialog->detect_modem, TRUE);
- gtk_widget_set_sensitive (dialog->serial_port, TRUE);
-- gdk_window_set_cursor (GTK_WIDGET (dialog->dialog)->window, NULL);
+- gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (dialog->dialog)), NULL);
-
- if (!dev || !*dev)
- {
@@ -491,7 +499,7 @@
- gtk_widget_destroy (d);
- }
- else
-- gtk_entry_set_text (GTK_ENTRY (GTK_BIN (GTK_COMBO_BOX (dialog->serial_port))->child), dev);
+- gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (GTK_COMBO_BOX (dialog->serial_port)))), dev);
-
- g_free (dev);
-}
@@ -563,8 +571,10 @@
on_entry_changed (GtkWidget *widget, gpointer data)
{
g_object_set_data (G_OBJECT (widget), "content-changed", GINT_TO_POINTER (TRUE));
---- a/src/network/callbacks.h
-+++ b/src/network/callbacks.h
+Index: gnome-system-tools-3.0.0/src/network/callbacks.h
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/callbacks.h 2011-10-22 19:42:20.483032869 +0200
++++ gnome-system-tools-3.0.0/src/network/callbacks.h 2011-10-22 19:42:47.854688761 +0200
@@ -30,19 +30,6 @@
GtkWidget *popup;
};
@@ -600,8 +610,10 @@
void on_entry_changed (GtkWidget *widget,
gpointer data);
gboolean on_hostname_focus_out (GtkWidget *widget,
---- a/src/network/main.c
-+++ b/src/network/main.c
+Index: gnome-system-tools-3.0.0/src/network/main.c
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/main.c 2011-10-22 19:42:20.491032769 +0200
++++ gnome-system-tools-3.0.0/src/network/main.c 2011-10-22 19:42:47.854688761 +0200
@@ -27,14 +27,11 @@
#include "gst.h"
@@ -759,8 +771,10 @@
gtk_main ();
return 0;
---- a/src/network/network-tool.c
-+++ b/src/network/network-tool.c
+Index: gnome-system-tools-3.0.0/src/network/network-tool.c
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/network-tool.c 2011-10-22 19:42:20.455033222 +0200
++++ gnome-system-tools-3.0.0/src/network/network-tool.c 2011-10-22 19:42:47.854688761 +0200
@@ -22,11 +22,8 @@
#include <glib/gi18n.h>
#include "gst.h"
@@ -875,8 +889,10 @@
}
GstTool*
---- a/src/network/network-tool.h
-+++ b/src/network/network-tool.h
+Index: gnome-system-tools-3.0.0/src/network/network-tool.h
+===================================================================
+--- gnome-system-tools-3.0.0.orig/src/network/network-tool.h 2011-10-22 19:42:20.531032266 +0200
++++ gnome-system-tools-3.0.0/src/network/network-tool.h 2011-10-22 19:42:47.854688761 +0200
@@ -26,8 +26,7 @@
#include <gtk/gtk.h>
#include <dbus/dbus.h>
Modified: desktop/unstable/gnome-system-tools/debian/patches/61_outdated_docs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/61_outdated_docs.patch?rev=30978&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/61_outdated_docs.patch [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/61_outdated_docs.patch [utf-8] Sat Oct 22 18:11:14 2011
@@ -1,22 +1,22 @@
-Index: gnome-system-tools-2.30.1/doc/services/Makefile.am
+Index: gnome-system-tools-3.0.0/doc/services/Makefile.am
===================================================================
---- gnome-system-tools-2.30.1.orig/doc/services/Makefile.am 2009-09-21 14:59:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/services/Makefile.am 2010-05-05 17:11:36.396894331 +0200
+--- gnome-system-tools-3.0.0.orig/doc/services/Makefile.am 2010-12-12 13:16:01.000000000 +0100
++++ gnome-system-tools-3.0.0/doc/services/Makefile.am 2011-10-22 18:34:38.094104015 +0200
@@ -9,7 +9,4 @@
- DOC_LINGUAS = ca cs de el en_GB es fr oc pl pt_BR sv it zh_CN
+ DOC_LINGUAS = ca cs de el en_GB es fr gl oc pl pt_BR sl sv it zh_CN
-# this isn't still ported to gnome-doc-utils
-SUBDIRS = nl
-
-include $(top_srcdir)/git.mk
-Index: gnome-system-tools-2.30.1/doc/time/Makefile.am
+Index: gnome-system-tools-3.0.0/doc/time/Makefile.am
===================================================================
---- gnome-system-tools-2.30.1.orig/doc/time/Makefile.am 2010-05-05 17:11:55.132891988 +0200
-+++ gnome-system-tools-2.30.1/doc/time/Makefile.am 2010-05-05 17:12:05.624896571 +0200
+--- gnome-system-tools-3.0.0.orig/doc/time/Makefile.am 2010-12-12 13:16:01.000000000 +0100
++++ gnome-system-tools-3.0.0/doc/time/Makefile.am 2011-10-22 18:34:38.094104015 +0200
@@ -12,7 +12,4 @@
- DOC_LINGUAS = ca cs de el en_GB es fr it oc pt_BR ru sv zh_CN
+ DOC_LINGUAS = ca cs de el en_GB es fr gl it oc pt_BR ru sl sv zh_CN
-# This isn't still ported to gnome-doc-utils
-SUBDIRS = nl
Modified: desktop/unstable/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=30978&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series [utf-8] Sat Oct 22 18:11:14 2011
@@ -1,5 +1,5 @@
01_wait_for_backends.patch
-#10_disable_interfaces.patch
+10_disable_interfaces.patch
11_dont_show_shares.patch
61_outdated_docs.patch
62_no_gettext.patch
More information about the pkg-gnome-commits
mailing list