r15255 - in /desktop/experimental/gnome-applets/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Mar 17 13:12:26 UTC 2008
Author: slomo
Date: Mon Mar 17 13:12:26 2008
New Revision: 15255
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15255
Log:
* New upstream stable release:
+ debian/control.in:
- Update build dependencies and dependencies.
- Drop gnome-applets-dev package, stuff is now in libgweather-dev.
+ debian/patches/*gweather*.patch:
- Dropped, these are now in libgweather.
+ debian/rules,
debian/gnome-applets-dev.install,
debian/gnome-applets.install:
- Drop all remaining parts of the internal libgweather.
Removed:
desktop/experimental/gnome-applets/debian/gnome-applets-dev.install
desktop/experimental/gnome-applets/debian/patches/05_gweather-dist-fixes.patch
desktop/experimental/gnome-applets/debian/patches/06_gweather-dist-files.patch
desktop/experimental/gnome-applets/debian/patches/08_gweather_locations.patch
Modified:
desktop/experimental/gnome-applets/debian/changelog
desktop/experimental/gnome-applets/debian/control
desktop/experimental/gnome-applets/debian/control.in
desktop/experimental/gnome-applets/debian/gnome-applets.install
desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
desktop/experimental/gnome-applets/debian/rules
Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog (original)
+++ desktop/experimental/gnome-applets/debian/changelog Mon Mar 17 13:12:26 2008
@@ -1,12 +1,25 @@
-gnome-applets (2.20.1-3) UNRELEASED; urgency=low
-
+gnome-applets (2.22.0-1) experimental; urgency=low
+
+ [ Josselin Mouette ]
* gnome-keyboard-layout.xml: fix encoding declaration.
Closes: #464678.
* debian/po/nl.po: Dutch translation of Debconf templates, from
Vincent Zweije. Closes: #464447.
* Remove Recommends on imagemagick. Closes: #345093.
- -- Josselin Mouette <joss at debian.org> Sat, 16 Feb 2008 02:15:46 +0100
+ [ Sebastian Dröge ]
+ * New upstream stable release:
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+ - Drop gnome-applets-dev package, stuff is now in libgweather-dev.
+ + debian/patches/*gweather*.patch:
+ - Dropped, these are now in libgweather.
+ + debian/rules,
+ debian/gnome-applets-dev.install,
+ debian/gnome-applets.install:
+ - Drop all remaining parts of the internal libgweather.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 17 Mar 2008 14:01:38 +0100
gnome-applets (2.20.1-2) unstable; urgency=low
Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control (original)
+++ desktop/experimental/gnome-applets/debian/control Mon Mar 17 13:12:26 2008
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.7.3
Build-Depends: cdbs (>= 0.4.41),
autotools-dev,
@@ -10,7 +10,7 @@
patchutils,
type-handling,
libgtk2.0-dev (>= 2.11.0),
- libglib2.0-dev (>= 2.13.0),
+ libglib2.0-dev (>= 2.15.3),
libgnomevfs2-dev (>= 1:2.15.4),
libbonobo2-dev (>= 2.15.0),
libgnome2-dev (>= 2.8.0),
@@ -22,6 +22,7 @@
libglade2-dev (>= 1:2.5.1-1),
libgail-dev (>= 1.1.0),
libwnck-dev (>= 2.9.3),
+ libgweather-dev (>= 2.21.1),
system-tools-backends-dev (>= 1.1.3),
libgnome-desktop-dev (>= 2.11.1),
libnotify-dev (>= 0.3.2),
@@ -34,7 +35,7 @@
gnome-icon-theme (>= 2.15.91),
intltool (>= 0.35.0),
python-dev (>= 2.4),
- libgnome-settings-daemon-dev,
+ gnome-settings-daemon-dev,
libgucharmap-dev (>= 1:1.4.2-1),
xsltproc,
docbook-xsl,
@@ -51,7 +52,7 @@
libxres-dev,
python-support (>= 0.4),
libxml2-dev (>= 2.5.0),
- libgnomekbdui-dev,
+ libgnomekbdui-dev (>= 2.21.4.1),
liboobs-1-dev,
po-debconf
@@ -134,12 +135,3 @@
Description: Various applets for GNOME 2 panel - binary files with debugging symbols
This package contains unstripped binaries used for debugging.
-Package: gnome-applets-dev
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-applets (= ${binary:Version})
-Description: Various applets for GNOME 2 panel - development files
- This package contains development material needed to build extensions for
- some applets.
-
Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in (original)
+++ desktop/experimental/gnome-applets/debian/control.in Mon Mar 17 13:12:26 2008
@@ -10,7 +10,7 @@
patchutils,
type-handling,
libgtk2.0-dev (>= 2.11.0),
- libglib2.0-dev (>= 2.13.0),
+ libglib2.0-dev (>= 2.15.3),
libgnomevfs2-dev (>= 1:2.15.4),
libbonobo2-dev (>= 2.15.0),
libgnome2-dev (>= 2.8.0),
@@ -22,6 +22,7 @@
libglade2-dev (>= 1:2.5.1-1),
libgail-dev (>= 1.1.0),
libwnck-dev (>= 2.9.3),
+ libgweather-dev (>= 2.21.1),
system-tools-backends-dev (>= 1.1.3),
libgnome-desktop-dev (>= 2.11.1),
libnotify-dev (>= 0.3.2),
@@ -34,7 +35,7 @@
gnome-icon-theme (>= 2.15.91),
intltool (>= 0.35.0),
python-dev (>= 2.4),
- libgnome-settings-daemon-dev,
+ gnome-settings-daemon-dev,
libgucharmap-dev (>= 1:1.4.2-1),
xsltproc,
docbook-xsl,
@@ -51,7 +52,7 @@
libxres-dev,
python-support (>= 0.4),
libxml2-dev (>= 2.5.0),
- libgnomekbdui-dev,
+ libgnomekbdui-dev (>= 2.21.4.1),
liboobs-1-dev,
po-debconf
@@ -134,12 +135,3 @@
Description: Various applets for GNOME 2 panel - binary files with debugging symbols
This package contains unstripped binaries used for debugging.
-Package: gnome-applets-dev
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-applets (= ${binary:Version})
-Description: Various applets for GNOME 2 panel - development files
- This package contains development material needed to build extensions for
- some applets.
-
Modified: desktop/experimental/gnome-applets/debian/gnome-applets.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/gnome-applets.install?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/gnome-applets.install (original)
+++ desktop/experimental/gnome-applets/debian/gnome-applets.install Mon Mar 17 13:12:26 2008
@@ -1,3 +1,2 @@
debian/tmp/usr/bin/
debian/tmp/usr/lib/gnome-applets/
-debian/tmp/usr/lib/lib*.so.*
Modified: desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch Mon Mar 17 13:12:26 2008
@@ -1,6 +1,6 @@
-diff -Nur gnome-applets-2.17.1/configure.in gnome-applets-2.17.1.new/configure.in
---- gnome-applets-2.17.1/configure.in 2007-01-02 13:37:33.000000000 +0100
-+++ gnome-applets-2.17.1.new/configure.in 2007-01-06 15:36:07.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/configure.in gnome-applets-2.21.1.new/configure.in
+--- gnome-applets-2.21.1/configure.in 2007-11-18 17:38:50.000000000 +0100
++++ gnome-applets-2.21.1.new/configure.in 2007-11-18 17:39:03.000000000 +0100
@@ -24,6 +24,7 @@
LIBGAIL_REQUIRED=1.1.0
LIBXKLAVIER_REQUIRED=2.91
@@ -44,9 +44,9 @@
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
dnl ***************************************************************************
-diff -Nur gnome-applets-2.17.1/modemlights/Makefile.am gnome-applets-2.17.1.new/modemlights/Makefile.am
---- gnome-applets-2.17.1/modemlights/Makefile.am 2006-12-31 03:16:08.000000000 +0100
-+++ gnome-applets-2.17.1.new/modemlights/Makefile.am 2007-01-06 15:35:28.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/Makefile.am gnome-applets-2.21.1.new/modemlights/Makefile.am
+--- gnome-applets-2.21.1/modemlights/Makefile.am 2007-07-28 04:03:06.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/Makefile.am 2007-11-18 17:39:03.000000000 +0100
@@ -1,7 +1,8 @@
#SUBDIRS = docs
@@ -58,9 +58,9 @@
$(LIBGLADE_CFLAGS)
libexec_PROGRAMS = modem_applet
-diff -Nur gnome-applets-2.17.1/modemlights/modem-applet.c gnome-applets-2.17.1.new/modemlights/modem-applet.c
---- gnome-applets-2.17.1/modemlights/modem-applet.c 2006-12-31 03:16:08.000000000 +0100
-+++ gnome-applets-2.17.1.new/modemlights/modem-applet.c 2007-01-06 15:35:28.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modem-applet.c gnome-applets-2.21.1.new/modemlights/modem-applet.c
+--- gnome-applets-2.21.1/modemlights/modem-applet.c 2007-10-13 11:41:35.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/modem-applet.c 2007-11-18 17:39:03.000000000 +0100
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
@@ -102,9 +102,9 @@
typedef struct _ModemAppletPrivate ModemAppletPrivate;
struct _ModemAppletPrivate
-@@ -59,47 +41,19 @@
+@@ -58,47 +40,18 @@
+ GdkPixbuf *icon;
GtkWidget *image;
- GtkTooltips *tooltips;
- /* auth dialog */
- GtkWidget *auth_dialog;
@@ -139,7 +139,6 @@
- gchar *dev; /* device name */
- gchar *lock_file; /* lock file */
+ /* configuration */
-+ OobsSession *session;
+ OobsObject *config;
+ OobsIface *iface;
+ gchar *lock_file;
@@ -157,7 +156,7 @@
};
static void modem_applet_class_init (ModemAppletClass *class);
-@@ -139,8 +93,6 @@
+@@ -138,8 +92,6 @@
gboolean backend_alive,
gboolean already_waiting);
@@ -166,41 +165,7 @@
static const BonoboUIVerb menu_verbs[] = {
BONOBO_UI_UNSAFE_VERB ("Activate", on_modem_applet_activate),
BONOBO_UI_UNSAFE_VERB ("Deactivate", on_modem_applet_deactivate),
-@@ -150,32 +102,8 @@
- BONOBO_UI_VERB_END
- };
-
--static GType
--modem_applet_get_type (void)
--{
-- static GType type = 0;
-+G_DEFINE_TYPE (ModemApplet, modem_applet, PANEL_TYPE_APPLET);
-
-- if (!type)
-- {
-- static const GTypeInfo info =
-- {
-- sizeof (ModemAppletClass),
-- NULL, /* base_init */
-- NULL, /* base_finalize */
-- (GClassInitFunc) modem_applet_class_init,
-- NULL, /* class_finalize */
-- NULL, /* class_data */
-- sizeof (ModemApplet),
-- 0, /* n_preallocs */
-- (GInstanceInitFunc) modem_applet_init,
-- };
--
-- type = g_type_register_static (PANEL_TYPE_APPLET, "ModemApplet",
-- &info, 0);
-- }
--
-- return type;
--}
-
- static void
- modem_applet_class_init (ModemAppletClass *class)
-@@ -185,7 +113,6 @@
+@@ -159,7 +111,6 @@
object_class = G_OBJECT_CLASS (class);
applet_class = PANEL_APPLET_CLASS (class);
@@ -208,7 +173,7 @@
object_class->finalize = modem_applet_finalize;
applet_class->change_size = modem_applet_change_size;
-@@ -194,6 +121,56 @@
+@@ -168,6 +119,43 @@
g_type_class_add_private (object_class, sizeof (ModemAppletPrivate));
}
@@ -219,15 +184,8 @@
+ OobsListIter iter;
+ gboolean valid;
+
-+ /* First try the modem ifaces */
-+ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_MODEM);
-+ valid = oobs_list_get_iter_first (list, &iter);
-+
-+ if (valid)
-+ return (OobsIface *) oobs_list_get (list, &iter);
-+
-+ /* no modem? try the isdn ifaces */
-+ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_ISDN);
++ /* Try the PPP interfaces, which covers both modems and ISDN */
++ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_PPP);
+ valid = oobs_list_get_iter_first (list, &iter);
+
+ if (valid)
@@ -240,24 +198,18 @@
+get_lock_file (OobsIface *iface)
+{
+ gchar *lock_file;
++ const gchar *serial_port, *str;
+
+ if (!iface)
+ return NULL;
+
-+ if (OOBS_IS_IFACE_MODEM (iface))
++ serial_port = oobs_iface_ppp_get_serial_port (OOBS_IFACE_PPP (iface));
++
++ if (serial_port)
+ {
-+ const gchar *serial_port, *str;
-+
-+ serial_port = oobs_iface_modem_get_serial_port (OOBS_IFACE_MODEM (iface));
-+
-+ if (serial_port)
-+ {
-+ str = strchr (serial_port, '/');
-+ lock_file = g_strdup_printf ("/var/lock/LCK..%s", str + 1);
-+ }
++ str = strchr (serial_port, '/');
++ lock_file = g_strdup_printf ("/var/lock/LCK..%s", str + 1);
+ }
-+ else if (OOBS_IS_IFACE_ISDN (iface))
-+ lock_file = g_strdup ("/var/lock/LCK..capi_0");
+
+ return lock_file;
+}
@@ -265,21 +217,20 @@
static void
modem_applet_init (ModemApplet *applet)
{
-@@ -208,9 +185,10 @@
+@@ -183,9 +184,9 @@
+ priv->icon_theme = gtk_icon_theme_get_default ();
priv->image = gtk_image_new ();
- priv->tooltips = gtk_tooltips_new ();
- priv->auth_dialog = glade_xml_get_widget (priv->xml, "auth_dialog");
- priv->auth_dialog_label = glade_xml_get_widget (priv->xml, "auth_dialog_label");
- priv->auth_dialog_entry = glade_xml_get_widget (priv->xml, "auth_dialog_entry");
-+ priv->session = oobs_session_get ();
-+ priv->config = oobs_ifaces_config_get (priv->session);
++ priv->config = oobs_ifaces_config_get ();
+ priv->iface = get_modem_iface (OOBS_IFACES_CONFIG (priv->config));
+ priv->lock_file = get_lock_file (priv->iface);
priv->report_window = glade_xml_get_widget (priv->xml, "report_window");
priv->report_window_image = glade_xml_get_widget (priv->xml, "report_window_image");
-@@ -222,20 +200,8 @@
+@@ -197,20 +199,8 @@
pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
gdk_pixbuf_unref (pixbuf);
@@ -301,7 +252,7 @@
gtk_container_add (GTK_CONTAINER (applet), priv->image);
}
-@@ -246,18 +212,25 @@
+@@ -221,18 +211,25 @@
if (priv)
{
@@ -312,15 +263,15 @@
+ g_object_unref (priv->xml);
g_object_unref (priv->icon);
+ gtk_widget_destroy (priv->image);
-+
+
+- g_free (priv->dev);
+- g_free (priv->lock_file);
+ if (priv->pulse_id)
+ {
+ g_source_remove (priv->pulse_id);
+ priv->pulse_id = 0;
+ }
-
-- g_free (priv->dev);
-- g_free (priv->lock_file);
++
+ if (priv->tooltip_id)
+ {
+ g_source_remove (priv->tooltip_id);
@@ -335,7 +286,7 @@
}
static void
-@@ -312,401 +285,26 @@
+@@ -287,401 +284,26 @@
}
}
@@ -741,7 +692,7 @@
static gint
get_connection_time (const gchar *lock_file)
{
-@@ -725,30 +323,30 @@
+@@ -700,30 +322,30 @@
gchar *text;
gint t, t1, t2;
@@ -790,9 +741,9 @@
- else
- text = g_strdup (_("Not connected"));
- gtk_tooltips_set_tip(priv->tooltips, GTK_WIDGET (applet), text, NULL);
- g_free(text);
-@@ -756,165 +354,8 @@
+ gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text);
+ g_free (text);
+@@ -731,165 +353,8 @@
return TRUE;
}
@@ -861,7 +812,7 @@
- update_popup_buttons (applet);
-}
-
--static gboolean
+ static gboolean
-update_info (ModemApplet *applet)
-{
- queue_directive (applet, update_info_callback,
@@ -953,13 +904,13 @@
- }
-}
-
- static gboolean
+-static gboolean
-launch_config_tool (GdkScreen *screen, gboolean is_isdn)
+launch_config_tool (GdkScreen *screen, OobsIface *iface)
{
gchar *argv[4], *application;
gboolean ret;
-@@ -925,8 +366,8 @@
+@@ -900,8 +365,8 @@
return FALSE;
argv[0] = application;
@@ -970,7 +921,7 @@
argv[3] = NULL;
ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0,
-@@ -935,52 +376,48 @@
+@@ -910,52 +375,48 @@
return ret;
}
@@ -1052,7 +1003,7 @@
}
static void
-@@ -988,7 +425,14 @@
+@@ -963,7 +424,14 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1068,7 +1019,7 @@
}
static void
-@@ -996,7 +440,12 @@
+@@ -971,7 +439,12 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1082,7 +1033,7 @@
}
static void
-@@ -1010,7 +459,7 @@
+@@ -985,7 +458,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (applet));
@@ -1091,9 +1042,9 @@
{
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
-diff -Nur gnome-applets-2.17.1/modemlights/modemlights.glade gnome-applets-2.17.1.new/modemlights/modemlights.glade
---- gnome-applets-2.17.1/modemlights/modemlights.glade 2006-12-31 03:16:08.000000000 +0100
-+++ gnome-applets-2.17.1.new/modemlights/modemlights.glade 2007-01-06 15:35:28.000000000 +0100
+diff -Nur -x '*.orig' -x '*~' gnome-applets-2.21.1/modemlights/modemlights.glade gnome-applets-2.21.1.new/modemlights/modemlights.glade
+--- gnome-applets-2.21.1/modemlights/modemlights.glade 2007-07-28 04:03:06.000000000 +0200
++++ gnome-applets-2.21.1.new/modemlights/modemlights.glade 2007-11-18 17:39:03.000000000 +0100
@@ -2,222 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
Modified: desktop/experimental/gnome-applets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/rules?rev=15255&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/rules (original)
+++ desktop/experimental/gnome-applets/debian/rules Mon Mar 17 13:12:26 2008
@@ -15,8 +15,6 @@
DEB_INSTALL_MANPAGES_gnome-applets = $(MANPAGES)
DEB_DH_STRIP_ARGS += --dbg-package=gnome-applets-dbg
-
-DEB_DH_MAKESHLIBS_ARGS_gnome-applets += -V 'gnome-applets (>= 2.16)'
# Build manual pages
build/gnome-applets:: $(MANPAGES)
More information about the pkg-gnome-commits
mailing list