r16816 - in /desktop/unstable/gnome-applets/debian: changelog patches/02_trashapplet_2.20.patch patches/98_autoreconf.patch patches/series po/ja.po
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Aug 29 09:05:44 UTC 2008
Author: joss
Date: Fri Aug 29 09:05:44 2008
New Revision: 16816
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16816
Log:
* 02_trashapplet_2.20.patch: revert the trashapplet code to 2.20,
using GnomeVFS, as we don't want a dependency on gvfs-backends just
for the trash. Needs revert post-lenny. Closes: #481762.
* 98_autoreconf.patch: updated accordingly.
* ja.po: updated Japanese translation from Hideki Yamane.
Closes: #494094.
Added:
desktop/unstable/gnome-applets/debian/patches/02_trashapplet_2.20.patch
Modified:
desktop/unstable/gnome-applets/debian/changelog
desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
desktop/unstable/gnome-applets/debian/patches/series
desktop/unstable/gnome-applets/debian/po/ja.po
Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=16816&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog (original)
+++ desktop/unstable/gnome-applets/debian/changelog Fri Aug 29 09:05:44 2008
@@ -1,4 +1,4 @@
-gnome-applets (2.22.3-3) UNRELEASED; urgency=low
+gnome-applets (2.22.3-3) unstable; urgency=low
[ Josselin Mouette ]
* ro.po: updated Romanian translation from Eddy Petrișor.
@@ -9,7 +9,15 @@
battstat doesn't build under GNU/kFreeBSD; thanks Petr Salinger;
closes: #494301.
- -- Josselin Mouette <joss at debian.org> Wed, 23 Jul 2008 16:08:50 +0200
+ [ Josselin Mouette ]
+ * 02_trashapplet_2.20.patch: revert the trashapplet code to 2.20,
+ using GnomeVFS, as we don't want a dependency on gvfs-backends just
+ for the trash. Needs revert post-lenny. Closes: #481762.
+ * 98_autoreconf.patch: updated accordingly.
+ * ja.po: updated Japanese translation from Hideki Yamane.
+ Closes: #494094.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 29 Aug 2008 10:44:33 +0200
gnome-applets (2.22.3-2) unstable; urgency=low
Added: desktop/unstable/gnome-applets/debian/patches/02_trashapplet_2.20.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/02_trashapplet_2.20.patch?rev=16816&op=file
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/02_trashapplet_2.20.patch (added)
+++ desktop/unstable/gnome-applets/debian/patches/02_trashapplet_2.20.patch Fri Aug 29 09:05:44 2008
@@ -1,0 +1,1868 @@
+Index: gnome-applets-2.22.3/Makefile.am
+===================================================================
+--- gnome-applets-2.22.3.orig/Makefile.am 2008-08-29 10:25:02.895997187 +0200
++++ gnome-applets-2.22.3/Makefile.am 2008-08-29 10:25:31.692245733 +0200
+@@ -7,6 +7,7 @@ endif
+
+ vfs_applets = \
+ drivemount \
++ trashapplet \
+ gweather
+ if BUILD_GNOME_VFS_APPLETS
+ vfs_SUBDIRS = $(vfs_applets)
+@@ -50,7 +51,6 @@ always_built_SUBDIRS = \
+ mini-commander \
+ gkb-new \
+ stickynotes \
+- trashapplet \
+ null_applet
+
+ SUBDIRS = \
+Index: gnome-applets-2.22.3/trashapplet/Makefile.am
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/Makefile.am 2008-08-29 10:27:03.331488569 +0200
++++ gnome-applets-2.22.3/trashapplet/Makefile.am 2008-08-29 10:27:52.172262328 +0200
+@@ -13,7 +13,7 @@ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_Panel_TrashApplet.xml
+
+ # here for now until i here of a better place
+-glade_DATA = trashapplet-empty-progress.ui
++glade_DATA = trashapplet.glade
+
+ EXTRA_DIST = \
+ $(ui_DATA) \
+Index: gnome-applets-2.22.3/trashapplet/src/Makefile.am
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/src/Makefile.am 2008-08-29 10:29:16.355490084 +0200
++++ gnome-applets-2.22.3/trashapplet/src/Makefile.am 2008-08-29 10:30:49.556285297 +0200
+@@ -1,16 +1,19 @@
+ INCLUDES = -I$(top_srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
+- $(GIO_CFLAGS)
++ $(GNOME_VFS_APPLETS_CFLAGS) \
++ $(LIBGLADE_CFLAGS)
+
+ libexec_PROGRAMS = trashapplet
+
+ trashapplet_SOURCES = \
+ trashapplet.c \
+- trash-empty.h \
+- trash-empty.c \
++ trashapplet.h \
++ trash-monitor.h \
++ trash-monitor.c \
+ xstuff.c \
+ xstuff.h
+
+ trashapplet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+- $(GIO_LIBS)
++ $(GNOME_VFS_APPLETS_LIBS) \
++ $(LIBGLADE_LIBS)
+Index: gnome-applets-2.22.3/trashapplet/src/trash-monitor.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.22.3/trashapplet/src/trash-monitor.c 2008-08-29 10:32:32.567531488 +0200
+@@ -0,0 +1,468 @@
++/*
++ * trash-monitor.c: monitor the state of the trash directories.
++ *
++ * Copyright (C) 1999, 2000 Eazel, Inc.
++ * Copyright (C) 2004 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#include "trash-monitor.h"
++#include <string.h>
++#include <libgnomevfs/gnome-vfs.h>
++
++struct _TrashMonitor {
++ GObject parent;
++
++ GHashTable *volumes;
++ gint total_item_count;
++ gint notify_id;
++};
++
++struct _TrashMonitorClass {
++ GObjectClass parent_class;
++
++ void (* item_count_changed) (TrashMonitor *monitor);
++};
++
++typedef struct {
++ TrashMonitor *monitor;
++ GnomeVFSVolume *volume;
++ gchar *trash_uri;
++ GnomeVFSAsyncHandle *find_handle;
++ GnomeVFSMonitorHandle *trash_change_monitor;
++ gint item_count;
++} VolumeInfo;
++
++
++static void trash_monitor_init (TrashMonitor *monitor);
++static void trash_monitor_class_init (TrashMonitorClass *class);
++
++enum {
++ ITEM_COUNT_CHANGED,
++ LAST_SIGNAL
++};
++static GObjectClass *parent_class;
++static guint signals[LAST_SIGNAL];
++
++
++static void volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
++ GnomeVFSVolume *volume,
++ TrashMonitor *monitor);
++static void volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
++ GnomeVFSVolume *volume,
++ TrashMonitor *monitor);
++
++static void add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
++static void remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume);
++
++static void trash_changed_queue_notify (TrashMonitor *monitor);
++
++GType
++trash_monitor_get_type (void)
++{
++ static GType monitor_type = 0;
++
++ if (!monitor_type) {
++ static const GTypeInfo type_info = {
++ sizeof (TrashMonitorClass),
++ (GBaseInitFunc) NULL,
++ (GBaseFinalizeFunc) NULL,
++ (GClassInitFunc) trash_monitor_class_init,
++ (GClassFinalizeFunc) NULL,
++ NULL,
++
++ sizeof (TrashMonitor),
++ 0,
++ (GInstanceInitFunc) trash_monitor_init
++ };
++ monitor_type = g_type_register_static (G_TYPE_OBJECT, "TrashMonitor",
++ &type_info, 0);
++ }
++ return monitor_type;
++}
++
++static void
++trash_monitor_class_init (TrashMonitorClass *class)
++{
++ parent_class = g_type_class_peek_parent (class);
++
++ signals[ITEM_COUNT_CHANGED] = g_signal_new
++ ("item_count_changed",
++ G_TYPE_FROM_CLASS (class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (TrashMonitorClass, item_count_changed),
++ NULL, NULL,
++ g_cclosure_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++}
++
++static void
++trash_monitor_init (TrashMonitor *monitor)
++{
++ GnomeVFSVolumeMonitor *volume_monitor;
++ GList *volumes, *tmp;
++
++ monitor->volumes = g_hash_table_new (NULL, NULL);
++ monitor->total_item_count = 0;
++ monitor->notify_id = 0;
++
++ volume_monitor = gnome_vfs_get_volume_monitor ();
++
++ g_signal_connect_object (volume_monitor, "volume_mounted",
++ G_CALLBACK (volume_mounted_callback),
++ monitor, 0);
++ g_signal_connect_object (volume_monitor, "volume_pre_unmount",
++ G_CALLBACK (volume_unmount_started_callback),
++ monitor, 0);
++
++ volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
++ for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
++ GnomeVFSVolume *volume = tmp->data;
++
++ add_volume (monitor, volume);
++ gnome_vfs_volume_unref (volume);
++ }
++ g_list_free (volumes);
++}
++
++TrashMonitor *
++trash_monitor_get (void)
++{
++ static TrashMonitor *monitor;
++
++ if (!monitor) {
++ monitor = g_object_new (TRASH_TYPE_MONITOR, NULL);
++ }
++ return monitor;
++}
++
++static void
++volume_mounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
++ GnomeVFSVolume *volume,
++ TrashMonitor *monitor)
++{
++ add_volume (monitor, volume);
++}
++
++static void
++volume_unmount_started_callback (GnomeVFSVolumeMonitor *volume_monitor,
++ GnomeVFSVolume *volume,
++ TrashMonitor *monitor)
++{
++ remove_volume (monitor, volume);
++}
++
++static void
++trash_dir_changed (GnomeVFSMonitorHandle *handle,
++ const gchar *monitor_uri,
++ const gchar *info_uri,
++ GnomeVFSMonitorEventType type,
++ gpointer user_data)
++{
++ VolumeInfo *volinfo;
++ GnomeVFSResult res;
++ GList *dirlist, *tmp;
++ gint count = 0;
++
++ volinfo = user_data;
++
++ res = gnome_vfs_directory_list_load (&dirlist, volinfo->trash_uri,
++ GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
++ if (res != GNOME_VFS_OK) {
++ g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
++ return;
++ }
++
++ for (tmp = dirlist; tmp != NULL; tmp = tmp->next) {
++ GnomeVFSFileInfo *info = tmp->data;
++
++ if (!strcmp (info->name, ".") || !strcmp (info->name, ".."))
++ continue;
++ count++;
++ }
++ gnome_vfs_file_info_list_free (dirlist);
++
++ if (count != volinfo->item_count) {
++ volinfo->item_count = count;
++ trash_changed_queue_notify (volinfo->monitor);
++ }
++}
++
++static void
++find_directory_callback (GnomeVFSAsyncHandle *handle,
++ GList *results,
++ gpointer callback_data)
++{
++ VolumeInfo *volinfo;
++ GnomeVFSFindDirectoryResult *result;
++ GnomeVFSResult res;
++
++ volinfo = callback_data;
++
++ /* we are done finding the volume */
++ volinfo->find_handle = NULL;
++
++ /* If we can't find the trash, ignore it silently. */
++ result = results->data;
++ if (result->result != GNOME_VFS_OK)
++ return;
++
++ volinfo->trash_uri = gnome_vfs_uri_to_string (result->uri,
++ GNOME_VFS_URI_HIDE_NONE);
++ /* g_message ("found trash dir: %s", volinfo->trash_uri); */
++
++ /* simulate a change to update the directory count */
++ trash_dir_changed (NULL, NULL, NULL, GNOME_VFS_MONITOR_EVENT_CHANGED,
++ volinfo);
++
++ res = gnome_vfs_monitor_add (&volinfo->trash_change_monitor,
++ volinfo->trash_uri, GNOME_VFS_MONITOR_DIRECTORY,
++ trash_dir_changed,
++ volinfo);
++
++ if (res != GNOME_VFS_OK) {
++ g_warning("GNOME VFS Error: %s", gnome_vfs_result_to_string (res));
++ volinfo->trash_change_monitor = NULL;
++ }
++}
++
++static gboolean
++get_trash_volume (TrashMonitor *monitor,
++ GnomeVFSVolume *volume,
++ VolumeInfo **volinfo,
++ GnomeVFSURI **mount_uri)
++{
++ char *uri_str;
++
++ *volinfo = g_hash_table_lookup (monitor->volumes, volume);
++
++ if (*volinfo != NULL && (*volinfo)->trash_uri != NULL)
++ return FALSE;
++
++ if (!gnome_vfs_volume_handles_trash (volume))
++ return FALSE;
++
++ uri_str = gnome_vfs_volume_get_activation_uri (volume);
++ *mount_uri = gnome_vfs_uri_new (uri_str);
++ g_free (uri_str);
++
++ if (*volinfo == NULL) {
++ *volinfo = g_new0 (VolumeInfo, 1);
++ (*volinfo)->monitor = monitor;
++ (*volinfo)->volume = gnome_vfs_volume_ref (volume);
++ g_hash_table_insert (monitor->volumes, volume, *volinfo);
++ }
++
++ return TRUE;
++}
++
++static void
++add_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
++{
++ VolumeInfo *volinfo;
++ GnomeVFSURI *mount_uri;
++ GList vfs_uri_as_list;
++
++ if (!get_trash_volume (monitor, volume, &volinfo, &mount_uri))
++ return;
++
++ if (volinfo->find_handle) {
++ /* already searchinf for trash */
++ gnome_vfs_uri_unref (mount_uri);
++ return;
++ }
++
++
++ vfs_uri_as_list.data = mount_uri;
++ vfs_uri_as_list.next = NULL;
++ vfs_uri_as_list.prev = NULL;
++
++ gnome_vfs_async_find_directory (&volinfo->find_handle, &vfs_uri_as_list,
++ GNOME_VFS_DIRECTORY_KIND_TRASH,
++ FALSE, TRUE, 0777,
++ GNOME_VFS_PRIORITY_DEFAULT,
++ find_directory_callback, volinfo);
++ gnome_vfs_uri_unref (mount_uri);
++}
++
++static void
++remove_volume (TrashMonitor *monitor, GnomeVFSVolume *volume)
++{
++ VolumeInfo *volinfo;
++
++ volinfo = g_hash_table_lookup (monitor->volumes, volume);
++ if (volinfo != NULL) {
++ g_hash_table_remove (monitor->volumes, volume);
++
++ /* g_message ("removing volume %s", volinfo->trash_uri); */
++ if (volinfo->find_handle != NULL)
++ gnome_vfs_async_cancel (volinfo->find_handle);
++ if (volinfo->trash_change_monitor != NULL)
++ gnome_vfs_monitor_cancel (volinfo->trash_change_monitor);
++
++ if (volinfo->trash_uri)
++ g_free (volinfo->trash_uri);
++
++ /* if this volume contained some trash, then notify that the trash
++ * state has changed */
++ if (volinfo->item_count != 0)
++ trash_changed_queue_notify (monitor);
++
++ gnome_vfs_volume_unref (volinfo->volume);
++ g_free (volinfo);
++ }
++}
++
++/* --- */
++
++static void
++readd_volumes (gpointer key, gpointer value, gpointer user_data)
++{
++ TrashMonitor *monitor = user_data;
++ GnomeVFSVolume *volume;
++
++ volume = key;
++ add_volume (monitor, volume);
++}
++void
++trash_monitor_recheck_trash_dirs (TrashMonitor *monitor)
++{
++ /* call add_volume() on each volume, to add trash dirs where missing */
++ g_hash_table_foreach (monitor->volumes, readd_volumes, monitor);
++}
++
++/* --- */
++
++void
++trash_monitor_empty_trash (TrashMonitor *monitor,
++ GnomeVFSAsyncHandle **handle,
++ GnomeVFSAsyncXferProgressCallback func,
++ gpointer user_data)
++{
++ GList *trash_dirs = NULL, *volumes, *tmp;
++ GnomeVFSVolume *volume;
++ GnomeVFSURI *mount_uri, *trash_uri;
++ gchar *uri_str;
++
++ /* collect the trash directories */
++ volumes = gnome_vfs_volume_monitor_get_mounted_volumes (gnome_vfs_get_volume_monitor ());
++ for (tmp = volumes; tmp != NULL; tmp = tmp->next) {
++ volume = tmp->data;
++ if (gnome_vfs_volume_handles_trash (volume)) {
++ /* get the mount point for this volume */
++ uri_str = gnome_vfs_volume_get_activation_uri (volume);
++ mount_uri = gnome_vfs_uri_new (uri_str);
++ g_free (uri_str);
++
++ g_assert (mount_uri != NULL);
++
++ /* Look for the trash directory. Since we tell it not to create or
++ * look for the dir, it doesn't block. */
++ if (gnome_vfs_find_directory (mount_uri,
++ GNOME_VFS_DIRECTORY_KIND_TRASH, &trash_uri,
++ FALSE, FALSE, 0777) == GNOME_VFS_OK) {
++ trash_dirs = g_list_prepend (trash_dirs, trash_uri);
++ }
++ gnome_vfs_uri_unref (mount_uri);
++ }
++ gnome_vfs_volume_unref (volume);
++ }
++ g_list_free (volumes);
++
++ if (trash_dirs != NULL)
++ gnome_vfs_async_xfer (handle, trash_dirs, NULL,
++ GNOME_VFS_XFER_EMPTY_DIRECTORIES,
++ GNOME_VFS_XFER_ERROR_MODE_ABORT,
++ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
++ GNOME_VFS_PRIORITY_DEFAULT,
++ func, user_data, NULL, NULL);
++ gnome_vfs_uri_list_free (trash_dirs);
++}
++
++
++/* --- */
++
++static void
++count_items (gpointer key, gpointer value, gpointer user_data)
++{
++ VolumeInfo *volinfo;
++ gint *item_count;
++
++ volinfo = value;
++ item_count = user_data;
++ *item_count += volinfo->item_count;
++}
++
++static gboolean
++trash_changed_notify (gpointer user_data)
++{
++ TrashMonitor *monitor = user_data;
++ gint item_count;
++
++ /* reset notification id */
++ monitor->notify_id = 0;
++
++ /* count the volumes */
++ item_count = 0;
++ g_hash_table_foreach (monitor->volumes, count_items, &item_count);
++
++ /* if the item count has changed ... */
++ if (item_count != monitor->total_item_count) {
++ monitor->total_item_count = item_count;
++ /* g_message ("item count is %d", item_count); */
++ g_signal_emit (monitor, signals[ITEM_COUNT_CHANGED], 0);
++ }
++
++ return FALSE;
++}
++
++static void
++trash_changed_queue_notify (TrashMonitor *monitor)
++{
++ /* already queued */
++ if (monitor->notify_id != 0)
++ return;
++
++ monitor->notify_id = g_idle_add (trash_changed_notify, monitor);
++}
++
++int
++trash_monitor_get_item_count (TrashMonitor *monitor)
++{
++ return monitor->total_item_count;
++}
++
++/* --- */
++
++#ifdef TEST_TRASH_MONITOR
++int
++main (int argc, char **argv)
++{
++ TrashMonitor *monitor;
++
++ if (!gnome_vfs_init ()) {
++ g_printerr ("Can not initialise gnome-vfs.\n");
++ return 1;
++ }
++
++ monitor = trash_monitor_get ();
++
++ g_main_loop_run (g_main_loop_new (NULL, FALSE));
++
++ return 0;
++}
++#endif
+Index: gnome-applets-2.22.3/trashapplet/src/trash-monitor.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.22.3/trashapplet/src/trash-monitor.h 2008-08-29 10:32:32.571988200 +0200
+@@ -0,0 +1,49 @@
++/*
++ * trash-monitor.h: monitor the state of the trash directories.
++ *
++ * Copyright (C) 1999, 2000 Eazel, Inc.
++ * Copyright (C) 2004 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++ * 02111-1307, USA.
++ */
++
++#ifndef __TRASH_MONITOR_H__
++#define __TRASH_MONITOR_H__
++
++#include <libgnomevfs/gnome-vfs.h>
++
++typedef struct _TrashMonitor TrashMonitor;
++typedef struct _TrashMonitorClass TrashMonitorClass;
++
++#define TRASH_TYPE_MONITOR (trash_monitor_get_type ())
++#define TRASH_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRASH_TYPE_MONITOR, TrashMonitor))
++#define TRASH_MONITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRASH_TYPE_MONITOR, TrashMonitorClass))
++#define TRASH_IS_MONITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRASH_TYPE_MONITOR))
++#define TRASH_IS_MONITOR_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TRASH_TYPE_MONITOR))
++#define TRASH_MONITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRASH_TYPE_MONITOR, TrashMonitorClass))
++
++GType trash_monitor_get_type (void);
++TrashMonitor *trash_monitor_get (void);
++
++/* check if new trash dirs have been created */
++void trash_monitor_recheck_trash_dirs (TrashMonitor *monitor);
++void trash_monitor_empty_trash (TrashMonitor *monitor,
++ GnomeVFSAsyncHandle **handle,
++ GnomeVFSAsyncXferProgressCallback func,
++ gpointer user_data);
++int trash_monitor_get_item_count (TrashMonitor *monitor);
++
++#endif
+Index: gnome-applets-2.22.3/trashapplet/src/trashapplet.c
+===================================================================
+--- gnome-applets-2.22.3.orig/trashapplet/src/trashapplet.c 2008-08-29 10:32:08.347489835 +0200
++++ gnome-applets-2.22.3/trashapplet/src/trashapplet.c 2008-08-29 10:32:36.579486709 +0200
+@@ -3,8 +3,6 @@
+ *
+ * Copyright (c) 2004 Michiel Sikkes <michiel at eyesopened.nl>,
+ * 2004 Emmanuele Bassi <ebassi at gmail.com>
+- * 2008 Ryan Lortie <desrt at desrt.ca>
+- * Matthias Clasen <mclasen at redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+@@ -25,36 +23,54 @@
+ #include "config.h"
+ #endif
+
++#include <stdio.h>
+ #include <string.h>
++#include <time.h>
+
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+ #include <libgnome/gnome-help.h>
+-#include <gio/gio.h>
+-#include <panel-applet.h>
+-#include <gnome.h>
++#include <glade/glade.h>
+
+-#include "trash-empty.h"
++#include "trashapplet.h"
++#include "trash-monitor.h"
+ #include "xstuff.h"
+
+-typedef PanelAppletClass TrashAppletClass;
++static GConfClient *client = NULL;
+
+-typedef struct
+-{
+- PanelApplet applet;
+-
+- GFileMonitor *trash_monitor;
+- GFile *trash;
++G_DEFINE_TYPE(TrashApplet, trash_applet, PANEL_TYPE_APPLET)
+
+- GtkImage *image;
+- GIcon *icon;
+- gint items;
+-} TrashApplet;
++static void trash_applet_destroy (GtkObject *object);
+
+-G_DEFINE_TYPE (TrashApplet, trash_applet, PANEL_TYPE_APPLET);
+-#define TRASH_TYPE_APPLET (trash_applet_get_type ())
+-#define TRASH_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+- TRASH_TYPE_APPLET, TrashApplet))
++static void trash_applet_size_allocate (GtkWidget *widget,
++ GdkRectangle *allocation);
++static gboolean trash_applet_button_release (GtkWidget *widget,
++ GdkEventButton *event);
++static gboolean trash_applet_key_press (GtkWidget *widget,
++ GdkEventKey *event);
++static void trash_applet_drag_leave (GtkWidget *widget,
++ GdkDragContext *context,
++ guint time_);
++static gboolean trash_applet_drag_motion (GtkWidget *widget,
++ GdkDragContext *context,
++ gint x,
++ gint y,
++ guint time_);
++static void trash_applet_drag_data_received (GtkWidget *widget,
++ GdkDragContext *context,
++ gint x,
++ gint y,
++ GtkSelectionData *selectiondata,
++ guint info,
++ guint time_);
++
++static void trash_applet_change_orient (PanelApplet *panel_applet,
++ PanelAppletOrient orient);
++static void trash_applet_change_background (PanelApplet *panel_applet,
++ PanelAppletBackgroundType type,
++ GdkColor *colour,
++ GdkPixmap *pixmap);
++static void trash_applet_theme_change (GtkIconTheme *icon_theme, gpointer data);
+
+ static void trash_applet_do_empty (BonoboUIComponent *component,
+ TrashApplet *applet,
+@@ -69,168 +85,205 @@ static void trash_applet_show_help (Bo
+ TrashApplet *applet,
+ const gchar *cname);
+
++static const GtkTargetEntry drop_types[] = {
++ { "text/uri-list", 0, 0 }
++};
++static const gint n_drop_types = G_N_ELEMENTS (drop_types);
+ static const BonoboUIVerb trash_applet_menu_verbs [] = {
+- BONOBO_UI_UNSAFE_VERB ("EmptyTrash", trash_applet_do_empty),
+- BONOBO_UI_UNSAFE_VERB ("OpenTrash", trash_applet_open_folder),
+- BONOBO_UI_UNSAFE_VERB ("AboutTrash", trash_applet_show_about),
+- BONOBO_UI_UNSAFE_VERB ("HelpTrash", trash_applet_show_help),
+- BONOBO_UI_VERB_END
++ BONOBO_UI_UNSAFE_VERB ("EmptyTrash", trash_applet_do_empty),
++ BONOBO_UI_UNSAFE_VERB ("OpenTrash", trash_applet_open_folder),
++ BONOBO_UI_UNSAFE_VERB ("AboutTrash", trash_applet_show_about),
++ BONOBO_UI_UNSAFE_VERB ("HelpTrash", trash_applet_show_help),
++ BONOBO_UI_VERB_END
+ };
+
++static void trash_applet_queue_update (TrashApplet *applet);
++static void item_count_changed (TrashMonitor *monitor,
++ TrashApplet *applet);
++
+ static void
+-trash_applet_monitor_changed (TrashApplet *applet)
++trash_applet_class_init (TrashAppletClass *class)
+ {
+- GError *error = NULL;
+- GFileInfo *info;
+- GIcon *icon;
+- gint items;
+-
+- /* XXX: this is here for a few weeks so that people building without
+- * bleeding-edge glib don't have to suffer
+- */
+-#ifndef G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT
+-#define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count"
+-#endif
++ GTK_OBJECT_CLASS (class)->destroy = trash_applet_destroy;
++ GTK_WIDGET_CLASS (class)->size_allocate = trash_applet_size_allocate;
++ GTK_WIDGET_CLASS (class)->button_release_event = trash_applet_button_release;
++ GTK_WIDGET_CLASS (class)->key_press_event = trash_applet_key_press;
++ GTK_WIDGET_CLASS (class)->drag_leave = trash_applet_drag_leave;
++ GTK_WIDGET_CLASS (class)->drag_motion = trash_applet_drag_motion;
++ GTK_WIDGET_CLASS (class)->drag_data_received = trash_applet_drag_data_received;
++ PANEL_APPLET_CLASS (class)->change_orient = trash_applet_change_orient;
++ PANEL_APPLET_CLASS (class)->change_background = trash_applet_change_background;
++}
+
+- info = g_file_query_info (applet->trash,
+- G_FILE_ATTRIBUTE_STANDARD_ICON","
+- G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT,
+- 0, NULL, &error);
+-
+- if (!info)
+- {
+- g_critical ("could not query trash:/: '%s'", error->message);
+- g_error_free (error);
+-
+- return;
+- }
+-
+- icon = g_file_info_get_icon (info);
+- items = g_file_info_get_attribute_uint32 (info,
+- G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT);
+-
+- if (!g_icon_equal (icon, applet->icon))
+- {
+- char const * const *icon_names;
+-
+- /* TODO: support other types (but by then, probably GtkImage
+- * will have built-in support for GIcon loading...)
+- */
+- g_assert (G_IS_THEMED_ICON (icon));
+-
+- icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
+- gtk_image_set_from_icon_name (GTK_IMAGE (applet->image),
+- icon_names[0],
+- GTK_ICON_SIZE_MENU);
+-
+- if (applet->icon)
+- g_object_unref (applet->icon);
+- applet->icon = g_object_ref (icon);
+- }
+-
+- if (items != applet->items)
+- {
+- if (items)
+- {
+- char *text;
+-
+- text = g_strdup_printf (ngettext ("%d Item in Trash",
+- "%d Items in Trash",
+- items), items);
+- gtk_widget_set_tooltip_text (GTK_WIDGET (applet), text);
+- g_free (text);
+- }
+- else
+- gtk_widget_set_tooltip_text (GTK_WIDGET (applet),
+- _("No Items in Trash"));
++static void
++trash_applet_init (TrashApplet *applet)
++{
++ GnomeVFSResult res;
++ GnomeVFSURI *trash_uri;
+
+- applet->items = items;
+- }
++ gtk_window_set_default_icon_name (TRASH_ICON_FULL);
+
+- g_object_unref (icon);
++ panel_applet_set_flags (PANEL_APPLET (applet),
++ PANEL_APPLET_EXPAND_MINOR);
++ /* get the default gconf client */
++ if (!client)
++ client = gconf_client_get_default ();
++
++ applet->size = 0;
++ applet->new_size = 0;
++
++ switch (panel_applet_get_orient (PANEL_APPLET (applet))) {
++ case PANEL_APPLET_ORIENT_LEFT:
++ case PANEL_APPLET_ORIENT_RIGHT:
++ applet->orient = GTK_ORIENTATION_VERTICAL;
++ break;
++ case PANEL_APPLET_ORIENT_UP:
++ case PANEL_APPLET_ORIENT_DOWN:
++ applet->orient = GTK_ORIENTATION_HORIZONTAL;
++ break;
++ }
++
++ applet->image = gtk_image_new ();
++ gtk_container_add (GTK_CONTAINER (applet), applet->image);
++ gtk_widget_show (applet->image);
++ applet->icon_state = TRASH_STATE_UNKNOWN;
++
++ /* create local trash directory if needed */
++ res = gnome_vfs_find_directory (NULL,
++ GNOME_VFS_DIRECTORY_KIND_TRASH,
++ &trash_uri,
++ TRUE,
++ TRUE,
++ 0700);
++ if (trash_uri)
++ gnome_vfs_uri_unref (trash_uri);
++ if (res != GNOME_VFS_OK) {
++ g_warning (_("Unable to find the Trash directory: %s"),
++ gnome_vfs_result_to_string (res));
++ }
++
++ /* set up trash monitor */
++ applet->monitor = trash_monitor_get ();
++ applet->monitor_signal_id =
++ g_signal_connect (applet->monitor, "item_count_changed",
++ G_CALLBACK (item_count_changed), applet);
++
++ /* initial state */
++ applet->item_count = -1;
++ applet->is_empty = TRUE;
++ applet->drag_hover = FALSE;
++
++ /* set up DnD target */
++ gtk_drag_dest_set (GTK_WIDGET (applet),
++ GTK_DEST_DEFAULT_ALL,
++ drop_types, n_drop_types,
++ GDK_ACTION_MOVE);
++
++ /* handle icon theme changes */
++ g_signal_connect (gtk_icon_theme_get_default (),
++ "changed", G_CALLBACK (trash_applet_theme_change),
++ applet);
++}
++
++static void
++trash_applet_destroy (GtkObject *object)
++{
++ TrashApplet *applet = TRASH_APPLET (object);
++
++ applet->image = NULL;
++
++ if (applet->monitor_signal_id)
++ g_signal_handler_disconnect (applet->monitor,
++ applet->monitor_signal_id);
++ applet->monitor_signal_id = 0;
++
++ if (applet->update_id)
++ g_source_remove (applet->update_id);
++ applet->update_id = 0;
++
++ (* GTK_OBJECT_CLASS (trash_applet_parent_class)->destroy) (object);
+ }
+
+ static void
+ trash_applet_size_allocate (GtkWidget *widget,
+ GdkRectangle *allocation)
+ {
+- TrashApplet *applet = TRASH_APPLET (widget);
++ TrashApplet *applet = TRASH_APPLET (widget);
++ gint new_size;
+
+- switch (panel_applet_get_orient (PANEL_APPLET (applet)))
+- {
+- case PANEL_APPLET_ORIENT_LEFT:
+- case PANEL_APPLET_ORIENT_RIGHT:
+- gtk_image_set_pixel_size (applet->image, allocation->width);
+- break;
+-
+- case PANEL_APPLET_ORIENT_UP:
+- case PANEL_APPLET_ORIENT_DOWN:
+- gtk_image_set_pixel_size (applet->image, allocation->height);
+- break;
+- }
++ if (applet->orient == GTK_ORIENTATION_HORIZONTAL)
++ new_size = allocation->height;
++ else
++ new_size = allocation->width;
++
++ if (new_size != applet->size) {
++ applet->new_size = new_size;
++ trash_applet_queue_update (applet);
++ }
+
+- GTK_WIDGET_CLASS (trash_applet_parent_class)
+- ->size_allocate (widget, allocation);
++ (* GTK_WIDGET_CLASS (trash_applet_parent_class)->size_allocate) (widget, allocation);
+ }
+
+ static void
+-trash_applet_destroy (GtkObject *object)
++trash_applet_change_orient (PanelApplet *panel_applet,
++ PanelAppletOrient orient)
+ {
+- TrashApplet *applet = TRASH_APPLET (object);
++ TrashApplet *applet = TRASH_APPLET (panel_applet);
++ gint new_size;
+
+- if (applet->trash_monitor)
+- g_object_unref (applet->trash_monitor);
+- applet->trash_monitor = NULL;
+-
+- if (applet->trash)
+- g_object_unref (applet->trash);
+- applet->trash = NULL;
+-
+- if (applet->image)
+- g_object_unref (applet->image);
+- applet->image = NULL;
+-
+- if (applet->icon)
+- g_object_unref (applet->icon);
+- applet->icon = NULL;
++ switch (orient) {
++ case PANEL_APPLET_ORIENT_LEFT:
++ case PANEL_APPLET_ORIENT_RIGHT:
++ applet->orient = GTK_ORIENTATION_VERTICAL;
++ new_size = GTK_WIDGET (applet)->allocation.width;
++ break;
++ case PANEL_APPLET_ORIENT_UP:
++ case PANEL_APPLET_ORIENT_DOWN:
++ applet->orient = GTK_ORIENTATION_HORIZONTAL;
++ new_size = GTK_WIDGET (applet)->allocation.height;
++ break;
++ }
++ if (new_size != applet->size) {
++ applet->new_size = new_size;
++ trash_applet_queue_update (applet);
++ }
+
+- GTK_OBJECT_CLASS (trash_applet_parent_class)
+- ->destroy (object);
++ if (PANEL_APPLET_CLASS (trash_applet_parent_class)->change_orient)
++ (* PANEL_APPLET_CLASS (trash_applet_parent_class)->change_orient) (panel_applet, orient);
+ }
+
+ static void
+-trash_applet_init (TrashApplet *applet)
++trash_applet_change_background (PanelApplet *panel_applet,
++ PanelAppletBackgroundType type,
++ GdkColor *colour,
++ GdkPixmap *pixmap)
+ {
+- const GtkTargetEntry drop_types[] = { { "text/uri-list" } };
++ TrashApplet *applet = TRASH_APPLET (panel_applet);
++ GtkRcStyle *rc_style;
++ GtkStyle *style;
+
+- /* needed to clamp ourselves to the panel size */
+- panel_applet_set_flags (PANEL_APPLET (applet), PANEL_APPLET_EXPAND_MINOR);
++ /* reset style */
++ gtk_widget_set_style (GTK_WIDGET (applet), NULL);
++ rc_style = gtk_rc_style_new ();
++ gtk_widget_modify_style (GTK_WIDGET (applet), rc_style);
++ gtk_rc_style_unref (rc_style);
+
+- /* enable transparency hack */
+- panel_applet_set_background_widget (PANEL_APPLET (applet),
+- GTK_WIDGET (applet));
+-
+- /* setup the image */
+- applet->image = g_object_ref_sink (gtk_image_new ());
+- gtk_container_add (GTK_CONTAINER (applet),
+- GTK_WIDGET (applet->image));
+- gtk_widget_show (GTK_WIDGET (applet->image));
+-
+- /* setup the trash backend */
+- applet->trash = g_file_new_for_uri ("trash:/");
+- applet->trash_monitor = g_file_monitor_file (applet->trash, 0, NULL, NULL);
+- g_signal_connect_swapped (applet->trash_monitor, "changed",
+- G_CALLBACK (trash_applet_monitor_changed),
+- applet);
+-
+- /* setup drag and drop */
+- gtk_drag_dest_set (GTK_WIDGET (applet), GTK_DEST_DEFAULT_ALL,
+- drop_types, G_N_ELEMENTS (drop_types),
+- GDK_ACTION_MOVE);
+-
+- /* synthesise the first update */
+- applet->items = -1;
+- trash_applet_monitor_changed (applet);
++ switch (type) {
++ case PANEL_NO_BACKGROUND:
++ break;
++ case PANEL_COLOR_BACKGROUND:
++ gtk_widget_modify_bg (GTK_WIDGET (applet),
++ GTK_STATE_NORMAL, colour);
++ break;
++ case PANEL_PIXMAP_BACKGROUND:
++ style = gtk_style_copy (GTK_WIDGET (applet)->style);
++ if (style->bg_pixmap[GTK_STATE_NORMAL])
++ g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]);
++ style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap);
++ gtk_widget_set_style (GTK_WIDGET (applet), style);
++ g_object_unref (style);
++ break;
++ }
+ }
+
+ #define PANEL_ENABLE_ANIMATIONS "/apps/panel/global/enable_animations"
+@@ -238,11 +291,7 @@ static gboolean
+ trash_applet_button_release (GtkWidget *widget,
+ GdkEventButton *event)
+ {
+- TrashApplet *applet = TRASH_APPLET (widget);
+- static GConfClient *client;
+-
+- if (client == NULL)
+- client = gconf_client_get_default ();
++ TrashApplet *applet = TRASH_APPLET (widget);
+
+ if (event->button == 1) {
+ if (gconf_client_get_bool (client, PANEL_ENABLE_ANIMATIONS, NULL))
+@@ -279,30 +328,146 @@ trash_applet_key_press (GtkWidget *wid
+ return FALSE;
+ }
+
++static void
++trash_applet_drag_leave (GtkWidget *widget,
++ GdkDragContext *context,
++ guint time_)
++{
++ TrashApplet *applet = TRASH_APPLET (widget);
++
++ if (applet->drag_hover) {
++ applet->drag_hover = FALSE;
++ trash_applet_queue_update (applet);
++ }
++}
++
+ static gboolean
+ trash_applet_drag_motion (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+- guint time)
++ guint time_)
+ {
+- GList *target;
++ TrashApplet *applet = TRASH_APPLET (widget);
+
+- /* refuse drops of panel applets */
+- for (target = context->targets; target; target = target->next)
+- {
+- const char *name = gdk_atom_name (target->data);
++ if (!applet->drag_hover) {
++ applet->drag_hover = TRUE;
++ trash_applet_queue_update (applet);
++ }
++ gdk_drag_status (context, GDK_ACTION_MOVE, time_);
+
+- if (!strcmp (name, "application/x-panel-icon-internal"))
+- break;
+- }
++ return TRUE;
++}
+
+- if (target)
+- gdk_drag_status (context, 0, time);
+- else
+- gdk_drag_status (context, GDK_ACTION_MOVE, time);
++static void
++item_count_changed (TrashMonitor *monitor,
++ TrashApplet *applet)
++{
++ trash_applet_queue_update (applet);
++}
++
++static gboolean
++trash_applet_update (gpointer user_data)
++{
++ TrashApplet *applet = TRASH_APPLET (user_data);
++ gint new_item_count;
++ BonoboUIComponent *popup_component;
++ char *tip_text;
++ TrashState new_state = TRASH_STATE_UNKNOWN;
++ const char *new_icon;
++ GdkScreen *screen;
++ GtkIconTheme *icon_theme;
++ GdkPixbuf *pixbuf, *scaled;
++
++ applet->update_id = 0;
++
++ new_item_count = trash_monitor_get_item_count (applet->monitor);
++ if (new_item_count != applet->item_count) {
++ applet->item_count = new_item_count;
++ applet->is_empty = (applet->item_count == 0);
++
++ /* set sensitivity on the "empty trash" context menu item */
++ popup_component = panel_applet_get_popup_component (PANEL_APPLET (applet));
++ bonobo_ui_component_set_prop (popup_component,
++ "/commands/EmptyTrash",
++ "sensitive",
++ applet->is_empty ? "0" : "1",
++ NULL);
++
++ switch (applet->item_count) {
++ case 0:
++ tip_text = g_strdup (_("No Items in Trash"));
++ break;
++ default:
++ tip_text = g_strdup_printf (ngettext (
++ "%d Item in Trash",
++ "%d Items in Trash",
++ applet->item_count),
++ applet->item_count);
++ }
++ gtk_widget_set_tooltip_text (GTK_WIDGET (applet), tip_text);
++ g_free (tip_text);
++ }
+
+- return TRUE;
++ /* work out what icon to use */
++ if (applet->drag_hover) {
++ new_state = TRASH_STATE_ACCEPT;
++ new_icon = TRASH_ICON_EMPTY_ACCEPT;
++ } else if (applet->is_empty) {
++ new_state = TRASH_STATE_EMPTY;
++ new_icon = TRASH_ICON_EMPTY;
++ } else {
++ new_state = TRASH_STATE_FULL;
++ new_icon = TRASH_ICON_FULL;
++ }
++
++ if (applet->image && applet->new_size > 10 &&
++ (applet->icon_state != new_state ||
++ applet->new_size != applet->size)) {
++ gint size;
++ applet->size = applet->new_size;
++ size = applet->size - 4;
++ screen = gtk_widget_get_screen (GTK_WIDGET (applet));
++ icon_theme = gtk_icon_theme_get_for_screen (screen);
++ /* not all themes have the "accept" variant */
++ if (new_state == TRASH_STATE_ACCEPT) {
++ if (!gtk_icon_theme_has_icon (icon_theme, new_icon))
++ new_icon = applet->is_empty
++ ? TRASH_ICON_EMPTY
++ : TRASH_ICON_FULL;
++ }
++ pixbuf = gtk_icon_theme_load_icon (icon_theme, new_icon,
++ size, 0, NULL);
++ if (!pixbuf)
++ return FALSE;
++
++ if (gdk_pixbuf_get_width (pixbuf) != size ||
++ gdk_pixbuf_get_height (pixbuf) != size) {
++ scaled = gdk_pixbuf_scale_simple (pixbuf, size, size, GDK_INTERP_BILINEAR);
++ g_object_unref (pixbuf);
++ pixbuf = scaled;
++ }
++
++ gtk_image_set_from_pixbuf (GTK_IMAGE (applet->image), pixbuf);
++ g_object_unref (pixbuf);
++ }
++
++ return FALSE;
++}
++
++static void
++trash_applet_queue_update (TrashApplet *applet)
++{
++ if (applet->update_id == 0) {
++ applet->update_id = g_idle_add (trash_applet_update, applet);
++ }
++}
++
++static void
++trash_applet_theme_change (GtkIconTheme *icon_theme, gpointer data)
++{
++ TrashApplet *applet = TRASH_APPLET (data);
++ trash_applet_update (applet);
+ }
+
+ /* TODO - Must HIGgify this dialog */
+@@ -338,14 +503,173 @@ error_dialog (TrashApplet *applet, const
+ g_free (error_string);
+ }
+
++static gint
++update_transfer_callback (GnomeVFSAsyncHandle *handle,
++ GnomeVFSXferProgressInfo *progress_info,
++ gpointer user_data)
++{
++ TrashApplet *applet = TRASH_APPLET (user_data);
++ GladeXML *xml = applet->xml;
++
++ if (progress_info->files_total != 0) {
++ GtkWidget *progressbar;
++ gdouble fraction;
++ gchar *progress_message;
++
++ progressbar = glade_xml_get_widget (xml, "progressbar");
++
++ fraction = (gulong) progress_info->file_index / (gulong) progress_info->files_total;
++ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar), fraction);
++
++ progress_message = g_strdup_printf (_("Removing item %d of %d"),
++ progress_info->file_index,
++ progress_info->files_total);
++ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar),
++ progress_message);
++
++ g_free (progress_message);
++ }
++
++ if (progress_info->source_name != NULL) {
++ GtkWidget *location_label;
++ GtkWidget *file_label;
++ GnomeVFSURI *uri;
++ gchar *short_name;
++ gchar *from_location;
++ gchar *file;
++
++ location_label = glade_xml_get_widget (xml, "location_label");
++ file_label = glade_xml_get_widget (xml, "file_label");
++
++ uri = gnome_vfs_uri_new (progress_info->source_name);
++
++ from_location = gnome_vfs_uri_extract_dirname (uri);
++
++ short_name = gnome_vfs_uri_extract_short_name (uri);
++ file = g_strdup_printf ("<i>%s %s</i>",
++ _("Removing:"),
++ short_name);
++ g_free (short_name);
++
++ gtk_label_set_markup (GTK_LABEL (location_label), from_location);
++ gtk_label_set_markup (GTK_LABEL (file_label), file);
++
++ g_free (from_location);
++ g_free (file);
++ gnome_vfs_uri_unref (uri);
++ }
++
++ return 1;
++}
++
++/* this function is based on the one with the same name in
++ libnautilus-private/nautilus-file-operations.c */
++#define NAUTILUS_PREFERENCES_CONFIRM_TRASH "/apps/nautilus/preferences/confirm_trash"
++static gboolean
++confirm_empty_trash (GtkWidget *parent_view)
++{
++ GtkWidget *dialog;
++ GtkWidget *button;
++ GdkScreen *screen;
++ int response;
++
++ /* Just Say Yes if the preference says not to confirm. */
++ /* Note: use directly gconf instead eel as in original nautilus function*/
++ if (!gconf_client_get_bool (client,
++ NAUTILUS_PREFERENCES_CONFIRM_TRASH,
++ NULL)) {
++ return TRUE;
++ }
++
++ screen = gtk_widget_get_screen (parent_view);
++
++ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
++ GTK_MESSAGE_WARNING,
++ GTK_BUTTONS_NONE,
++ _("Empty all of the items from "
++ "the trash?"));
++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
++ _("If you choose to empty "
++ "the trash, all items in "
++ "it will be permanently "
++ "lost. Please note that "
++ "you can also delete them "
++ "separately."));
++
++ gtk_window_set_screen (GTK_WINDOW (dialog), screen);
++ atk_object_set_role (gtk_widget_get_accessible (dialog), ATK_ROLE_ALERT);
++ gtk_window_set_wmclass (GTK_WINDOW (dialog), "empty_trash",
++ "Nautilus");
++
++ /* Make transient for the window group */
++ gtk_widget_realize (dialog);
++ gdk_window_set_transient_for (GTK_WIDGET (dialog)->window,
++ gdk_screen_get_root_window (screen));
++
++ gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL,
++ GTK_RESPONSE_CANCEL);
++
++ button = gtk_button_new_with_mnemonic (_("_Empty Trash"));
++ gtk_widget_show (button);
++ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
++
++ gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
++ GTK_RESPONSE_YES);
++
++ gtk_dialog_set_default_response (GTK_DIALOG (dialog),
++ GTK_RESPONSE_YES);
++
++ response = gtk_dialog_run (GTK_DIALOG (dialog));
++
++ gtk_object_destroy (GTK_OBJECT (dialog));
++
++ return response == GTK_RESPONSE_YES;
++}
++
++static void
++on_empty_trash_cancel (GtkWidget *widget, GnomeVFSAsyncHandle **handle)
++{
++ if (handle != NULL) {
++ gnome_vfs_async_cancel ((GnomeVFSAsyncHandle *) handle);
++ }
++
++ gtk_widget_hide (widget);
++}
++
+ static void
+ trash_applet_do_empty (BonoboUIComponent *component,
+ TrashApplet *applet,
+ const gchar *cname)
+ {
+- trash_empty (GTK_WIDGET (applet));
++ GtkWidget *dialog;
++
++ GnomeVFSAsyncHandle *hnd;
++
++ g_return_if_fail (TRASH_IS_APPLET (applet));
++
++ if (applet->is_empty)
++ return;
++
++ if (!confirm_empty_trash (GTK_WIDGET (applet)))
++ return;
++
++ if (!applet->xml)
++ applet->xml = glade_xml_new (GNOME_GLADEDIR "/trashapplet.glade", NULL, NULL);
++
++ dialog = glade_xml_get_widget(applet->xml, "empty_trash");
++
++ g_signal_connect(dialog, "response", G_CALLBACK (on_empty_trash_cancel), &hnd);
++
++ gtk_widget_show_all(dialog);
++
++ trash_monitor_empty_trash (applet->monitor,
++ &hnd, update_transfer_callback, applet);
++
++ gtk_widget_hide(dialog);
++
+ }
+
++
+ static void
+ trash_applet_open_folder (BonoboUIComponent *component,
+ TrashApplet *applet,
+@@ -358,6 +682,8 @@ trash_applet_open_folder (BonoboUICompon
+ GError *err = NULL;
+ gboolean res;
+
++ g_return_if_fail (TRASH_IS_APPLET (applet));
++
+ screen = gtk_widget_get_screen (GTK_WIDGET (applet));
+ res = gdk_spawn_on_screen (screen, NULL,
+ argv, NULL,
+@@ -380,6 +706,8 @@ trash_applet_show_help (BonoboUIComponen
+ {
+ GError *err = NULL;
+
++ g_return_if_fail (TRASH_IS_APPLET (applet));
++
+ /* FIXME - Actually, we need a user guide */
+ gnome_help_display_desktop_on_screen
+ (NULL, "trashapplet", "trashapplet", NULL,
+@@ -403,7 +731,6 @@ trash_applet_show_about (BonoboUICompone
+ "Emmanuele Bassi <ebassi at gmail.com>",
+ "Sebastian Bacher <seb128 at canonical.com>",
+ "James Henstridge <james.henstridge at canonical.com>",
+- "Ryan Lortie <desrt at desrt.ca>",
+ NULL
+ };
+ static const char *documenters[] = {
+@@ -414,8 +741,7 @@ trash_applet_show_about (BonoboUICompone
+ gtk_show_about_dialog
+ (NULL,
+ "version", VERSION,
+- "copyright", "Copyright \xC2\xA9 2004 Michiel Sikkes,"
+- "\xC2\xA9 2008 Ryan Lortie",
++ "copyright", "Copyright \xC2\xA9 2004 Michiel Sikkes",
+ "comments", _("A GNOME trash bin that lives in your panel. "
+ "You can use it to view the trash or drag "
+ "and drop items into the trash."),
+@@ -519,68 +845,82 @@ trash_applet_drag_data_received (GtkWidg
+ guint info,
+ guint time_)
+ {
+- gchar **list;
+- gint i;
+- GList *trashed = NULL;
+- GList *untrashable = NULL;
+- GList *l;
+- GError *error = NULL;
+-
+- list = g_uri_list_extract_uris ((gchar *)selectiondata->data);
+-
+- for (i = 0; list[i]; i++) {
+- GFile *file;
+-
+- file = g_file_new_for_uri (list[i]);
+- if (!g_file_trash (file, NULL, NULL)) {
+- untrashable = g_list_prepend (untrashable, file);
+- }
+- else {
+- trashed = g_list_prepend (trashed, file);
+- }
+- }
+-
+- if (untrashable) {
+- if (confirm_delete_immediately (widget,
+- g_list_length (untrashable),
+- trashed == NULL)) {
+- for (l = untrashable; l; l = l->next) {
+- if (!g_file_delete (l->data, NULL, &error)) {
+-/*
+- * FIXME: uncomment me after branched (we're string frozen)
+- error_dialog (applet,
+- _("Unable to delete '%s': %s"),
+- g_file_get_uri (l->data),
+- error->message);
+-*/
+- g_clear_error (&error);
+- }
+- }
++ TrashApplet *applet = TRASH_APPLET (widget);
++ GList *list, *scan;
++ GList *source_uri_list, *target_uri_list, *unmovable_uri_list;
++ GnomeVFSResult result;
++
++ list = gnome_vfs_uri_list_parse ((gchar *)selectiondata->data);
++
++ source_uri_list = NULL;
++ target_uri_list = NULL;
++ unmovable_uri_list = NULL;
++ for (scan = g_list_first (list); scan; scan = g_list_next (scan)) {
++ GnomeVFSURI *source_uri = scan->data;
++ GnomeVFSURI *trash_uri, *target_uri;
++ gchar *source_basename;
++
++ /* find the trash directory for this file */
++ result = gnome_vfs_find_directory (source_uri,
++ GNOME_VFS_DIRECTORY_KIND_TRASH,
++ &trash_uri, TRUE, FALSE, 0);
++ if (result != GNOME_VFS_OK) {
++ unmovable_uri_list = g_list_prepend (unmovable_uri_list,
++ gnome_vfs_uri_ref (source_uri));
++ continue;
+ }
+- }
+
+- g_list_foreach (untrashable, (GFunc)g_object_unref, NULL);
+- g_list_free (untrashable);
+- g_list_foreach (trashed, (GFunc)g_object_unref, NULL);
+- g_list_free (trashed);
++ source_basename = gnome_vfs_uri_extract_short_name
++ (source_uri);
+
+- g_strfreev (list);
++ target_uri = gnome_vfs_uri_append_file_name(trash_uri,
++ source_basename);
++ g_free (source_basename);
++ gnome_vfs_uri_unref (trash_uri);
++
++ source_uri_list = g_list_prepend (source_uri_list,
++ gnome_vfs_uri_ref (source_uri));
++ target_uri_list = g_list_prepend (target_uri_list,
++ target_uri);
++ }
+
+- gtk_drag_finish (context, TRUE, FALSE, time_);
+-}
++ gnome_vfs_uri_list_free(list);
+
+-static void
+-trash_applet_class_init (TrashAppletClass *class)
+-{
+- GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (class);
+- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
++ /* we might have added a trash dir, so recheck */
++ trash_monitor_recheck_trash_dirs (applet->monitor);
+
+- gtkobject_class->destroy = trash_applet_destroy;
+- widget_class->size_allocate = trash_applet_size_allocate;
+- widget_class->button_release_event = trash_applet_button_release;
+- widget_class->key_press_event = trash_applet_key_press;
+- widget_class->drag_motion = trash_applet_drag_motion;
+- widget_class->drag_data_received = trash_applet_drag_data_received;
++ if (source_uri_list) {
++ result = gnome_vfs_xfer_uri_list (source_uri_list, target_uri_list,
++ GNOME_VFS_XFER_REMOVESOURCE |
++ GNOME_VFS_XFER_RECURSIVE,
++ GNOME_VFS_XFER_ERROR_MODE_ABORT,
++ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE,
++ NULL, NULL);
++ gnome_vfs_uri_list_free (source_uri_list);
++ gnome_vfs_uri_list_free (target_uri_list);
++ if (result != GNOME_VFS_OK) {
++ error_dialog (applet, _("Unable to move to trash:\n%s"),
++ gnome_vfs_result_to_string (result));
++ }
++ }
++ if (unmovable_uri_list) {
++ if (confirm_delete_immediately (widget,
++ g_list_length (unmovable_uri_list),
++ source_uri_list == NULL)) {
++ result = gnome_vfs_xfer_delete_list (unmovable_uri_list,
++ GNOME_VFS_XFER_ERROR_MODE_ABORT,
++ GNOME_VFS_XFER_RECURSIVE,
++ NULL, NULL);
++ } else {
++ result = GNOME_VFS_OK;
++ }
++ gnome_vfs_uri_list_free (unmovable_uri_list);
++ if (result != GNOME_VFS_OK) {
++ error_dialog (applet, _("Unable to move to trash:\n%s"),
++ gnome_vfs_result_to_string (result));
++ }
++ }
++ gtk_drag_finish (context, TRUE, FALSE, time_);
+ }
+
+ static gboolean
+@@ -599,6 +939,7 @@ trash_applet_factory (PanelApplet *apple
+ trash_applet_menu_verbs,
+ applet);
+
++ trash_applet_queue_update (TRASH_APPLET (applet));
+ gtk_widget_show (GTK_WIDGET (applet));
+
+ retval = TRUE;
+@@ -610,8 +951,6 @@ trash_applet_factory (PanelApplet *apple
+ int
+ main (int argc, char *argv [])
+ {
+- g_thread_init (NULL);
+-
+ /* gettext stuff */
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+@@ -625,8 +964,6 @@ main (int argc, char *argv [])
+ GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
+ GNOME_PROGRAM_STANDARD_PROPERTIES,
+ NULL);
+-
+- gtk_window_set_default_icon_name ("user-trash");
+ g_set_application_name (_("Trash Applet"));
+
+ return panel_applet_factory_main
+Index: gnome-applets-2.22.3/trashapplet/src/trashapplet.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.22.3/trashapplet/src/trashapplet.h 2008-08-29 10:32:36.579486709 +0200
+@@ -0,0 +1,77 @@
++/* -*- mode: c; c-basic-offset: 8 -*-
++ * trashapplet.h
++ *
++ * Copyright (c) 2004 Michiel Sikkes <michiel at eyesopened.nl>,
++ * 2004 Emmanuele Bassi <ebassi at gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++#ifndef __TRASH_APPLET_H__
++#define __TRASH_APPLET_H__
++
++#include <panel-applet.h>
++#include <gnome.h>
++#include <glade/glade.h>
++#include <libgnomevfs/gnome-vfs.h>
++#include "trash-monitor.h"
++
++#define TRASH_TYPE_APPLET (trash_applet_get_type ())
++#define TRASH_APPLET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TRASH_TYPE_APPLET, TrashApplet))
++#define TRASH_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRASH_TYPE_APPLET, TrashAppletClass))
++#define TRASH_IS_APPLET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TRASH_TYPE_APPLET))
++#define TRASH_IS_APPLET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRASH_TYPE_APPLET))
++#define TRASH_APPLET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRASH_TYPE_APPLET, TrashAppletClass))
++
++#define TRASH_ICON_EMPTY "user-trash"
++#define TRASH_ICON_EMPTY_ACCEPT "user-trash"
++#define TRASH_ICON_FULL "user-trash-full"
++
++typedef enum {
++ TRASH_STATE_UNKNOWN,
++ TRASH_STATE_EMPTY,
++ TRASH_STATE_FULL,
++ TRASH_STATE_ACCEPT
++} TrashState;
++
++typedef struct _TrashApplet TrashApplet;
++typedef struct _TrashAppletClass TrashAppletClass;
++struct _TrashApplet
++{
++ PanelApplet applet;
++
++ guint size;
++ guint new_size;
++ PanelAppletOrient orient;
++
++ GtkWidget *image;
++ TrashState icon_state;
++
++ gint item_count;
++ gboolean is_empty;
++ gboolean drag_hover;
++
++ GladeXML *xml;
++
++ TrashMonitor *monitor;
++ guint monitor_signal_id;
++
++ guint update_id;
++};
++struct _TrashAppletClass {
++ PanelAppletClass parent_class;
++};
++
++#endif /* __TRASH_APPLET_H__ */
+Index: gnome-applets-2.22.3/trashapplet/trashapplet.glade
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gnome-applets-2.22.3/trashapplet/trashapplet.glade 2008-08-29 10:26:43.295596647 +0200
+@@ -0,0 +1,216 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
++
++<glade-interface>
++<requires lib="gnome"/>
++
++<widget class="GtkDialog" id="empty_trash">
++ <property name="border_width">6</property>
++ <property name="visible">True</property>
++ <property name="title" translatable="yes">Emptying the Trash</property>
++ <property name="type">GTK_WINDOW_TOPLEVEL</property>
++ <property name="window_position">GTK_WIN_POS_NONE</property>
++ <property name="modal">False</property>
++ <property name="default_width">400</property>
++ <property name="resizable">True</property>
++ <property name="destroy_with_parent">False</property>
++ <property name="decorated">True</property>
++ <property name="skip_taskbar_hint">False</property>
++ <property name="skip_pager_hint">False</property>
++ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++ <property name="focus_on_map">True</property>
++ <property name="has_separator">False</property>
++
++ <child internal-child="vbox">
++ <widget class="GtkVBox" id="dialog-vbox1">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">0</property>
++
++ <child internal-child="action_area">
++ <widget class="GtkHButtonBox" id="dialog-action_area1">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++ <child>
++ <widget class="GtkButton" id="cancel_button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-cancel</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">-6</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">GTK_PACK_END</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkVBox" id="vbox1">
++ <property name="border_width">6</property>
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">12</property>
++
++ <child>
++ <widget class="GtkLabel" id="label1">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes"><big><b>Emptying the Trash</b></big></property>
++ <property name="use_underline">True</property>
++ <property name="use_markup">True</property>
++ <property name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkHBox" id="hbox1">
++ <property name="visible">True</property>
++ <property name="homogeneous">False</property>
++ <property name="spacing">6</property>
++
++ <child>
++ <widget class="GtkLabel" id="label3">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes"><b>From:</b></property>
++ <property name="use_underline">True</property>
++ <property name="use_markup">True</property>
++ <property name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property name="selectable">False</property>
++ <property name="xalign">0.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="location_label">
++ <property name="visible">True</property>
++ <property name="label">trash location</property>
++ <property name="use_underline">False</property>
++ <property name="use_markup">False</property>
++ <property name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property name="selectable">False</property>
++ <property name="xalign">0.5</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkVBox" id="vbox2">
++ <property name="visible">True</property>
++ <property name="homogeneous">True</property>
++ <property name="spacing">0</property>
++
++ <child>
++ <widget class="GtkProgressBar" id="progressbar">
++ <property name="visible">True</property>
++ <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
++ <property name="fraction">0</property>
++ <property name="pulse_step">0.10000000149</property>
++ <property name="text">1 of 20 files removed</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++
++ <child>
++ <widget class="GtkLabel" id="file_label">
++ <property name="visible">True</property>
++ <property name="label"><i>Removing "file"</i></property>
++ <property name="use_underline">True</property>
++ <property name="use_markup">True</property>
++ <property name="justify">GTK_JUSTIFY_LEFT</property>
++ <property name="wrap">False</property>
++ <property name="selectable">False</property>
++ <property name="xalign">0</property>
++ <property name="yalign">0.5</property>
++ <property name="xpad">0</property>
++ <property name="ypad">0</property>
++ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++ <property name="width_chars">-1</property>
++ <property name="single_line_mode">False</property>
++ <property name="angle">0</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++</widget>
++
++</glade-interface>
Modified: desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch?rev=16816&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch (original)
+++ desktop/unstable/gnome-applets/debian/patches/98_autoreconf.patch Fri Aug 29 09:05:44 2008
@@ -5,25 +5,25 @@
Index: gnome-applets-2.22.3/accessx-status/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/docs/Makefile.in 2008-07-15 11:23:14.046671286 +0200
-+++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in 2008-07-15 11:27:05.458680493 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/accessx-status/docs/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/docs/Makefile.in 2008-08-29 10:51:32.031484938 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -35,25 +35,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/accessx-status/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/Makefile.in 2008-07-15 11:23:14.034685684 +0200
-+++ gnome-applets-2.22.3/accessx-status/Makefile.in 2008-07-15 11:27:05.322669771 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -233,6 +232,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -269,9 +269,7 @@
+--- gnome-applets-2.22.3.orig/accessx-status/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/Makefile.in 2008-08-29 10:51:31.707987608 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -233,6 +232,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -269,9 +269,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -65,25 +65,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/accessx-status/pixmaps/Makefile.in 2008-07-15 11:23:14.030701309 +0200
-+++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in 2008-07-15 11:27:05.546696708 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -199,6 +198,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -235,9 +235,7 @@
+--- gnome-applets-2.22.3.orig/accessx-status/pixmaps/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/accessx-status/pixmaps/Makefile.in 2008-08-29 10:51:32.147984731 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -199,6 +198,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -235,9 +235,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -95,9 +95,9 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/aclocal.m4
===================================================================
---- gnome-applets-2.22.3.orig/aclocal.m4 2008-07-15 11:23:14.022671448 +0200
-+++ gnome-applets-2.22.3/aclocal.m4 2008-07-15 11:26:11.642714218 +0200
-@@ -636,7 +636,7 @@
+--- gnome-applets-2.22.3.orig/aclocal.m4 2008-06-30 11:29:33.000000000 +0200
++++ gnome-applets-2.22.3/aclocal.m4 2008-08-29 10:51:28.335989002 +0200
+@@ -636,7 +636,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -106,32 +106,32 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -8518,4 +8518,3 @@
+@@ -8518,4 +8518,3 @@ m4_include([m4/acinclude.m4])
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
m4_include([m4/python.m4])
-m4_include([m4/system-tools-backends.m4])
Index: gnome-applets-2.22.3/battstat/apmlib/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/battstat/apmlib/Makefile.in 2008-07-15 11:23:14.006691903 +0200
-+++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in 2008-07-15 11:27:05.766696457 +0200
-@@ -44,7 +44,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -214,6 +213,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -250,9 +250,7 @@
+--- gnome-applets-2.22.3.orig/battstat/apmlib/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/battstat/apmlib/Makefile.in 2008-08-29 10:51:32.451985169 +0200
+@@ -44,7 +44,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -214,6 +213,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -250,9 +250,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -143,25 +143,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/battstat/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/battstat/docs/Makefile.in 2008-07-15 11:23:13.998697940 +0200
-+++ gnome-applets-2.22.3/battstat/docs/Makefile.in 2008-07-15 11:27:05.890680580 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/battstat/docs/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/battstat/docs/Makefile.in 2008-08-29 10:51:32.615984923 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -173,25 +173,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/battstat/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/battstat/Makefile.in 2008-07-15 11:23:13.986671132 +0200
-+++ gnome-applets-2.22.3/battstat/Makefile.in 2008-07-15 11:27:05.666696317 +0200
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -240,6 +239,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -276,9 +276,7 @@
+--- gnome-applets-2.22.3.orig/battstat/Makefile.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/battstat/Makefile.in 2008-08-29 10:51:32.319985152 +0200
+@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -240,6 +239,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -276,9 +276,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -203,25 +203,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/battstat/sounds/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/battstat/sounds/Makefile.in 2008-07-15 11:23:13.978671442 +0200
-+++ gnome-applets-2.22.3/battstat/sounds/Makefile.in 2008-07-15 11:27:05.974697543 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
+--- gnome-applets-2.22.3.orig/battstat/sounds/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/battstat/sounds/Makefile.in 2008-08-29 10:51:32.715986179 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -233,25 +233,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/charpick/help/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/charpick/help/Makefile.in 2008-07-15 11:23:13.970696476 +0200
-+++ gnome-applets-2.22.3/charpick/help/Makefile.in 2008-07-15 11:27:06.227690869 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/charpick/help/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/charpick/help/Makefile.in 2008-08-29 10:51:33.031985908 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -263,25 +263,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/charpick/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/charpick/Makefile.in 2008-07-15 11:23:13.962671433 +0200
-+++ gnome-applets-2.22.3/charpick/Makefile.in 2008-07-15 11:27:06.090698947 +0200
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -236,6 +235,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -272,9 +272,7 @@
+--- gnome-applets-2.22.3.orig/charpick/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/charpick/Makefile.in 2008-08-29 10:51:32.867485043 +0200
+@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -236,6 +235,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -272,9 +272,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -293,8 +293,8 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/config.h.in
===================================================================
---- gnome-applets-2.22.3.orig/config.h.in 2008-07-15 11:23:13.954670975 +0200
-+++ gnome-applets-2.22.3/config.h.in 2008-07-15 11:25:19.831700947 +0200
+--- gnome-applets-2.22.3.orig/config.h.in 2008-06-30 11:29:36.000000000 +0200
++++ gnome-applets-2.22.3/config.h.in 2008-08-29 10:51:11.679987332 +0200
@@ -135,15 +135,9 @@
/* install prefix */
#undef PREFIX
@@ -313,9 +313,9 @@
Index: gnome-applets-2.22.3/configure
===================================================================
---- gnome-applets-2.22.3.orig/configure 2008-07-15 11:23:13.946670377 +0200
-+++ gnome-applets-2.22.3/configure 2008-07-15 11:27:14.138669640 +0200
-@@ -828,6 +828,9 @@
+--- gnome-applets-2.22.3.orig/configure 2008-06-30 11:29:35.000000000 +0200
++++ gnome-applets-2.22.3/configure 2008-08-29 10:51:39.787484234 +0200
+@@ -828,6 +828,9 @@ am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
@@ -325,7 +325,7 @@
INTLTOOL_DESKTOP_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_KEYS_RULE
-@@ -850,9 +853,6 @@
+@@ -850,9 +853,6 @@ INTLTOOL_POLICY_RULE
XGETTEXT
MSGMERGE
MSGFMT
@@ -335,7 +335,7 @@
INTLTOOL_PERL
ALL_LINGUAS
CC
-@@ -1029,8 +1029,7 @@
+@@ -1029,8 +1029,7 @@ HAVE_GST10_FALSE
HAVE_XKB
APPLET_ACCESSX_TRUE
APPLET_ACCESSX_FALSE
@@ -345,7 +345,7 @@
MODEMLIGHTS_LIBS
APPLET_MODEMLIGHTS_TRUE
APPLET_MODEMLIGHTS_FALSE
-@@ -1120,7 +1119,9 @@
+@@ -1120,7 +1119,9 @@ PYGTK_LIBS
LIBGWEATHER_CFLAGS
LIBGWEATHER_LIBS
MIXER_CFLAGS
@@ -356,7 +356,7 @@
# Initialize some variables set by options.
-@@ -1839,6 +1840,10 @@
+@@ -1839,6 +1840,10 @@ Some influential environment variables:
MIXER_CFLAGS
C compiler flags for MIXER, overriding pkg-config
MIXER_LIBS linker flags for MIXER, overriding pkg-config
@@ -367,7 +367,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-@@ -2773,6 +2778,7 @@
+@@ -2773,6 +2778,7 @@ LIBGLADE_REQUIRED=2.4.0
LIBGAIL_REQUIRED=1.1.0
LIBXKLAVIER_REQUIRED=2.91
LIBWNCK_REQUIRED=2.9.3
@@ -375,7 +375,7 @@
SYSTEM_TOOLS_BACKENDS_REQUIRED=1.1.3
LIBGNOME_DESKTOP_REQUIRED=2.11.1
LIBNOTIFY_REQUIRED=0.3.2
-@@ -3914,8 +3920,8 @@
+@@ -3914,8 +3920,8 @@ if test -n "0.35.0"; then
echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
@@ -386,7 +386,7 @@
{ echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-@@ -3925,6 +3931,132 @@
+@@ -3925,6 +3931,132 @@ echo "$as_me: error: Your intltool is to
{ (exit 1); exit 1; }; }
fi
@@ -519,7 +519,7 @@
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -4100,14 +4232,6 @@
+@@ -4100,14 +4232,6 @@ echo "$as_me: error: GNU gettext tools n
{ (exit 1); exit 1; }; }
fi
@@ -534,7 +534,7 @@
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -4320,10 +4444,6 @@
+@@ -4320,10 +4444,6 @@ fi
@@ -545,7 +545,7 @@
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -6524,7 +6644,7 @@
+@@ -6524,7 +6644,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -554,7 +554,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9171,11 +9291,11 @@
+@@ -9171,11 +9291,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -568,7 +568,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9461,11 +9581,11 @@
+@@ -9461,11 +9581,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -582,7 +582,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9565,11 +9685,11 @@
+@@ -9565,11 +9685,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -596,7 +596,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -11942,7 +12062,7 @@
+@@ -11942,7 +12062,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -605,7 +605,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12042,7 +12162,7 @@
+@@ -12042,7 +12162,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -614,7 +614,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14443,11 +14563,11 @@
+@@ -14443,11 +14563,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -628,7 +628,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -14547,11 +14667,11 @@
+@@ -14547,11 +14667,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -642,7 +642,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16145,11 +16265,11 @@
+@@ -16145,11 +16265,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -656,7 +656,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -16249,11 +16369,11 @@
+@@ -16249,11 +16369,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -670,7 +670,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18469,11 +18589,11 @@
+@@ -18469,11 +18589,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -684,7 +684,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18759,11 +18879,11 @@
+@@ -18759,11 +18879,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -698,7 +698,7 @@
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -18863,11 +18983,11 @@
+@@ -18863,11 +18983,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -712,7 +712,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -28405,198 +28525,82 @@
+@@ -28405,198 +28525,82 @@ fi
CPPFLAGS=$savecppflags
@@ -968,7 +968,7 @@
BUILD_MODEM_LIGHTS=yes
else
{ echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
-@@ -28604,6 +28608,8 @@
+@@ -28604,6 +28608,8 @@ echo "$as_me: WARNING: *** modemlights a
BUILD_MODEM_LIGHTS=no
fi
@@ -977,7 +977,7 @@
if test "x$BUILD_MODEM_LIGHTS" = "xyes"; then
APPLET_MODEMLIGHTS_TRUE=
APPLET_MODEMLIGHTS_FALSE='#'
-@@ -30301,9 +30307,6 @@
+@@ -30301,9 +30307,6 @@ cat >>$CONFIG_STATUS <<_ACEOF
# INIT-COMMANDS
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -987,7 +987,7 @@
_ACEOF
-@@ -30316,7 +30319,6 @@
+@@ -30316,7 +30319,6 @@ do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -995,7 +995,7 @@
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"gnome-applets.spec") CONFIG_FILES="$CONFIG_FILES gnome-applets.spec" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-@@ -30494,6 +30496,9 @@
+@@ -30494,6 +30496,9 @@ am__untar!$am__untar$ac_delim
MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
MAINT!$MAINT$ac_delim
@@ -1005,7 +1005,7 @@
INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-@@ -30516,9 +30521,6 @@
+@@ -30516,9 +30521,6 @@ INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RU
XGETTEXT!$XGETTEXT$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
MSGFMT!$MSGFMT$ac_delim
@@ -1015,7 +1015,7 @@
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
-@@ -30777,8 +30779,7 @@
+@@ -30777,8 +30779,7 @@ HAVE_GST10_FALSE!$HAVE_GST10_FALSE$ac_de
HAVE_XKB!$HAVE_XKB$ac_delim
APPLET_ACCESSX_TRUE!$APPLET_ACCESSX_TRUE$ac_delim
APPLET_ACCESSX_FALSE!$APPLET_ACCESSX_FALSE$ac_delim
@@ -1025,7 +1025,7 @@
MODEMLIGHTS_LIBS!$MODEMLIGHTS_LIBS$ac_delim
APPLET_MODEMLIGHTS_TRUE!$APPLET_MODEMLIGHTS_TRUE$ac_delim
APPLET_MODEMLIGHTS_FALSE!$APPLET_MODEMLIGHTS_FALSE$ac_delim
-@@ -30805,6 +30806,7 @@
+@@ -30805,6 +30806,7 @@ DATADIR!$DATADIR$ac_delim
SYSCONFDIR!$SYSCONFDIR$ac_delim
LIBDIR!$LIBDIR$ac_delim
PREFIX!$PREFIX$ac_delim
@@ -1033,7 +1033,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -30846,13 +30848,12 @@
+@@ -30846,13 +30848,12 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -1048,7 +1048,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -31419,23 +31420,6 @@
+@@ -31419,23 +31420,6 @@ echo "$as_me: error: cannot create direc
done
done
;;
@@ -1074,25 +1074,25 @@
esac ;;
Index: gnome-applets-2.22.3/cpufreq/help/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/help/Makefile.in 2008-07-15 11:23:13.938681234 +0200
-+++ gnome-applets-2.22.3/cpufreq/help/Makefile.in 2008-07-15 11:27:06.459701502 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/cpufreq/help/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/help/Makefile.in 2008-08-29 10:51:33.343985060 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1104,25 +1104,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/cpufreq/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/Makefile.in 2008-07-15 11:23:13.930676655 +0200
-+++ gnome-applets-2.22.3/cpufreq/Makefile.in 2008-07-15 11:27:06.323695878 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -214,6 +213,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -250,9 +250,7 @@
+--- gnome-applets-2.22.3.orig/cpufreq/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/Makefile.in 2008-08-29 10:51:33.159985347 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -214,6 +213,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -250,9 +250,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1134,25 +1134,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/pixmaps/Makefile.in 2008-07-15 11:23:13.922702387 +0200
-+++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in 2008-07-15 11:27:06.547680281 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
+--- gnome-applets-2.22.3.orig/cpufreq/pixmaps/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/pixmaps/Makefile.in 2008-08-29 10:51:33.447985918 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1164,25 +1164,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/src/cpufreq-selector/Makefile.in 2008-07-15 11:23:13.910675719 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in 2008-07-15 11:27:06.763696423 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -224,6 +223,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -260,9 +260,7 @@
+--- gnome-applets-2.22.3.orig/cpufreq/src/cpufreq-selector/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/src/cpufreq-selector/Makefile.in 2008-08-29 10:51:33.719485019 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -224,6 +223,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -260,9 +260,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1194,25 +1194,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/cpufreq/src/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/cpufreq/src/Makefile.in 2008-07-15 11:23:13.902681197 +0200
-+++ gnome-applets-2.22.3/cpufreq/src/Makefile.in 2008-07-15 11:27:06.659696963 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -238,6 +237,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -274,9 +274,7 @@
+--- gnome-applets-2.22.3.orig/cpufreq/src/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/cpufreq/src/Makefile.in 2008-08-29 10:51:33.587985624 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -238,6 +237,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -274,9 +274,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1224,25 +1224,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/drivemount/help/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/drivemount/help/Makefile.in 2008-07-15 11:23:13.894671380 +0200
-+++ gnome-applets-2.22.3/drivemount/help/Makefile.in 2008-07-15 11:27:07.006691693 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/drivemount/help/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/drivemount/help/Makefile.in 2008-08-29 10:51:34.023487413 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1254,25 +1254,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/drivemount/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/drivemount/Makefile.in 2008-07-15 11:23:13.874699778 +0200
-+++ gnome-applets-2.22.3/drivemount/Makefile.in 2008-07-15 11:27:06.879695874 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -234,6 +233,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -270,9 +270,7 @@
+--- gnome-applets-2.22.3.orig/drivemount/Makefile.in 2008-06-30 11:29:37.000000000 +0200
++++ gnome-applets-2.22.3/drivemount/Makefile.in 2008-08-29 10:51:33.867985038 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -234,6 +233,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -270,9 +270,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1284,25 +1284,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/geyes/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/geyes/docs/Makefile.in 2008-07-15 11:23:13.866700088 +0200
-+++ gnome-applets-2.22.3/geyes/docs/Makefile.in 2008-07-15 11:27:07.255690658 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/geyes/docs/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/docs/Makefile.in 2008-08-29 10:51:34.339985809 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1314,25 +1314,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/geyes/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/geyes/Makefile.in 2008-07-15 11:23:13.858670715 +0200
-+++ gnome-applets-2.22.3/geyes/Makefile.in 2008-07-15 11:27:07.126697378 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -233,6 +232,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -269,9 +269,7 @@
+--- gnome-applets-2.22.3.orig/geyes/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/Makefile.in 2008-08-29 10:51:34.167985875 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -233,6 +232,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -269,9 +269,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1344,25 +1344,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/geyes/themes/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/geyes/themes/Makefile.in 2008-07-15 11:23:13.838680256 +0200
-+++ gnome-applets-2.22.3/geyes/themes/Makefile.in 2008-07-15 11:27:07.355696246 +0200
-@@ -40,7 +40,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -208,6 +207,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -244,9 +244,7 @@
+--- gnome-applets-2.22.3.orig/geyes/themes/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/geyes/themes/Makefile.in 2008-08-29 10:51:34.459985068 +0200
+@@ -40,7 +40,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -208,6 +207,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -244,9 +244,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1374,25 +1374,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gkb-new/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/Makefile.in 2008-07-15 11:23:13.830676864 +0200
-+++ gnome-applets-2.22.3/gkb-new/Makefile.in 2008-07-15 11:27:07.439680314 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -200,6 +199,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -236,9 +236,7 @@
+--- gnome-applets-2.22.3.orig/gkb-new/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/Makefile.in 2008-08-29 10:51:34.575987172 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -200,6 +199,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -236,9 +236,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1404,25 +1404,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/xmodmap/Makefile.in 2008-07-15 11:23:13.822672006 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in 2008-07-15 11:27:07.615669790 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
+--- gnome-applets-2.22.3.orig/gkb-new/xmodmap/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap/Makefile.in 2008-08-29 10:51:34.791985155 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1434,25 +1434,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gkb-new/xmodmap.sun/Makefile.in 2008-07-15 11:23:13.806699655 +0200
-+++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in 2008-07-15 11:27:07.531698643 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
+--- gnome-applets-2.22.3.orig/gkb-new/xmodmap.sun/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gkb-new/xmodmap.sun/Makefile.in 2008-08-29 10:51:34.679985585 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1464,25 +1464,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gswitchit/help/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gswitchit/help/Makefile.in 2008-07-15 11:23:13.798671959 +0200
-+++ gnome-applets-2.22.3/gswitchit/help/Makefile.in 2008-07-15 11:27:07.875680348 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/gswitchit/help/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gswitchit/help/Makefile.in 2008-08-29 10:51:35.107985373 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1494,25 +1494,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gswitchit/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gswitchit/Makefile.in 2008-07-15 11:23:13.790672199 +0200
-+++ gnome-applets-2.22.3/gswitchit/Makefile.in 2008-07-15 11:27:07.747696485 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -252,6 +251,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -288,9 +288,7 @@
+--- gnome-applets-2.22.3.orig/gswitchit/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gswitchit/Makefile.in 2008-08-29 10:51:34.955985398 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -252,6 +251,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -288,9 +288,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1524,25 +1524,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gweather/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gweather/docs/Makefile.in 2008-07-15 11:23:13.782676909 +0200
-+++ gnome-applets-2.22.3/gweather/docs/Makefile.in 2008-07-15 11:27:08.119680284 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/gweather/docs/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/gweather/docs/Makefile.in 2008-08-29 10:51:35.419485368 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1554,25 +1554,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/gweather/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/gweather/Makefile.in 2008-07-15 11:23:13.774698660 +0200
-+++ gnome-applets-2.22.3/gweather/Makefile.in 2008-07-15 11:27:07.991680776 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -236,6 +235,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -272,9 +272,7 @@
+--- gnome-applets-2.22.3.orig/gweather/Makefile.in 2008-06-30 11:29:38.000000000 +0200
++++ gnome-applets-2.22.3/gweather/Makefile.in 2008-08-29 10:51:35.259485215 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -236,6 +235,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -272,9 +272,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1584,25 +1584,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/invest-applet/data/art/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/data/art/Makefile.in 2008-07-15 11:23:13.766699110 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in 2008-07-15 11:27:08.391697888 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -198,6 +197,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -234,9 +234,7 @@
+--- gnome-applets-2.22.3.orig/invest-applet/data/art/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/data/art/Makefile.in 2008-08-29 10:51:35.755485055 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -198,6 +197,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -234,9 +234,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1614,35 +1614,35 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/invest-applet/data/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.in 2008-07-15 11:23:13.742700320 +0200
-+++ gnome-applets-2.22.3/invest-applet/data/Makefile.in 2008-07-15 11:27:08.303701159 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -361,8 +359,8 @@
+--- gnome-applets-2.22.3.orig/invest-applet/data/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/data/Makefile.in 2008-08-29 10:51:35.651484686 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -361,8 +359,8 @@ investbindir = $(libdir)/invest-applet
# $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
#endif
DISTCLEANFILES = \
@@ -1655,25 +1655,25 @@
Invest_Applet.server.in.in \
Index: gnome-applets-2.22.3/invest-applet/invest/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/invest/Makefile.in 2008-07-15 11:23:13.734701049 +0200
-+++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in 2008-07-15 11:27:08.487694167 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -202,6 +201,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -238,9 +238,7 @@
+--- gnome-applets-2.22.3.orig/invest-applet/invest/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/invest/Makefile.in 2008-08-29 10:51:35.915986320 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -202,6 +201,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -238,9 +238,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1685,25 +1685,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/invest-applet/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/invest-applet/Makefile.in 2008-07-15 11:23:13.710680957 +0200
-+++ gnome-applets-2.22.3/invest-applet/Makefile.in 2008-07-15 11:27:08.207678270 +0200
-@@ -37,7 +37,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -199,6 +198,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -235,9 +235,7 @@
+--- gnome-applets-2.22.3.orig/invest-applet/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/invest-applet/Makefile.in 2008-08-29 10:51:35.527984982 +0200
+@@ -37,7 +37,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -199,6 +198,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -235,9 +235,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1715,9 +1715,9 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/ltmain.sh
===================================================================
---- gnome-applets-2.22.3.orig/ltmain.sh 2008-07-15 11:23:13.702702848 +0200
+--- gnome-applets-2.22.3.orig/ltmain.sh 2008-02-08 01:57:47.000000000 +0100
+++ gnome-applets-2.22.3/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -1728,8 +1728,8 @@
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
Index: gnome-applets-2.22.3/m4/intltool.m4
===================================================================
---- gnome-applets-2.22.3.orig/m4/intltool.m4 2008-07-15 11:23:13.694676409 +0200
-+++ gnome-applets-2.22.3/m4/intltool.m4 2008-07-15 11:25:19.863699776 +0200
+--- gnome-applets-2.22.3.orig/m4/intltool.m4 2008-06-30 11:29:31.000000000 +0200
++++ gnome-applets-2.22.3/m4/intltool.m4 2008-08-29 10:51:11.939486164 +0200
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
@@ -1739,7 +1739,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -39,14 +39,21 @@
+@@ -39,14 +39,21 @@ if test -n "$1"; then
AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
@@ -1763,7 +1763,7 @@
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-@@ -101,12 +108,7 @@
+@@ -101,12 +108,7 @@ if test -z "$xgversion" -o -z "$mmversio
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
@@ -1777,7 +1777,7 @@
if test -z "$INTLTOOL_PERL"; then
AC_MSG_ERROR([perl not found; required for intltool])
fi
-@@ -152,42 +154,6 @@
+@@ -152,42 +154,6 @@ AC_SUBST(DATADIRNAME)
IT_PO_SUBDIR([po])
@@ -1822,55 +1822,71 @@
Index: gnome-applets-2.22.3/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/Makefile.in 2008-07-15 11:23:13.678694420 +0200
-+++ gnome-applets-2.22.3/Makefile.in 2008-07-15 11:27:10.490697063 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -215,6 +214,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -251,9 +251,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- gnome-applets-2.22.3.orig/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/Makefile.in 2008-08-29 10:51:38.595486438 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -215,6 +214,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -251,9 +251,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -328,6 +326,7 @@ gtop_applets = multiload
+ @BUILD_GTOP_APPLETS_TRUE at gtop_SUBDIRS = $(gtop_applets)
+ vfs_applets = \
+ drivemount \
++ trashapplet \
+ gweather
+
+ @BUILD_GNOME_VFS_APPLETS_TRUE at vfs_SUBDIRS = $(vfs_applets)
+@@ -350,7 +349,6 @@ always_built_SUBDIRS = \
+ mini-commander \
+ gkb-new \
+ stickynotes \
+- trashapplet \
+ null_applet
+
+ SUBDIRS = \
Index: gnome-applets-2.22.3/man/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/man/Makefile.in 2008-07-15 11:23:13.674701664 +0200
-+++ gnome-applets-2.22.3/man/Makefile.in 2008-07-15 11:27:08.571690457 +0200
-@@ -37,7 +37,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -191,6 +190,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -227,9 +227,7 @@
+--- gnome-applets-2.22.3.orig/man/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/man/Makefile.in 2008-08-29 10:51:36.047987803 +0200
+@@ -37,7 +37,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -191,6 +190,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -227,9 +227,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1882,25 +1898,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/mini-commander/help/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/help/Makefile.in 2008-07-15 11:23:13.662670596 +0200
-+++ gnome-applets-2.22.3/mini-commander/help/Makefile.in 2008-07-15 11:27:08.783696732 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/mini-commander/help/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/help/Makefile.in 2008-08-29 10:51:36.335985440 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1912,25 +1928,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/mini-commander/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/Makefile.in 2008-07-15 11:23:13.654671744 +0200
-+++ gnome-applets-2.22.3/mini-commander/Makefile.in 2008-07-15 11:27:08.663680221 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -209,6 +208,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -245,9 +245,7 @@
+--- gnome-applets-2.22.3.orig/mini-commander/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/Makefile.in 2008-08-29 10:51:36.179985375 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -209,6 +208,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -245,9 +245,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1942,25 +1958,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/mini-commander/src/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/mini-commander/src/Makefile.in 2008-07-15 11:23:13.646699432 +0200
-+++ gnome-applets-2.22.3/mini-commander/src/Makefile.in 2008-07-15 11:27:08.911696380 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -240,6 +239,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -276,9 +276,7 @@
+--- gnome-applets-2.22.3.orig/mini-commander/src/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mini-commander/src/Makefile.in 2008-08-29 10:51:36.491985504 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -240,6 +239,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -276,9 +276,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -1972,25 +1988,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/mixer/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/mixer/docs/Makefile.in 2008-07-15 11:23:13.638671386 +0200
-+++ gnome-applets-2.22.3/mixer/docs/Makefile.in 2008-07-15 11:27:09.155679972 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/mixer/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/mixer/docs/Makefile.in 2008-08-29 10:51:36.831485148 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2002,25 +2018,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/mixer/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/mixer/Makefile.in 2008-07-15 11:23:13.630670928 +0200
-+++ gnome-applets-2.22.3/mixer/Makefile.in 2008-07-15 11:27:09.027696318 +0200
-@@ -42,7 +42,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -237,6 +236,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@
+--- gnome-applets-2.22.3.orig/mixer/Makefile.in 2008-06-30 11:29:39.000000000 +0200
++++ gnome-applets-2.22.3/mixer/Makefile.in 2008-08-29 10:51:36.675985706 +0200
+@@ -42,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -237,6 +236,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -273,9 +273,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2032,35 +2048,35 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/modemlights/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/modemlights/Makefile.in 2008-07-15 11:23:13.622672216 +0200
-+++ gnome-applets-2.22.3/modemlights/Makefile.in 2008-07-15 11:27:09.267696723 +0200
-@@ -43,7 +43,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -226,6 +225,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -262,9 +262,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -335,8 +333,9 @@
+--- gnome-applets-2.22.3.orig/modemlights/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/modemlights/Makefile.in 2008-08-29 10:51:36.975484454 +0200
+@@ -43,7 +43,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -226,6 +225,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -262,9 +262,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -335,8 +333,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -2074,25 +2090,25 @@
modem_applet_SOURCES = \
Index: gnome-applets-2.22.3/multiload/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/multiload/docs/Makefile.in 2008-07-15 11:23:13.614681047 +0200
-+++ gnome-applets-2.22.3/multiload/docs/Makefile.in 2008-07-15 11:27:09.514697039 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/multiload/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/multiload/docs/Makefile.in 2008-08-29 10:51:37.363988859 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2104,25 +2120,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/multiload/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/multiload/Makefile.in 2008-07-15 11:23:13.606671579 +0200
-+++ gnome-applets-2.22.3/multiload/Makefile.in 2008-07-15 11:27:09.391698306 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -237,6 +236,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -273,9 +273,7 @@
+--- gnome-applets-2.22.3.orig/multiload/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/multiload/Makefile.in 2008-08-29 10:51:37.187984926 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -237,6 +236,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -273,9 +273,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2134,25 +2150,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/null_applet/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/null_applet/Makefile.in 2008-07-15 11:23:13.598670003 +0200
-+++ gnome-applets-2.22.3/null_applet/Makefile.in 2008-07-15 11:27:09.622696450 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -220,6 +219,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -256,9 +256,7 @@
+--- gnome-applets-2.22.3.orig/null_applet/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/null_applet/Makefile.in 2008-08-29 10:51:37.495985943 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -220,6 +219,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -256,9 +256,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2164,25 +2180,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/stickynotes/data/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/data/Makefile.in 2008-07-15 11:23:13.590672548 +0200
-+++ gnome-applets-2.22.3/stickynotes/data/Makefile.in 2008-07-15 11:27:09.830696140 +0200
-@@ -41,7 +41,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -200,6 +199,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -236,9 +236,7 @@
+--- gnome-applets-2.22.3.orig/stickynotes/data/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/data/Makefile.in 2008-08-29 10:51:37.747985219 +0200
+@@ -41,7 +41,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -200,6 +199,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -236,9 +236,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2194,25 +2210,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/stickynotes/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/docs/Makefile.in 2008-07-15 11:23:13.582679773 +0200
-+++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in 2008-07-15 11:27:09.962696926 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/stickynotes/docs/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/docs/Makefile.in 2008-08-29 10:51:37.907984884 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2224,25 +2240,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/stickynotes/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/Makefile.in 2008-07-15 11:23:13.574698242 +0200
-+++ gnome-applets-2.22.3/stickynotes/Makefile.in 2008-07-15 11:27:09.742696618 +0200
-@@ -42,7 +42,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -249,6 +248,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -285,9 +285,7 @@
+--- gnome-applets-2.22.3.orig/stickynotes/Makefile.in 2008-06-30 11:29:40.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/Makefile.in 2008-08-29 10:51:37.643985828 +0200
+@@ -42,7 +42,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -249,6 +248,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -285,9 +285,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2254,25 +2270,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/stickynotes/pixmaps/Makefile.in 2008-07-15 11:23:13.570678178 +0200
-+++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in 2008-07-15 11:27:10.050690162 +0200
-@@ -38,7 +38,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -197,6 +196,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -233,9 +233,7 @@
+--- gnome-applets-2.22.3.orig/stickynotes/pixmaps/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/stickynotes/pixmaps/Makefile.in 2008-08-29 10:51:38.015985342 +0200
+@@ -38,7 +38,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -197,6 +196,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -233,9 +233,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2284,25 +2300,25 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/trashapplet/docs/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/docs/Makefile.in 2008-07-15 11:23:13.562677231 +0200
-+++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in 2008-07-15 11:27:10.274669956 +0200
-@@ -62,7 +62,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -212,6 +211,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -248,9 +248,7 @@
+--- gnome-applets-2.22.3.orig/trashapplet/docs/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/docs/Makefile.in 2008-08-29 10:51:38.279984887 +0200
+@@ -62,7 +62,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -212,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -248,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -2314,61 +2330,120 @@
VERSION = @VERSION@
Index: gnome-applets-2.22.3/trashapplet/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/Makefile.in 2008-07-15 11:23:13.534699234 +0200
-+++ gnome-applets-2.22.3/trashapplet/Makefile.in 2008-07-15 11:27:10.146698175 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -213,6 +212,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -249,9 +249,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- gnome-applets-2.22.3.orig/trashapplet/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/Makefile.in 2008-08-29 10:51:38.127984912 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -213,6 +212,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -249,9 +249,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -330,7 +328,7 @@ uidir = $(datadir)/gnome-2.0/ui
+ ui_DATA = GNOME_Panel_TrashApplet.xml
+
+ # here for now until i here of a better place
+-glade_DATA = trashapplet-empty-progress.ui
++glade_DATA = trashapplet.glade
+ EXTRA_DIST = \
+ $(ui_DATA) \
+ GNOME_Panel_TrashApplet.server.in.in \
Index: gnome-applets-2.22.3/trashapplet/src/Makefile.in
===================================================================
---- gnome-applets-2.22.3.orig/trashapplet/src/Makefile.in 2008-07-15 11:23:13.526699963 +0200
-+++ gnome-applets-2.22.3/trashapplet/src/Makefile.in 2008-07-15 11:27:10.382696116 +0200
-@@ -39,7 +39,6 @@
- $(top_srcdir)/m4/acinclude.m4 \
- $(top_srcdir)/m4/gnome-doc-utils.m4 \
- $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
-- $(top_srcdir)/m4/system-tools-backends.m4 \
- $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-@@ -211,6 +210,7 @@
- MIXER_LIBS = @MIXER_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
-+MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
- MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
- MSGFMT = @MSGFMT@
- MSGFMT_OPTS = @MSGFMT_OPTS@
-@@ -247,9 +247,7 @@
- SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
--STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
- STRIP = @STRIP@
--SU_TOOL = @SU_TOOL@
- SYSCONFDIR = @SYSCONFDIR@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- gnome-applets-2.22.3.orig/trashapplet/src/Makefile.in 2008-06-30 11:29:41.000000000 +0200
++++ gnome-applets-2.22.3/trashapplet/src/Makefile.in 2008-08-29 10:51:38.415985482 +0200
+@@ -39,7 +39,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ $(top_srcdir)/m4/acinclude.m4 \
+ $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \
+- $(top_srcdir)/m4/system-tools-backends.m4 \
+ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+@@ -49,11 +48,12 @@ CONFIG_CLEAN_FILES =
+ am__installdirs = "$(DESTDIR)$(libexecdir)"
+ libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(libexec_PROGRAMS)
+-am_trashapplet_OBJECTS = trashapplet.$(OBJEXT) trash-empty.$(OBJEXT) \
++am_trashapplet_OBJECTS = trashapplet.$(OBJEXT) trash-monitor.$(OBJEXT) \
+ xstuff.$(OBJEXT)
+ trashapplet_OBJECTS = $(am_trashapplet_OBJECTS)
+ am__DEPENDENCIES_1 =
+-trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++trashapplet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++ $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -211,6 +211,7 @@ MIXER_CFLAGS = @MIXER_CFLAGS@
+ MIXER_LIBS = @MIXER_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
++MODEMLIGHTS_CFLAGS = @MODEMLIGHTS_CFLAGS@
+ MODEMLIGHTS_LIBS = @MODEMLIGHTS_LIBS@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
+@@ -247,9 +248,7 @@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_RE
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+-STB_SCRIPTS_DIR = @STB_SCRIPTS_DIR@
+ STRIP = @STRIP@
+-SU_TOOL = @SU_TOOL@
+ SYSCONFDIR = @SYSCONFDIR@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -322,18 +321,21 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_srcdir) \
+ $(GNOME_APPLETS_CFLAGS) \
+- $(GIO_CFLAGS)
++ $(GNOME_VFS_APPLETS_CFLAGS) \
++ $(LIBGLADE_CFLAGS)
+
+ trashapplet_SOURCES = \
+ trashapplet.c \
+- trash-empty.h \
+- trash-empty.c \
++ trashapplet.h \
++ trash-monitor.h \
++ trash-monitor.c \
+ xstuff.c \
+ xstuff.h
+
+ trashapplet_LDADD = \
+ $(GNOME_APPLETS_LIBS) \
+- $(GIO_LIBS)
++ $(GNOME_VFS_APPLETS_LIBS) \
++ $(LIBGLADE_LIBS)
+
+ all: all-am
+
+@@ -406,7 +408,7 @@ mostlyclean-compile:
+ distclean-compile:
+ -rm -f *.tab.c
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trash-empty.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trash-monitor.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trashapplet.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xstuff.Po at am__quote@
+
Modified: desktop/unstable/gnome-applets/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/patches/series?rev=16816&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/patches/series (original)
+++ desktop/unstable/gnome-applets/debian/patches/series Fri Aug 29 09:05:44 2008
@@ -1,4 +1,5 @@
01_distclean.patch
+02_trashapplet_2.20.patch
09_modemlights_use_new_gst.patch
80_mixer_user_gstreamer_signals.patch
98_autoreconf.patch
Modified: desktop/unstable/gnome-applets/debian/po/ja.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/po/ja.po?rev=16816&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/po/ja.po (original)
+++ desktop/unstable/gnome-applets/debian/po/ja.po Fri Aug 29 09:05:44 2008
@@ -13,22 +13,21 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnome-applets 0.3.1-4\n"
-"Report-Msgid-Bugs-To: gpastore at debian.org\n"
+"Project-Id-Version: gnome-applets 2.22.3-2\n"
+"Report-Msgid-Bugs-To: Guilherme de S. Pastore <gpastore at debian.org>\n"
"POT-Creation-Date: 2007-07-01 07:35+0200\n"
-"PO-Revision-Date: 2005-05-20 23:10-1000\n"
-"Last-Translator: Atsushi Shimono <shimono at kwasan.kyoto-u.ac.jp>\n"
+"PO-Revision-Date: 2008-08-06 20:05+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
#. Description
#: ../gnome-applets.templates:2001
-#, fuzzy
msgid "Should cpufreq-selector run with root privileges?"
-msgstr "cpufreq-selector ¤ò root ¤Ë SUID ¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤¹¤«¡©"
+msgstr "cpufreq-selector ã‚’ root 権é™ã§å®Ÿè¡Œã—ã¾ã™ã‹ï¼Ÿ"
#. Type: boolean
#. Description
@@ -37,6 +36,8 @@
"The 'cpufreq-selector' program, part of the CPU Frequency Scaling Monitor, "
"can be set up to use superuser privileges when it is run ('SUID root')."
msgstr ""
+"CPU 周波数ã®è¨ˆæ¸¬ãƒ¢ãƒ‹ã‚¿ã®ä¸€éƒ¨ã€'cpufreq-selector' プãƒã‚°ãƒ©ãƒ を実行ã™ã‚‹éš›ã€"
+"管ç†è€
権é™ã§å®Ÿè¡Œ ('SUID root') ã™ã‚‹ã‚ˆã†ã«è¨å®šãŒå¯èƒ½ã§ã™ã€‚"
#. Type: boolean
#. Description
@@ -46,36 +47,38 @@
"processor's clock frequency. However, this may also be potentially "
"exploitable in security attacks."
msgstr ""
+"ã“ã®ã‚ªãƒ—ションを有効ã«ã™ã‚‹ã¨ã€ã©ã®ãƒ¦ãƒ¼ã‚¶ã§ã‚ã£ã¦ã‚‚ CPU ã®ã‚¯ãƒãƒƒã‚¯å‘¨æ³¢æ•°ã‚’è¨å®šã™ã‚‹"
+"権é™ã‚’æŒã¤ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ã—ã‹ã—ã€ã“ã®è¨å®šã¯ã‚»ã‚ュリティ攻撃をå—ã‘ã‚‹å¯èƒ½æ€§ã«ã‚‚ãªã‚Š"
+"ãˆã¾ã™ã€‚"
#. Type: boolean
#. Description
#: ../gnome-applets.templates:2001
-#, fuzzy
msgid ""
"The applet will continue to work if you choose to disable SUID for cpufreq-"
"selector, but only for monitoring the CPU clock frequency. The applet may "
"need to be restarted for a change to take effect."
msgstr ""
-"cpufreq-selector ¤Î SUID bit ¤ò̵¸ú¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤â¡¢¥¢¥×¥ì¥Ã¥È¤ÏÆ°ºî"
-"¤·¤Þ¤¹¤¬¡¢CPU ¼þÇÈ¿ô¤ò¥â¥Ë¥¿¤¹¤ë¤³¤È¤·¤«¤Ç¤¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£¤³¤ÎÁªÂò¤ò͸ú¤Ë¤¹"
-"¤ë¤¿¤á¤Ë¤Ï¡¢¥¢¥×¥ì¥Ã¥È¤òºÆµ¯Æ°¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£"
+"cpufreq-selector ã® SUID bit を無効ã«ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ã‚‚ã€ã‚¢ãƒ—レットã¯å‹•ä½œ"
+"ã—ã¾ã™ãŒã€CPU 周波数ã®ãƒ¢ãƒ‹ã‚¿ã—ã‹ã§ããªããªã‚Šã¾ã™ã€‚ã“ã®å¤‰æ›´ã‚’有効ã«ã™ã‚‹ã«ã¯ã€ã‚¢ãƒ—"
+"レットをå†èµ·å‹•ã™ã‚‹å¿
è¦ãŒã‚ã‚‹ã§ã—ょã†ã€‚"
#. Type: boolean
#. Description
#: ../gnome-applets.templates:2001
-#, fuzzy
msgid ""
"If in doubt, accept the default of no SUID root. To change this setting "
"later, run 'dpkg-reconfigure gnome-applets'."
msgstr ""
-"¸å¤ÇÊѹ¹¤¹¤ë¾ì¹ç¤Ë¤Ï¡¢\"dpkg-reconfigure gnome-applets\" ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤"
+"判らãªã„å ´åˆã¯ã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã§ã‚ã‚‹ SUID root ã‚’è¨å®šã—ãªã„ã§ãã ã•ã„。"
+"後ã§å¤‰æ›´ã™ã‚‹å ´åˆã«ã¯ã€'dpkg-reconfigure gnome-applets' を実行ã—ã¦ãã ã•ã„。"
#~ msgid ""
#~ "You have the option of installing a component of the CPU Frequency "
#~ "Scaling Monitor (cpufreq-selector) with the SUID bit set."
#~ msgstr ""
-#~ "CPU ¼þÇÈ¿ôÄ´À°¥â¥Ë¥¿ (cpufreq-selector) ¤Î¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë¤Î SUID bit ¤ò"
-#~ "͸ú¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤«¤É¤¦¤«ÁªÂò¤Ç¤¤Þ¤¹¡£"
+#~ "CPU 周波数調整モニタ (cpufreq-selector) ã®ãƒ—ãƒã‚°ãƒ©ãƒ ファイル㮠SUID bit ã‚’"
+#~ "有効ã«ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‹ã©ã†ã‹é¸æŠžã§ãã¾ã™ã€‚"
#~ msgid ""
#~ "If you make cpufreq-selector SUID, any user can then set the CPU's clock "
@@ -83,7 +86,7 @@
#~ "potentially allow it to be used during a security attack on your "
#~ "computer. If in doubt, it is suggested that you install it without SUID."
#~ msgstr ""
-#~ "cpufreq-selector ¤Î SUID bit ¤ò͸ú¤Ë¤·¤¿¾ì¹ç¡¢¤É¤Î¥æ¡¼¥¶¤Ç¤â CPU ¼þÇÈ¿ô¤ò"
-#~ "Äɲø¢¸Â¤Ê¤·¤ÇÀßÄê¤Ç¤¤Þ¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢¤³¤ì¤Ï¥»¥¥å¥ê¥Æ¥£¡¼¹¶·â¤ËÍøÍѤµ"
-#~ "¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£µ¿Ìä¤Î¤¢¤ë¾ì¹ç¤Ï¡¢SUID ¤ò̵¸ú¤Ë¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë"
-#~ "¤³¤È¤ò¿ä¾©¤·¤Þ¤¹¡£"
+#~ "cpufreq-selector ã® SUID bit を有効ã«ã—ãŸå ´åˆã€ã©ã®ãƒ¦ãƒ¼ã‚¶ã§ã‚‚ CPU 周波数を"
+#~ "è¿½åŠ æ¨©é™ãªã—ã§è¨å®šã§ãã¾ã™ã€‚ã—ã‹ã—ãªãŒã‚‰ã€ã“ã‚Œã¯ã‚»ã‚ュリティー攻撃ã«åˆ©ç”¨ã•"
+#~ "れるå¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ç–‘å•ã®ã‚ã‚‹å ´åˆã¯ã€SUID を無効ã«ã—ã¦ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹"
+#~ "ã“ã¨ã‚’推奨ã—ã¾ã™ã€‚"
More information about the pkg-gnome-commits
mailing list