r15261 - in /desktop/experimental/gnome-applets/debian/patches: 09_modemlights_use_new_gst.patch 98_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Mar 17 20:35:57 UTC 2008
Author: slomo
Date: Mon Mar 17 20:35:57 2008
New Revision: 15261
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15261
Log:
* fix patches
Modified:
desktop/experimental/gnome-applets/debian/patches/09_modemlights_use_new_gst.patch
desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
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=15261&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 20:35:57 2008
@@ -1,7 +1,7 @@
-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 @@
+diff -Naur gnome-applets-2.22.0.old/configure.in gnome-applets-2.22.0/configure.in
+--- gnome-applets-2.22.0.old/configure.in 2008-03-10 06:38:15.000000000 +0100
++++ gnome-applets-2.22.0/configure.in 2008-03-17 20:55:09.000000000 +0100
+@@ -25,6 +25,7 @@
LIBGAIL_REQUIRED=1.1.0
LIBXKLAVIER_REQUIRED=2.91
LIBWNCK_REQUIRED=2.9.3
@@ -9,7 +9,7 @@
SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
LIBGNOME_DESKTOP_REQUIRED=2.11.1
LIBNOTIFY_REQUIRED=0.3.2
-@@ -509,25 +510,21 @@
+@@ -523,25 +524,21 @@
dnl *** modemlights applet check ***
dnl ***************************************************************************
@@ -44,23 +44,20 @@
AM_CONDITIONAL(APPLET_MODEMLIGHTS, test "x$BUILD_MODEM_LIGHTS" = "xyes")
dnl ***************************************************************************
-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
-
--INCLUDES = -I. -I$(srcdir) \
-- $(GNOME_APPLETS_CFLAGS) \
-+INCLUDES = -I. -I$(srcdir) \
-+ $(GNOME_APPLETS_CFLAGS) \
-+ $(MODEMLIGHTS_CFLAGS) \
+diff -Naur gnome-applets-2.22.0.old/modemlights/Makefile.am gnome-applets-2.22.0/modemlights/Makefile.am
+--- gnome-applets-2.22.0.old/modemlights/Makefile.am 2007-11-27 09:59:47.000000000 +0100
++++ gnome-applets-2.22.0/modemlights/Makefile.am 2008-03-17 20:55:50.000000000 +0100
+@@ -2,6 +2,7 @@
+
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(MODEMLIGHTS_CFLAGS) \
$(LIBGLADE_CFLAGS)
libexec_PROGRAMS = modem_applet
-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
+diff -Naur gnome-applets-2.22.0.old/modemlights/modem-applet.c gnome-applets-2.22.0/modemlights/modem-applet.c
+--- gnome-applets-2.22.0.old/modemlights/modem-applet.c 2007-11-27 09:59:47.000000000 +0100
++++ gnome-applets-2.22.0/modemlights/modem-applet.c 2008-03-17 21:31:08.000000000 +0100
@@ -1,5 +1,5 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
-/* Copyright (C) 2004 Carlos Garnacho
@@ -69,7 +66,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
-@@ -23,31 +23,13 @@
+@@ -23,31 +23,14 @@
#endif
#include <panel-applet.h>
@@ -83,7 +80,7 @@
-#include <libxml/tree.h>
+#include <oobs/oobs.h>
#include <glade/glade.h>
--
+
-#ifdef __FreeBSD__
-#include <sys/ioctl.h>
-#include <termios.h>
@@ -102,7 +99,7 @@
typedef struct _ModemAppletPrivate ModemAppletPrivate;
struct _ModemAppletPrivate
-@@ -58,47 +40,18 @@
+@@ -58,47 +41,19 @@
GdkPixbuf *icon;
GtkWidget *image;
@@ -139,6 +136,7 @@
- gchar *dev; /* device name */
- gchar *lock_file; /* lock file */
+ /* configuration */
++ OobsSession *session;
+ OobsObject *config;
+ OobsIface *iface;
+ gchar *lock_file;
@@ -156,7 +154,7 @@
};
static void modem_applet_class_init (ModemAppletClass *class);
-@@ -138,8 +92,6 @@
+@@ -138,8 +93,6 @@
gboolean backend_alive,
gboolean already_waiting);
@@ -165,7 +163,7 @@
static const BonoboUIVerb menu_verbs[] = {
BONOBO_UI_UNSAFE_VERB ("Activate", on_modem_applet_activate),
BONOBO_UI_UNSAFE_VERB ("Deactivate", on_modem_applet_deactivate),
-@@ -159,7 +111,6 @@
+@@ -159,7 +112,6 @@
object_class = G_OBJECT_CLASS (class);
applet_class = PANEL_APPLET_CLASS (class);
@@ -173,7 +171,7 @@
object_class->finalize = modem_applet_finalize;
applet_class->change_size = modem_applet_change_size;
-@@ -168,6 +119,43 @@
+@@ -168,6 +120,56 @@
g_type_class_add_private (object_class, sizeof (ModemAppletPrivate));
}
@@ -184,8 +182,15 @@
+ OobsListIter iter;
+ gboolean valid;
+
-+ /* Try the PPP interfaces, which covers both modems and ISDN */
-+ list = oobs_ifaces_config_get_ifaces (config, OOBS_IFACE_TYPE_PPP);
++ /* 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);
+ valid = oobs_list_get_iter_first (list, &iter);
+
+ if (valid)
@@ -198,18 +203,24 @@
+get_lock_file (OobsIface *iface)
+{
+ gchar *lock_file;
-+ const gchar *serial_port, *str;
+
+ if (!iface)
+ return NULL;
+
-+ serial_port = oobs_iface_ppp_get_serial_port (OOBS_IFACE_PPP (iface));
-+
-+ if (serial_port)
++ if (OOBS_IS_IFACE_MODEM (iface))
+ {
-+ str = strchr (serial_port, '/');
-+ lock_file = g_strdup_printf ("/var/lock/LCK..%s", str + 1);
++ 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);
++ }
+ }
++ else if (OOBS_IS_IFACE_ISDN (iface))
++ lock_file = g_strdup ("/var/lock/LCK..capi_0");
+
+ return lock_file;
+}
@@ -217,24 +228,24 @@
static void
modem_applet_init (ModemApplet *applet)
{
-@@ -183,9 +184,9 @@
+@@ -183,9 +185,10 @@
priv->icon_theme = gtk_icon_theme_get_default ();
priv->image = gtk_image_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->config = oobs_ifaces_config_get ();
++ priv->session = oobs_session_get ();
++ priv->config = oobs_ifaces_config_get (priv->session);
+ 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");
-@@ -197,20 +199,8 @@
- pixbuf = gtk_icon_theme_load_icon (priv->icon_theme, "gnome-modem-monitor-applet", 48, 0, NULL);
+@@ -198,19 +201,8 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (priv->report_window_image), pixbuf);
gdk_pixbuf_unref (pixbuf);
--
+
- priv->configured = FALSE;
- priv->enabled = FALSE;
- priv->dev = NULL;
@@ -245,14 +256,13 @@
- priv->directives = NULL;
- priv->directives_id = g_timeout_add (250, (GSourceFunc) dispatch_directives, applet);
- priv->directive_running = FALSE;
-+
priv->tooltip_id = g_timeout_add (1000, (GSourceFunc) update_tooltip, applet);
--
+
- launch_backend (applet, FALSE);
gtk_container_add (GTK_CONTAINER (applet), priv->image);
}
-@@ -221,18 +211,25 @@
+@@ -221,18 +213,24 @@
if (priv)
{
@@ -271,7 +281,6 @@
+ g_source_remove (priv->pulse_id);
+ priv->pulse_id = 0;
+ }
-+
+ if (priv->tooltip_id)
+ {
+ g_source_remove (priv->tooltip_id);
@@ -286,7 +295,7 @@
}
static void
-@@ -287,401 +284,26 @@
+@@ -287,401 +285,27 @@
}
}
@@ -619,7 +628,7 @@
- close (priv->write_fd);
-}
-
--/* functions for extracting the interface information from the XML */
+ /* functions for extracting the interface information from the XML */
static void
update_popup_buttons (ModemApplet *applet)
{
@@ -692,7 +701,7 @@
static gint
get_connection_time (const gchar *lock_file)
{
-@@ -700,30 +322,30 @@
+@@ -700,196 +324,39 @@
gchar *text;
gint t, t1, t2;
@@ -733,17 +742,16 @@
+ t2 = (t - (t1 * 3600 * 24)) / 3600; /* hours */
+ }
-- text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2);
-- }
-+ text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2);
-+ }
+ text = g_strdup_printf (_("Time connected: %.1d:%.2d"), t1, t2);
+ }
}
- else
- text = g_strdup (_("Not connected"));
-
+-
++
gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text);
g_free (text);
-@@ -731,165 +353,8 @@
+
return TRUE;
}
@@ -812,7 +820,7 @@
- update_popup_buttons (applet);
-}
-
- static gboolean
+-static gboolean
-update_info (ModemApplet *applet)
-{
- queue_directive (applet, update_info_callback,
@@ -904,13 +912,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;
-@@ -900,8 +365,8 @@
+@@ -900,8 +367,8 @@
return FALSE;
argv[0] = application;
@@ -921,7 +929,7 @@
argv[3] = NULL;
ret = gdk_spawn_on_screen (screen, NULL, argv, NULL, 0,
-@@ -910,52 +375,48 @@
+@@ -910,52 +377,48 @@
return ret;
}
@@ -1003,7 +1011,7 @@
}
static void
-@@ -963,7 +424,14 @@
+@@ -963,7 +426,14 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1019,7 +1027,7 @@
}
static void
-@@ -971,7 +439,12 @@
+@@ -971,9 +441,15 @@
ModemApplet *applet,
const gchar *verb)
{
@@ -1032,8 +1040,11 @@
+ oobs_object_commit_async (priv->config, on_config_committed, applet);
}
++
static void
-@@ -985,7 +458,7 @@
+ on_modem_applet_properties_clicked (BonoboUIComponent *uic,
+ ModemApplet *applet,
+@@ -985,7 +461,7 @@
screen = gtk_widget_get_screen (GTK_WIDGET (applet));
@@ -1042,9 +1053,9 @@
{
dialog = gtk_message_dialog_new (NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
-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
+diff -Naur gnome-applets-2.22.0.old/modemlights/modemlights.glade gnome-applets-2.22.0/modemlights/modemlights.glade
+--- gnome-applets-2.22.0.old/modemlights/modemlights.glade 2007-11-27 09:59:47.000000000 +0100
++++ gnome-applets-2.22.0/modemlights/modemlights.glade 2008-03-17 21:31:32.000000000 +0100
@@ -2,222 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
Modified: desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch?rev=15261&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/experimental/gnome-applets/debian/patches/98_autoreconf.patch Mon Mar 17 20:35:57 2008
@@ -1,6 +1,6 @@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/docs/Makefile.in gnome-applets-2.22.0/accessx-status/docs/Makefile.in
--- gnome-applets-2.22.0.old/accessx-status/docs/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/docs/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/accessx-status/docs/Makefile.in 2008-03-17 21:34:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -104,7 +104,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/Makefile.in gnome-applets-2.22.0/accessx-status/Makefile.in
--- gnome-applets-2.22.0.old/accessx-status/Makefile.in 2008-03-10 06:54:34.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/Makefile.in 2008-03-17 14:14:46.000000000 +0100
++++ gnome-applets-2.22.0/accessx-status/Makefile.in 2008-03-17 21:34:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -221,7 +221,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/accessx-status/pixmaps/Makefile.in gnome-applets-2.22.0/accessx-status/pixmaps/Makefile.in
--- gnome-applets-2.22.0.old/accessx-status/pixmaps/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/accessx-status/pixmaps/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/accessx-status/pixmaps/Makefile.in 2008-03-17 21:34:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -280,7 +280,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/aclocal.m4 gnome-applets-2.22.0/aclocal.m4
--- gnome-applets-2.22.0.old/aclocal.m4 2008-03-10 06:54:25.000000000 +0100
-+++ gnome-applets-2.22.0/aclocal.m4 2008-03-17 14:14:37.000000000 +0100
++++ gnome-applets-2.22.0/aclocal.m4 2008-03-17 21:34:11.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -16073,7 +16073,7 @@
-m4_include([m4/system-tools-backends.m4])
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/apmlib/Makefile.in gnome-applets-2.22.0/battstat/apmlib/Makefile.in
--- gnome-applets-2.22.0.old/battstat/apmlib/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/apmlib/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/battstat/apmlib/Makefile.in 2008-03-17 21:34:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16179,7 +16179,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/docs/Makefile.in gnome-applets-2.22.0/battstat/docs/Makefile.in
--- gnome-applets-2.22.0.old/battstat/docs/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/docs/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/battstat/docs/Makefile.in 2008-03-17 21:34:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16283,7 +16283,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/Makefile.in gnome-applets-2.22.0/battstat/Makefile.in
--- gnome-applets-2.22.0.old/battstat/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/battstat/Makefile.in 2008-03-17 21:34:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16400,7 +16400,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/battstat/sounds/Makefile.in gnome-applets-2.22.0/battstat/sounds/Makefile.in
--- gnome-applets-2.22.0.old/battstat/sounds/Makefile.in 2008-03-10 06:54:35.000000000 +0100
-+++ gnome-applets-2.22.0/battstat/sounds/Makefile.in 2008-03-17 14:14:47.000000000 +0100
++++ gnome-applets-2.22.0/battstat/sounds/Makefile.in 2008-03-17 21:34:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16459,7 +16459,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/charpick/help/Makefile.in gnome-applets-2.22.0/charpick/help/Makefile.in
--- gnome-applets-2.22.0.old/charpick/help/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/charpick/help/Makefile.in 2008-03-17 14:14:48.000000000 +0100
++++ gnome-applets-2.22.0/charpick/help/Makefile.in 2008-03-17 21:34:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16563,7 +16563,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/charpick/Makefile.in gnome-applets-2.22.0/charpick/Makefile.in
--- gnome-applets-2.22.0.old/charpick/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/charpick/Makefile.in 2008-03-17 14:14:48.000000000 +0100
++++ gnome-applets-2.22.0/charpick/Makefile.in 2008-03-17 21:34:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -16680,7 +16680,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/config.h.in gnome-applets-2.22.0/config.h.in
--- gnome-applets-2.22.0.old/config.h.in 2008-03-10 06:54:29.000000000 +0100
-+++ gnome-applets-2.22.0/config.h.in 2008-03-17 14:14:44.000000000 +0100
++++ gnome-applets-2.22.0/config.h.in 2008-03-17 21:34:20.000000000 +0100
@@ -135,15 +135,9 @@
/* install prefix */
#undef PREFIX
@@ -16699,7 +16699,7 @@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/configure gnome-applets-2.22.0/configure
--- gnome-applets-2.22.0.old/configure 2008-03-10 06:54:29.000000000 +0100
-+++ gnome-applets-2.22.0/configure 2008-03-17 14:14:43.000000000 +0100
++++ gnome-applets-2.22.0/configure 2008-03-17 21:34:19.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -26263,7 +26263,7 @@
X"$mf" : 'X\(//\)[^/]' \| \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/help/Makefile.in gnome-applets-2.22.0/cpufreq/help/Makefile.in
--- gnome-applets-2.22.0.old/cpufreq/help/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/help/Makefile.in 2008-03-17 14:14:48.000000000 +0100
++++ gnome-applets-2.22.0/cpufreq/help/Makefile.in 2008-03-17 21:34:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26367,7 +26367,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/Makefile.in gnome-applets-2.22.0/cpufreq/Makefile.in
--- gnome-applets-2.22.0.old/cpufreq/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/Makefile.in 2008-03-17 14:14:48.000000000 +0100
++++ gnome-applets-2.22.0/cpufreq/Makefile.in 2008-03-17 21:34:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26464,7 +26464,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/pixmaps/Makefile.in gnome-applets-2.22.0/cpufreq/pixmaps/Makefile.in
--- gnome-applets-2.22.0.old/cpufreq/pixmaps/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/pixmaps/Makefile.in 2008-03-17 14:14:48.000000000 +0100
++++ gnome-applets-2.22.0/cpufreq/pixmaps/Makefile.in 2008-03-17 21:34:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26523,7 +26523,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/src/cpufreq-selector/Makefile.in gnome-applets-2.22.0/cpufreq/src/cpufreq-selector/Makefile.in
--- gnome-applets-2.22.0.old/cpufreq/src/cpufreq-selector/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/src/cpufreq-selector/Makefile.in 2008-03-17 14:14:49.000000000 +0100
++++ gnome-applets-2.22.0/cpufreq/src/cpufreq-selector/Makefile.in 2008-03-17 21:34:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26640,7 +26640,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/cpufreq/src/Makefile.in gnome-applets-2.22.0/cpufreq/src/Makefile.in
--- gnome-applets-2.22.0.old/cpufreq/src/Makefile.in 2008-03-10 06:54:36.000000000 +0100
-+++ gnome-applets-2.22.0/cpufreq/src/Makefile.in 2008-03-17 14:14:49.000000000 +0100
++++ gnome-applets-2.22.0/cpufreq/src/Makefile.in 2008-03-17 21:34:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26757,7 +26757,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/depcomp gnome-applets-2.22.0/depcomp
--- gnome-applets-2.22.0.old/depcomp 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/depcomp 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/depcomp 2008-03-17 21:34:34.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -26824,7 +26824,7 @@
# store a dummy comment line, to avoid errors with the Makefile
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/drivemount/help/Makefile.in gnome-applets-2.22.0/drivemount/help/Makefile.in
--- gnome-applets-2.22.0.old/drivemount/help/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/drivemount/help/Makefile.in 2008-03-17 14:14:49.000000000 +0100
++++ gnome-applets-2.22.0/drivemount/help/Makefile.in 2008-03-17 21:34:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -26928,7 +26928,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/drivemount/Makefile.in gnome-applets-2.22.0/drivemount/Makefile.in
--- gnome-applets-2.22.0.old/drivemount/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/drivemount/Makefile.in 2008-03-17 14:14:49.000000000 +0100
++++ gnome-applets-2.22.0/drivemount/Makefile.in 2008-03-17 21:34:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27045,7 +27045,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/docs/Makefile.in gnome-applets-2.22.0/geyes/docs/Makefile.in
--- gnome-applets-2.22.0.old/geyes/docs/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/docs/Makefile.in 2008-03-17 14:14:50.000000000 +0100
++++ gnome-applets-2.22.0/geyes/docs/Makefile.in 2008-03-17 21:34:27.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27149,7 +27149,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/Makefile.in gnome-applets-2.22.0/geyes/Makefile.in
--- gnome-applets-2.22.0.old/geyes/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/Makefile.in 2008-03-17 14:14:49.000000000 +0100
++++ gnome-applets-2.22.0/geyes/Makefile.in 2008-03-17 21:34:27.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27266,7 +27266,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/geyes/themes/Makefile.in gnome-applets-2.22.0/geyes/themes/Makefile.in
--- gnome-applets-2.22.0.old/geyes/themes/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/geyes/themes/Makefile.in 2008-03-17 14:14:50.000000000 +0100
++++ gnome-applets-2.22.0/geyes/themes/Makefile.in 2008-03-17 21:34:27.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27325,7 +27325,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/Makefile.in gnome-applets-2.22.0/gkb-new/Makefile.in
--- gnome-applets-2.22.0.old/gkb-new/Makefile.in 2008-03-10 06:54:37.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/Makefile.in 2008-03-17 14:14:50.000000000 +0100
++++ gnome-applets-2.22.0/gkb-new/Makefile.in 2008-03-17 21:34:27.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27422,7 +27422,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/xmodmap/Makefile.in gnome-applets-2.22.0/gkb-new/xmodmap/Makefile.in
--- gnome-applets-2.22.0.old/gkb-new/xmodmap/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/xmodmap/Makefile.in 2008-03-17 14:14:51.000000000 +0100
++++ gnome-applets-2.22.0/gkb-new/xmodmap/Makefile.in 2008-03-17 21:34:28.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27481,7 +27481,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gkb-new/xmodmap.sun/Makefile.in gnome-applets-2.22.0/gkb-new/xmodmap.sun/Makefile.in
--- gnome-applets-2.22.0.old/gkb-new/xmodmap.sun/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gkb-new/xmodmap.sun/Makefile.in 2008-03-17 14:14:50.000000000 +0100
++++ gnome-applets-2.22.0/gkb-new/xmodmap.sun/Makefile.in 2008-03-17 21:34:28.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27540,7 +27540,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gnome-doc-utils.make gnome-applets-2.22.0/gnome-doc-utils.make
--- gnome-applets-2.22.0.old/gnome-doc-utils.make 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/gnome-doc-utils.make 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/gnome-doc-utils.make 2008-03-17 21:34:02.000000000 +0100
@@ -416,6 +416,11 @@
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
@@ -27588,7 +27588,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gswitchit/help/Makefile.in gnome-applets-2.22.0/gswitchit/help/Makefile.in
--- gnome-applets-2.22.0.old/gswitchit/help/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gswitchit/help/Makefile.in 2008-03-17 14:14:52.000000000 +0100
++++ gnome-applets-2.22.0/gswitchit/help/Makefile.in 2008-03-17 21:34:28.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27692,7 +27692,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gswitchit/Makefile.in gnome-applets-2.22.0/gswitchit/Makefile.in
--- gnome-applets-2.22.0.old/gswitchit/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gswitchit/Makefile.in 2008-03-17 14:14:51.000000000 +0100
++++ gnome-applets-2.22.0/gswitchit/Makefile.in 2008-03-17 21:34:28.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27809,7 +27809,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gweather/docs/Makefile.in gnome-applets-2.22.0/gweather/docs/Makefile.in
--- gnome-applets-2.22.0.old/gweather/docs/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gweather/docs/Makefile.in 2008-03-17 14:14:53.000000000 +0100
++++ gnome-applets-2.22.0/gweather/docs/Makefile.in 2008-03-17 21:34:29.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -27913,7 +27913,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/gweather/Makefile.in gnome-applets-2.22.0/gweather/Makefile.in
--- gnome-applets-2.22.0.old/gweather/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/gweather/Makefile.in 2008-03-17 14:14:53.000000000 +0100
++++ gnome-applets-2.22.0/gweather/Makefile.in 2008-03-17 21:34:29.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28030,7 +28030,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/install-sh gnome-applets-2.22.0/install-sh
--- gnome-applets-2.22.0.old/install-sh 2008-03-10 06:54:34.000000000 +0100
-+++ gnome-applets-2.22.0/install-sh 2008-03-17 14:14:46.000000000 +0100
++++ gnome-applets-2.22.0/install-sh 2008-03-17 21:34:21.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -28395,7 +28395,7 @@
fi
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-extract.in gnome-applets-2.22.0/intltool-extract.in
--- gnome-applets-2.22.0.old/intltool-extract.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-extract.in 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/intltool-extract.in 2008-03-17 21:34:02.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -28444,7 +28444,7 @@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-merge.in gnome-applets-2.22.0/intltool-merge.in
--- gnome-applets-2.22.0.old/intltool-merge.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-merge.in 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/intltool-merge.in 2008-03-17 21:34:02.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -28681,7 +28681,7 @@
close OUTPUT;
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/intltool-update.in gnome-applets-2.22.0/intltool-update.in
--- gnome-applets-2.22.0.old/intltool-update.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/intltool-update.in 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/intltool-update.in 2008-03-17 21:34:02.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -28731,7 +28731,7 @@
return $keywords;
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/data/art/Makefile.in gnome-applets-2.22.0/invest-applet/data/art/Makefile.in
--- gnome-applets-2.22.0.old/invest-applet/data/art/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/data/art/Makefile.in 2008-03-17 14:14:53.000000000 +0100
++++ gnome-applets-2.22.0/invest-applet/data/art/Makefile.in 2008-03-17 21:34:29.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28790,7 +28790,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/data/Makefile.in gnome-applets-2.22.0/invest-applet/data/Makefile.in
--- gnome-applets-2.22.0.old/invest-applet/data/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/data/Makefile.in 2008-03-17 14:14:53.000000000 +0100
++++ gnome-applets-2.22.0/invest-applet/data/Makefile.in 2008-03-17 21:34:29.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28887,7 +28887,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/invest/Makefile.in gnome-applets-2.22.0/invest-applet/invest/Makefile.in
--- gnome-applets-2.22.0.old/invest-applet/invest/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/invest/Makefile.in 2008-03-17 14:14:54.000000000 +0100
++++ gnome-applets-2.22.0/invest-applet/invest/Makefile.in 2008-03-17 21:34:30.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -28946,7 +28946,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/invest-applet/Makefile.in gnome-applets-2.22.0/invest-applet/Makefile.in
--- gnome-applets-2.22.0.old/invest-applet/Makefile.in 2008-03-10 06:54:38.000000000 +0100
-+++ gnome-applets-2.22.0/invest-applet/Makefile.in 2008-03-17 14:14:53.000000000 +0100
++++ gnome-applets-2.22.0/invest-applet/Makefile.in 2008-03-17 21:34:29.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29703,7 +29703,7 @@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/m4/gnome-doc-utils.m4 gnome-applets-2.22.0/m4/gnome-doc-utils.m4
--- gnome-applets-2.22.0.old/m4/gnome-doc-utils.m4 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/m4/gnome-doc-utils.m4 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/m4/gnome-doc-utils.m4 2008-03-17 21:34:02.000000000 +0100
@@ -26,6 +26,10 @@
enable_scrollkeeper=yes)
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
@@ -29717,7 +29717,7 @@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/m4/intltool.m4 gnome-applets-2.22.0/m4/intltool.m4
--- gnome-applets-2.22.0.old/m4/intltool.m4 2008-03-10 06:54:15.000000000 +0100
-+++ gnome-applets-2.22.0/m4/intltool.m4 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/m4/intltool.m4 2008-03-17 21:34:02.000000000 +0100
@@ -87,6 +87,20 @@
AC_SUBST(INTLTOOL_SERVICE_RULE)
AC_SUBST(INTLTOOL_POLICY_RULE)
@@ -29741,7 +29741,7 @@
AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/Makefile.in gnome-applets-2.22.0/Makefile.in
--- gnome-applets-2.22.0.old/Makefile.in 2008-03-10 06:54:42.000000000 +0100
-+++ gnome-applets-2.22.0/Makefile.in 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/Makefile.in 2008-03-17 21:34:34.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29881,7 +29881,7 @@
install-data install-data-am install-dvi install-dvi-am \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/man/Makefile.in gnome-applets-2.22.0/man/Makefile.in
--- gnome-applets-2.22.0.old/man/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/man/Makefile.in 2008-03-17 14:14:54.000000000 +0100
++++ gnome-applets-2.22.0/man/Makefile.in 2008-03-17 21:34:30.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -29940,7 +29940,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/help/Makefile.in gnome-applets-2.22.0/mini-commander/help/Makefile.in
--- gnome-applets-2.22.0.old/mini-commander/help/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/help/Makefile.in 2008-03-17 14:14:54.000000000 +0100
++++ gnome-applets-2.22.0/mini-commander/help/Makefile.in 2008-03-17 21:34:30.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30044,7 +30044,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/Makefile.in gnome-applets-2.22.0/mini-commander/Makefile.in
--- gnome-applets-2.22.0.old/mini-commander/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/Makefile.in 2008-03-17 14:14:54.000000000 +0100
++++ gnome-applets-2.22.0/mini-commander/Makefile.in 2008-03-17 21:34:30.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30141,7 +30141,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mini-commander/src/Makefile.in gnome-applets-2.22.0/mini-commander/src/Makefile.in
--- gnome-applets-2.22.0.old/mini-commander/src/Makefile.in 2008-03-10 06:54:39.000000000 +0100
-+++ gnome-applets-2.22.0/mini-commander/src/Makefile.in 2008-03-17 14:14:54.000000000 +0100
++++ gnome-applets-2.22.0/mini-commander/src/Makefile.in 2008-03-17 21:34:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30269,7 +30269,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mixer/docs/Makefile.in gnome-applets-2.22.0/mixer/docs/Makefile.in
--- gnome-applets-2.22.0.old/mixer/docs/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/mixer/docs/Makefile.in 2008-03-17 14:14:55.000000000 +0100
++++ gnome-applets-2.22.0/mixer/docs/Makefile.in 2008-03-17 21:34:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30373,7 +30373,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/mixer/Makefile.in gnome-applets-2.22.0/mixer/Makefile.in
--- gnome-applets-2.22.0.old/mixer/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/mixer/Makefile.in 2008-03-17 14:14:55.000000000 +0100
++++ gnome-applets-2.22.0/mixer/Makefile.in 2008-03-17 21:34:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30490,7 +30490,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/modemlights/Makefile.in gnome-applets-2.22.0/modemlights/Makefile.in
--- gnome-applets-2.22.0.old/modemlights/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/modemlights/Makefile.in 2008-03-17 14:14:55.000000000 +0100
++++ gnome-applets-2.22.0/modemlights/Makefile.in 2008-03-17 21:34:31.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30556,15 +30556,11 @@
SYSCONFDIR = @SYSCONFDIR@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -333,8 +336,9 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
+@@ -335,6 +338,7 @@
top_srcdir = @top_srcdir@
--INCLUDES = -I. -I$(srcdir) \
-- $(GNOME_APPLETS_CFLAGS) \
-+INCLUDES = -I. -I$(srcdir) \
-+ $(GNOME_APPLETS_CFLAGS) \
-+ $(MODEMLIGHTS_CFLAGS) \
+ INCLUDES = -I. -I$(srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
++ $(MODEMLIGHTS_CFLAGS) \
$(LIBGLADE_CFLAGS)
modem_applet_SOURCES = \
@@ -30619,7 +30615,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/multiload/docs/Makefile.in gnome-applets-2.22.0/multiload/docs/Makefile.in
--- gnome-applets-2.22.0.old/multiload/docs/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/multiload/docs/Makefile.in 2008-03-17 14:14:56.000000000 +0100
++++ gnome-applets-2.22.0/multiload/docs/Makefile.in 2008-03-17 21:34:32.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30723,7 +30719,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/multiload/Makefile.in gnome-applets-2.22.0/multiload/Makefile.in
--- gnome-applets-2.22.0.old/multiload/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/multiload/Makefile.in 2008-03-17 14:14:55.000000000 +0100
++++ gnome-applets-2.22.0/multiload/Makefile.in 2008-03-17 21:34:32.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30840,7 +30836,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/null_applet/Makefile.in gnome-applets-2.22.0/null_applet/Makefile.in
--- gnome-applets-2.22.0.old/null_applet/Makefile.in 2008-03-10 06:54:40.000000000 +0100
-+++ gnome-applets-2.22.0/null_applet/Makefile.in 2008-03-17 14:14:56.000000000 +0100
++++ gnome-applets-2.22.0/null_applet/Makefile.in 2008-03-17 21:34:32.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -30957,7 +30953,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/po/Makefile.in.in gnome-applets-2.22.0/po/Makefile.in.in
--- gnome-applets-2.22.0.old/po/Makefile.in.in 2008-03-10 06:54:14.000000000 +0100
-+++ gnome-applets-2.22.0/po/Makefile.in.in 2008-03-17 14:14:30.000000000 +0100
++++ gnome-applets-2.22.0/po/Makefile.in.in 2008-03-17 21:34:02.000000000 +0100
@@ -1,10 +1,10 @@
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -30983,7 +30979,7 @@
# INTLTOOL_MAKEFILE
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/data/Makefile.in gnome-applets-2.22.0/stickynotes/data/Makefile.in
--- gnome-applets-2.22.0.old/stickynotes/data/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/data/Makefile.in 2008-03-17 14:14:56.000000000 +0100
++++ gnome-applets-2.22.0/stickynotes/data/Makefile.in 2008-03-17 21:34:33.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31042,7 +31038,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/docs/Makefile.in gnome-applets-2.22.0/stickynotes/docs/Makefile.in
--- gnome-applets-2.22.0.old/stickynotes/docs/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/docs/Makefile.in 2008-03-17 14:14:56.000000000 +0100
++++ gnome-applets-2.22.0/stickynotes/docs/Makefile.in 2008-03-17 21:34:33.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31146,7 +31142,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/Makefile.in gnome-applets-2.22.0/stickynotes/Makefile.in
--- gnome-applets-2.22.0.old/stickynotes/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/Makefile.in 2008-03-17 14:14:56.000000000 +0100
++++ gnome-applets-2.22.0/stickynotes/Makefile.in 2008-03-17 21:34:32.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31263,7 +31259,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/stickynotes/pixmaps/Makefile.in gnome-applets-2.22.0/stickynotes/pixmaps/Makefile.in
--- gnome-applets-2.22.0.old/stickynotes/pixmaps/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/stickynotes/pixmaps/Makefile.in 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/stickynotes/pixmaps/Makefile.in 2008-03-17 21:34:33.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31322,7 +31318,7 @@
VERSION = @VERSION@
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/docs/Makefile.in gnome-applets-2.22.0/trashapplet/docs/Makefile.in
--- gnome-applets-2.22.0.old/trashapplet/docs/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/docs/Makefile.in 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/trashapplet/docs/Makefile.in 2008-03-17 21:34:33.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31426,7 +31422,7 @@
fi; \
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/Makefile.in gnome-applets-2.22.0/trashapplet/Makefile.in
--- gnome-applets-2.22.0.old/trashapplet/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/Makefile.in 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/trashapplet/Makefile.in 2008-03-17 21:34:33.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -31523,7 +31519,7 @@
$$tags $$unique
diff -x'*config.sub' -x'*config.guess' -Naur gnome-applets-2.22.0.old/trashapplet/src/Makefile.in gnome-applets-2.22.0/trashapplet/src/Makefile.in
--- gnome-applets-2.22.0.old/trashapplet/src/Makefile.in 2008-03-10 06:54:41.000000000 +0100
-+++ gnome-applets-2.22.0/trashapplet/src/Makefile.in 2008-03-17 14:14:57.000000000 +0100
++++ gnome-applets-2.22.0/trashapplet/src/Makefile.in 2008-03-17 21:34:34.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
More information about the pkg-gnome-commits
mailing list