--- gnome-applets-2.30.0.orig/config.h.in +++ gnome-applets-2.30.0/config.h.in @@ -66,6 +66,9 @@ /* libnotify available */ #undef HAVE_LIBNOTIFY +/* libntrack available */ +#undef HAVE_LIBNTRACK + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H --- gnome-applets-2.30.0.orig/configure.in +++ gnome-applets-2.30.0/configure.in @@ -35,6 +35,7 @@ GUCHARMAP_REQUIRED=1.4.0 POLKIT_REQUIRED=0.92 NETWORKMANAGER_REQUIRED=0.7 +LIBNTRACK_REQUIRED=006 GST10_REQUIRED=0.10.2 dnl *************************************************************************** @@ -272,8 +273,8 @@ dnl -- check for NetworkManager ----------------------------------------------- AC_ARG_ENABLE([networkmanager], AC_HELP_STRING([--enable-networkmanager], - [Enable NetworkManager support @<:@default=yes@:>@]), - ENABLE_NETWORKMANAGER=$enableval, ENABLE_NETWORKMANAGER=yes) + [Enable NetworkManager support @<:@default=no@:>@]), + ENABLE_NETWORKMANAGER=$enableval, ENABLE_NETWORKMANAGER=no) HAVE_NETWORKMANAGER=no if test "x$ENABLE_NETWORKMANAGER" = "xyes"; then @@ -287,6 +288,27 @@ fi fi +AC_ARG_ENABLE([libntrack], + AC_HELP_STRING([--enable-libntrack], + [Enable libntrack support @<:@default=yes@:>@]), + ENABLE_LIBNTRACK=$enableval, ENABLE_LIBNTRACK=yes) + +HAVE_LIBNTRACK=no +if test "x$ENABLE_LIBNTRACK" = "xyes"; then + PKG_CHECK_MODULES(LIBNTRACK, libntrack-gobject >= $LIBNTRACK_REQUIRED, + HAVE_LIBNTRACK=yes, HAVE_LIBNTRACK=no) + + if test "x$HAVE_LIBNTRACK" = "xyes"; then + AC_DEFINE(HAVE_LIBNTRACK, 1, [libntrack available]) + AC_SUBST(LIBNTRACK_CFLAGS) + AC_SUBST(LIBNTRACK_LIBS) + fi +fi + +if test "x$HAVE_LIBNTRACK" = "xyes" -a "x$HAVE_NETWORKMANAGER" = "xyes"; then + AC_MSG_ERROR([--enable-libntrack and --enable-networkmanager cannot be used at same time]) +fi + dnl -- check for the Mixer ---------------------------------------------------- AC_ARG_ENABLE([mixer-applet], AC_HELP_STRING([--enable-mixer-applet], [Enable the gstreamer-based mixer applet.]), --- gnome-applets-2.30.0.orig/debian/gnome-applets-data.install +++ gnome-applets-2.30.0/debian/gnome-applets-data.install @@ -0,0 +1,4 @@ +debian/tmp/etc/ +debian/tmp/usr/lib/bonobo/ +debian/tmp/usr/share/ +debian/tmp/usr/lib/python* --- gnome-applets-2.30.0.orig/debian/control.in +++ gnome-applets-2.30.0/debian/control.in @@ -0,0 +1,127 @@ +Source: gnome-applets +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: @GNOME_TEAM@ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-applets/ubuntu +Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + debhelper (>= 5.0.13), + quilt, + patchutils, + libgtk2.0-dev (>= 2.13.0), + libglib2.0-dev (>= 2.22), + libgconf2-dev (>= 2.8.0), + scrollkeeper (>= 0.1.4) | rarian-compat, + libpanel-applet2-dev (>= 2.13.4), + libgtop2-dev (>= 2.11.92), + libwnck-dev (>= 2.9.3), + libgnome-desktop-dev (>= 2.11.1), + libnotify-dev (>= 0.3.2), + libdbus-1-dev (>= 1.1.2), + libdbus-glib-1-dev (>= 0.74), + python-gtk2-dev (>= 2.6), + python-gobject-dev (>= 2.6), + python-gnome2-dev (>= 2.10), + gnome-icon-theme (>= 2.15.91), + libxml2-dev (>= 2.5.0), + libgweather-dev (>= 2.22.1), + libgucharmap2-dev (>= 1:2.23.0), + libpolkit-gobject-1-dev (>= 0.92), + intltool (>= 0.35.0), + python-dev (>= 2.4), + libxt-dev, + libx11-dev, + gnome-settings-daemon-dev, + xsltproc, + docbook-xsl, + docbook-to-man, + docbook-utils, + gnome-doc-utils (>= 0.3.2), + libntrack-gobject-dev | not+linux-gnu, + x11proto-kb-dev, + python-gnome2-desktop-dev, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + sharutils, + python-support (>= 0.4) + +Package: gnome-applets-data +Architecture: all +Pre-Depends: dpkg (>= 1.10.24) +Depends: ${misc:Depends}, + ${python:Depends} +Replaces: trashapplet +Description: Various applets for the GNOME panel - data files + This package contains data files (pixmaps, icons, documentations) needed by + the gnome-applets package. + +Package: gnome-applets +Architecture: any +Pre-Depends: dpkg (>= 1.10.24) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-applets-data (>= ${gnome:Version}), + gnome-applets-data (<< ${gnome:NextVersion}), + gnome-panel (>= 2.13.4), + gnome-icon-theme (>= 2.15.91), + ${python:Depends}, + gvfs +Conflicts: trashapplet +Replaces: trashapplet +Provides: trashapplet +Recommends: gnome-system-monitor, + gnome-media, + python-gconf, + python-gnome2, + python-gnomeapplet, + python-gobject, + python-gtk2, + policykit-1-gnome +Suggests: acpid, + tomboy, + gnome-netstatus-applet, + deskbar-applet, + cpufrequtils +Description: Various applets for the GNOME panel - binary files + accessx-status: indicates keyboard accessibility settings, including + the current state of the keyboard, if those features are in use. + . + Battstat: monitors the power subsystem on a laptop. + . + Character palette: provides a convenient way to access non-standard + characters, such as accented characters, mathematical symbols, special + symbols, and punctuation marks. + . + GNOME CPUFreq Applet: CPU frequency scaling monitor + . + Drivemount: lets you mount and unmount drives and file systems. + . + Geyes: pair of eyes which follow the mouse pointer around the screen. + . + Modem Monitor: monitors the modem. + . + Invest: downloads current stock quotes from the Internet and displays + the quotes in a scrolling display in the applet. The applet downloads the + stock information from Yahoo! Finance. + . + System monitor: CPU, memory, network, swap file and resource. + . + Trash: lets you drag items to the trash folder. + . + Weather report: downloads weather information from the U.S National Weather + Service (NWS) servers, including the Interactive Weather Information + Network (IWIN). + +Package: gnome-applets-dbg +Section: debug +Architecture: any +Pre-Depends: dpkg (>= 1.10.24) +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-applets (= ${binary:Version}) +Description: Various applets for the GNOME panel - binary files with debugging symbols + This package contains unstripped binaries used for debugging. --- gnome-applets-2.30.0.orig/debian/compat +++ gnome-applets-2.30.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-applets-2.30.0.orig/debian/gnome-applets.preinst +++ gnome-applets-2.30.0/debian/gnome-applets.preinst @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +prog=/usr/bin/cpufreq-selector + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" lt-nl "2.24"; then + if dpkg-statoverride --list $prog > /dev/null; then + dpkg-statoverride --remove $prog + fi; + fi +esac + +#DEBHELPER# --- gnome-applets-2.30.0.orig/debian/gnome-applets.install +++ gnome-applets-2.30.0/debian/gnome-applets.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/ +debian/tmp/usr/lib/gnome-applets/ --- gnome-applets-2.30.0.orig/debian/cpufreq-selector.sgml +++ gnome-applets-2.30.0/debian/cpufreq-selector.sgml @@ -0,0 +1,160 @@ + manpage.1'. You may view + the manual page with: `docbook-to-man manpage.sgml | nroff -man | + less'. A typical entry in a Makefile or Makefile.am is: + +manpage.1: manpage.sgml + docbook-to-man $< > $@ + + + The docbook-to-man binary is found in the docbook-to-man package. + Please remember that if you create the nroff version in one of the + debian/rules file targets (such as build), you will need to include + docbook-to-man in your Build-Depends control field. + + --> + + + Theppitak"> + Karoonboonyanan"> + + Mar 23, 2007"> + + 1"> + thep@linux.thai.net"> + + cpufreq-selector"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2003 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + tool to set CPU frequency + + + + &dhpackage; + + + + + + + + + DESCRIPTION + + &dhpackage; is a command-line tool for choosing + CPU frequency settings. + + + + OPTIONS + + This program follows the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + + + + , + + + + Show summary of options. + + + + , + + + + number of CPU to set. If omitted, zeroth CPU is implied. + + + + , + + + + CPU governor to use, such as powersave, + performance. + + + + , + + + + CPU frequency to use, in kHz. + + + + + + AUTHOR + + &dhpackage;, as part of gnome-applets, was written by Carlos García + Campos carlosgc@gnome.org and other GNOME contributors. + + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + + --- gnome-applets-2.30.0.orig/debian/watch +++ gnome-applets-2.30.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +ftp://ftp.gnome.org/pub/GNOME/sources/gnome-applets/([\d\.]+)[0123456789]/gnome-applets-(.*)\.tar\.gz --- gnome-applets-2.30.0.orig/debian/copyright +++ gnome-applets-2.30.0/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Christian Marillat on +Mon, 31 Jan 2000 13:15:27 +0100. +Taken over by Marc Dequènes (Duck) on 2003-03-28. +Taken over by Guilherme de S. Pastore +on 2005-11-08 + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/ + +Upstream Authors: too many, see '/usr/share/doc/gnome-panel/AUTHORS' + for details + +Copyright: + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + --- gnome-applets-2.30.0.orig/debian/pyversions +++ gnome-applets-2.30.0/debian/pyversions @@ -0,0 +1 @@ +2.4- --- gnome-applets-2.30.0.orig/debian/gnome-applets.manpages +++ gnome-applets-2.30.0/debian/gnome-applets.manpages @@ -0,0 +1,12 @@ +man/cdplayer_applet.1 +man/charpick_applet.1 +man/drivemount_applet.1 +man/geyes_applet.1 +man/gkb_applet.1 +man/gkb_xmmap.1 +man/gweather.1 +man/modemlights_applet.1 +man/multiload_applet.1 +man/screenshooter_applet.1 +man/sound-monitor_applet.1 +man/whereami_applet.1 --- gnome-applets-2.30.0.orig/debian/rules +++ gnome-applets-2.30.0/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc --disable-scrollkeeper --enable-ipv6 --disable-battstat --enable-libntrack + +ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) +DEB_CONFIGURE_EXTRA_FLAGS += --disable-battstat +endif + +DEB_DH_BUILDDEB_ARGS := -- -Zbzip2 + +DEB_MAKE_ENVVARS += echo=/bin/echo + +MANPAGES += debian/cpufreq-selector.1 +DEB_INSTALL_MANPAGES_gnome-applets = $(MANPAGES) + +DEB_DH_STRIP_ARGS += --dbg-package=gnome-applets-dbg + +# Build manual pages +build/gnome-applets:: $(MANPAGES) + +debian/cpufreq-selector.1: debian/cpufreq-selector.sgml + docbook-to-man $< > $@ + +binary-install/gnome-applets:: + rm -rf debian/gnome-applets/usr/lib/gnome-applets/gnome-applets/ + chmod a+x debian/gnome-applets/usr/bin/* debian/gnome-applets/usr/lib/gnome-applets/* + dh_pysupport -pgnome-applets + +binary-install/gnome-applets-data:: + find debian/gnome-applets-data/usr/share -type f -exec chmod -R a-x {} \; + dh_pysupport -pgnome-applets-data + +clean:: + rm -f $(MANPAGES) --- gnome-applets-2.30.0.orig/debian/control +++ gnome-applets-2.30.0/debian/control @@ -0,0 +1,132 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: gnome-applets +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Guilherme de S. Pastore +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-applets/ubuntu +Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.41), + autotools-dev, + debhelper (>= 5.0.13), + quilt, + patchutils, + libgtk2.0-dev (>= 2.13.0), + libglib2.0-dev (>= 2.22), + libgconf2-dev (>= 2.8.0), + scrollkeeper (>= 0.1.4) | rarian-compat, + libpanel-applet2-dev (>= 2.13.4), + libgtop2-dev (>= 2.11.92), + libwnck-dev (>= 2.9.3), + libgnome-desktop-dev (>= 2.11.1), + libnotify-dev (>= 0.3.2), + libdbus-1-dev (>= 1.1.2), + libdbus-glib-1-dev (>= 0.74), + python-gtk2-dev (>= 2.6), + python-gobject-dev (>= 2.6), + python-gnome2-dev (>= 2.10), + gnome-icon-theme (>= 2.15.91), + libxml2-dev (>= 2.5.0), + libgweather-dev (>= 2.22.1), + libgucharmap2-dev (>= 1:2.23.0), + libpolkit-gobject-1-dev (>= 0.92), + intltool (>= 0.35.0), + python-dev (>= 2.4), + libxt-dev, + libx11-dev, + gnome-settings-daemon-dev, + xsltproc, + docbook-xsl, + docbook-to-man, + docbook-utils, + gnome-doc-utils (>= 0.3.2), + libntrack-gobject-dev | not+linux-gnu, + x11proto-kb-dev, + python-gnome2-desktop-dev, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + sharutils, + python-support (>= 0.4) + +Package: gnome-applets-data +Architecture: all +Pre-Depends: dpkg (>= 1.10.24) +Depends: ${misc:Depends}, + ${python:Depends} +Replaces: trashapplet +Description: Various applets for the GNOME panel - data files + This package contains data files (pixmaps, icons, documentations) needed by + the gnome-applets package. + +Package: gnome-applets +Architecture: any +Pre-Depends: dpkg (>= 1.10.24) +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-applets-data (>= ${gnome:Version}), + gnome-applets-data (<< ${gnome:NextVersion}), + gnome-panel (>= 2.13.4), + gnome-icon-theme (>= 2.15.91), + ${python:Depends}, + gvfs +Conflicts: trashapplet +Replaces: trashapplet +Provides: trashapplet +Recommends: gnome-system-monitor, + gnome-media, + python-gconf, + python-gnome2, + python-gnomeapplet, + python-gobject, + python-gtk2, + policykit-1-gnome +Suggests: acpid, + tomboy, + gnome-netstatus-applet, + deskbar-applet, + cpufrequtils +Description: Various applets for the GNOME panel - binary files + accessx-status: indicates keyboard accessibility settings, including + the current state of the keyboard, if those features are in use. + . + Battstat: monitors the power subsystem on a laptop. + . + Character palette: provides a convenient way to access non-standard + characters, such as accented characters, mathematical symbols, special + symbols, and punctuation marks. + . + GNOME CPUFreq Applet: CPU frequency scaling monitor + . + Drivemount: lets you mount and unmount drives and file systems. + . + Geyes: pair of eyes which follow the mouse pointer around the screen. + . + Modem Monitor: monitors the modem. + . + Invest: downloads current stock quotes from the Internet and displays + the quotes in a scrolling display in the applet. The applet downloads the + stock information from Yahoo! Finance. + . + System monitor: CPU, memory, network, swap file and resource. + . + Trash: lets you drag items to the trash folder. + . + Weather report: downloads weather information from the U.S National Weather + Service (NWS) servers, including the Interactive Weather Information + Network (IWIN). + +Package: gnome-applets-dbg +Section: debug +Architecture: any +Pre-Depends: dpkg (>= 1.10.24) +Priority: extra +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-applets (= ${binary:Version}) +Description: Various applets for the GNOME panel - binary files with debugging symbols + This package contains unstripped binaries used for debugging. --- gnome-applets-2.30.0.orig/debian/gnome-applets.gconf-defaults +++ gnome-applets-2.30.0/debian/gnome-applets.gconf-defaults @@ -0,0 +1 @@ +/apps/drivemount-applet/prefs/mount_point /media/floppy --- gnome-applets-2.30.0.orig/debian/changelog +++ gnome-applets-2.30.0/debian/changelog @@ -0,0 +1,1607 @@ +gnome-applets (2.30.0-0ubuntu2~asac1) lucid; urgency=low + + * ntrack support + + -- Alexander Sack Sun, 11 Apr 2010 02:33:45 +0200 + +gnome-applets (2.30.0-0ubuntu1) lucid; urgency=low + + * New upstream release: + - gswitchit: + + Build a null keyboard indicator applet so that it can be properly + removed from the panel configuration on upgrade. + - Weather applet: + + Fix mnemonics for Find Next button (LP: #545825) + + Fix format security warning (closes bug #610950) + - Invest applet: + + Use network-manager to refresh on network connect (LP: #323113) + + Fix two spelling errors (closes bug #579607) + - Updated translations + * debian/patches/86_deprecate_battstatus.patch: refreshed + * debian/patches/87_deprecate_modemlights.patch: refreshed + * removed debian/patches/89_deprecate_gswitchit.patch: upstreamed + * debian/patches/98_autoreconf.patch: refreshed + + -- Didier Roche Mon, 29 Mar 2010 12:53:43 +0200 + +gnome-applets (2.29.5-0ubuntu2) lucid; urgency=low + + * debian/patches/deprecate_gswitchit.patch: + - Add a null keyboard indicator applet to properly clean the old + applet from panel configurations on upgrade (LP: #539949) + + -- Chris Coulson Wed, 17 Mar 2010 10:22:39 +0000 + +gnome-applets (2.29.5-0ubuntu1) lucid; urgency=low + + * New upstream version: + Note: the gswitchit applet has been removed, and is now replaced by a + notification icon displayed by gnome-settings-daemon. + Drivemount Applet: + - Remove deprecated glib symbols + Invest Applet: + - Use proper labels for the chart selection combo-box + Sticky Notes: + - More fixes for duplicate labels in the .ui file + Weather Applet: + - Fix weather applet preferences find function + * debian/control.in: + - clean libxklavier and libgnomekbd build requirements + - updated description for the gnome-keyboard-applet change + - updated libglib requirement + * debian/gnome-applets.gconf-defaults: + - don't set a battstat key since the applet is deprecated + * debian/gnome-keyboard-layout.xml: + - dropped since the applet is deprecated + * debian/patches/00sticknotes_ui.patch: + - dropped, the change is in the new version + * debian/patches/98_autoreconf.patch: + - new version update + * debian/rules: + - don't build the manpage for gnome-keyboard-applet + + -- Sebastien Bacher Thu, 14 Jan 2010 20:41:45 +0100 + +gnome-applets (2.28.0-3ubuntu2) lucid; urgency=low + + * No change rebuild to use the new libgnome-desktop soname + + -- Sebastien Bacher Wed, 06 Jan 2010 22:45:41 +0100 + +gnome-applets (2.28.0-3ubuntu1) lucid; urgency=low + + * Rebase on Debian unstable, remaining changes: + * debian/control.in: + - Don't build depends on libcpufreq-dev, type-handling, + system-tools-backends-dev, libhal-dev, libapm-dev or liboobs-dev. + - Don't build depends on libgstreamer0.10-dev or + libgstreamer-plugins-base0.10-dev (mixed applet disabled) + - Pre-depends on dpkg (required for bzip2 packaging) + - Remove gstreamer0.10-alsa | gstreamer0.10-audiosink depends and + mixer description from gnome-applets (mixer not built) + - gnome-applets suggests gnome-netstatus-applet, deskbar-applet and + cpufrequtils rather than recommends. + * debian/gnome-applet.manpages: + - Don't install mini_commander or mixer manpages + * debian/rules: + - Don't build the mixer, battery status applets + - Don't enable SUID + - Compress package with bzip2 + * debian/watch: + - Add BZR link + - Watch for unstable versions + * 00sticknotes_ui.patch: + - Fix more sticknotes UI problems + * 09_modemlights_use_new_gst.patch: + * 10_network-manager.patch: + - Dropped, modemlights no longer built + * 80_correct_minicommander_install.patch: + - Don't install the minicommander server when not required. + * 81_silent_applet_cleaning: + - Don't display a dialog about the applet configuration cleaning since + that's something which should be transparent for the users + * 86_deprecate_battstatus.patch: + * 87_deprecate_modemlights.patch: + * 88_hide_deprecated_mixer.patch: + - Hide deprecated applets fro the "Add to Panel" dialog + * 98_autoreconf.patch: + - Refreshed + + -- Robert Ancell Fri, 11 Dec 2009 09:47:09 +1100 + +gnome-applets (2.28.0-3) unstable; urgency=low + + * debian/patches/15_path-max.patch: + - Avoid using PATH_MAX since it's not necessarily defined. Fixes a build + issue on the Hurd. + + -- Emilio Pozuelo Monfort Mon, 07 Dec 2009 17:32:12 +0100 + +gnome-applets (2.28.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 05:29:24 +0200 + +gnome-applets (2.28.0-1) experimental; urgency=low + + * New upstream release. + - debian/control.in: + + Build depend on libxklavier-dev >= 4.0 rather than libxklavier12-dev. + + Build depend on libpolkit-gobject-1-dev for PolicyKit 1 support. + Drop libpolkit-dev and libpolkit-gnome-dev build dependencies. + Recommend policykit-1-gnome rather than policykit-gnome. + - debian/patches/01_distclean.patch: + + Removed, fixed upstream. + - debian/patches/09_modemlights_use_new_gst.patch, + debian/patches/98_autoreconf.patch: + + Refreshed. + * debian/control.in: + - Remove old gnome-cpufreq-applet replaces/conflicts/provides. + - Recommend python-gconf, python-gnomeapplet, python-gobject and + python-gtk2, needed by invest-applet. + + -- Emilio Pozuelo Monfort Thu, 08 Oct 2009 19:58:14 +0200 + +gnome-applets (2.26.3-2) unstable; urgency=low + + [ Josselin Mouette ] + * Use HAL also on GNU/kFreeBSD. + * Don’t require network-manager for non-Linux architectures. + Closes: #542645. + + [ Emilio Pozuelo Monfort ] + * Standards-Version is 3.8.3, no chanes needed. + * Autogenerate debian/cpufreq-selector.1 during build. + + -- Emilio Pozuelo Monfort Sat, 29 Aug 2009 01:51:42 +0200 + +gnome-applets (2.26.3-1) unstable; urgency=low + + * New upstream release. + * 10_network-manager.patch: new patch. Use NM instead of network-admin + to edit connections. + * 98_autoreconf.patch: updated for the new version. + + -- Josselin Mouette Sat, 15 Aug 2009 10:15:10 +0200 + +gnome-applets (2.26.1-1) unstable; urgency=low + + * New upstream release. + + Hide sticky notes when clicking the applet. Closes: #446248. + + Text displays when switching cpufreq from graphics only to text + only. Closes: #439829. + * Update build-dependencies. + * Enable mixer applet explicitly. + * 01_depend_on_gnomeui_directly.patch: dropped, obsolete. + * 02_selector_crash.patch: dropped, merged upstream. + * 09_modemlights_use_new_gst.patch: updated to apply cleanly. + * 98_autoreconf.patch, 99_ltmain_as-needed.patch: updated accordingly. + + -- Josselin Mouette Wed, 17 Jun 2009 22:13:18 +0200 + +gnome-applets (2.24.3.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * Stop mentioning GNOME 2. + * Remove scrollkeeper dependency. + + [ Gustavo Noronha Silva ] + * debian/patches/01_depend_on_gnomeui_directly.patch: + - make applets that use libgnomeui use GNOME_LIBS2_{CFLAGS,LIBS} + directly instead of relying on panel-applet bringing libgnomeui and + lib gnome indirectly + * debian/patches/09_modemlights_use_new_gst.patch: + debian/patches/98_autoreconf.patch: + - refreshed to accomodate the change above + + -- Gustavo Noronha Silva Mon, 25 May 2009 15:56:34 -0300 + +gnome-applets (2.24.3.1-2) unstable; urgency=low + + * 02_selector_crash.patch: new patch, stolen upstream. Fixes crash in + cpufreq-selector. Closes: #523022. + * gnome-applets-data.postinst: removed, no longer necessary after the + lenny release. + + -- Josselin Mouette Wed, 08 Apr 2009 11:42:09 +0200 + +gnome-applets (2.24.3.1-1) unstable; urgency=low + + * gnome-applets.preinst: don’t remove the statoverride upon first + installation. + * New upstream release. + * Standards version is 3.8.1. + * Recommend policykit-gnome. + * gnome-applets.preinst: add missing #DEBHELPER# + * Fix section for gnome-applets-dbg. + + -- Josselin Mouette Tue, 07 Apr 2009 13:05:43 +0200 + +gnome-applets (2.24.2-1) experimental; urgency=low + + * es.po: updated Spanish translation from Francisco Javier Cuadrado. + Closes: #502236. + * Recommend cpufrequtils. Closes: #448833. + * Remove suggests on useless frequency daemons. + * New upstream release. + * Update build-dependencies accordingly. + * Remove debconf stuff for the setuid program. + * gnome-applets.preinst: remove the statoverride before upgrade. + * Remove obsolete README.Debian. + * Replace libgnomevfs2-extra dependency by gvfs. + * 02_trashapplet_2.20.patch: removed. + * 09_modemlights_use_new_gst.patch: updated to the changes in + modemlights. + * 80_mixer_user_gstreamer_signals.patch: dropped, merged upstream. + * 01_distclean.patch: add reference. + * 98_autoreconf.patch: regenerated for the new version. + * Pass echo=/bin/echo to make to work around yet another libtool + bug from R’lyeh. + + -- Josselin Mouette Fri, 26 Dec 2008 19:57:47 +0100 + +gnome-applets (2.22.3-3) unstable; urgency=low + + [ Josselin Mouette ] + * ro.po: updated Romanian translation from Eddy Petrișor. + Closes: #489196. + + [ Loic Minier ] + * Pass --disable-battstat to configure if DEB_HOST_ARCH_OS is kfreebsd as + battstat doesn't build under GNU/kFreeBSD; thanks Petr Salinger; + closes: #494301. + + [ 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 Fri, 29 Aug 2008 10:44:33 +0200 + +gnome-applets (2.22.3-2) unstable; urgency=low + + * NACK 2.22.3-1.1 NMU. + * Switch to quilt for patch handling, refresh patches, build-depend on + quilt. + * 01_distclean.patch: patch from Peter Eisentraut to fix FTBFS if + built twice in a row. Closes: #424337. + * 98_autoreconf.patch: regenerated. + + -- Josselin Mouette Fri, 18 Jul 2008 18:19:30 +0200 + +gnome-applets (2.22.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * Brown-paper bag re-enabling of liboobs support. Closes: #485740. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/98_autoreconf.patch: + - Regenerated for the new version. + * debian/control.in: + + Updated Standards-Version to 3.8.0, no additional changes needed. + * debian/patches/09_modemlights_use_new_gst.patch: + + Updated from the Ubuntu package for the new liboobs. + + -- Sebastian Dröge Mon, 30 Jun 2008 12:50:57 +0200 + +gnome-applets (2.22.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Remove unneeded build-dependency on liboobs. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/98_autoreconf.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Mon, 02 Jun 2008 14:50:34 +0200 + +gnome-applets (2.22.1-2) unstable; urgency=low + + * Depend on gstreamer0.10-alsa | gstreamer0.10-audiosink | hurd. + Closes: #482793. + * Upload to unstable. + * Allow rarian-compat as an alternative build-dependency. + + -- Josselin Mouette Wed, 28 May 2008 02:39:51 +0200 + +gnome-applets (2.22.1-1) experimental; urgency=low + + * New upstream bugfix release: + + debian/control.in: + - Update build dependencies. + + debian/patches/98_autoreconf.patch: + - Updated to apply cleanly again. + + -- Sebastian Dröge Sat, 19 Apr 2008 20:54:49 +0200 + +gnome-applets (2.22.0-1) experimental; urgency=low + + [ Josselin Mouette ] + * gnome-keyboard-layout.xml: fix encoding declaration. + Closes: #464678. + * debian/po/nl.po: Dutch translation of Debconf templates, from + Vincent Zweije. Closes: #464447. + * Remove Recommends on imagemagick. Closes: #345093. + + [ Sebastian Dröge ] + * New upstream stable release: + + debian/control.in: + - Update build dependencies and dependencies. + - Drop gnome-applets-dev package, stuff is now in libgweather-dev. + + debian/patches/*gweather*.patch: + - Dropped, these are now in libgweather. + + debian/rules, + debian/gnome-applets-dev.install, + debian/gnome-applets.install: + - Drop all remaining parts of the internal libgweather. + + debian/patches/09_modemlights_use_new_gst.patch: + - Updated to apply cleanly again. + + debian/patches/98_autoreconf.patch: + - Updated for the new version. + + -- Sebastian Dröge Mon, 17 Mar 2008 14:01:38 +0100 + +gnome-applets (2.20.1-2) unstable; urgency=low + + * debian/patches/06_gweather-dist-files.patch: + + Updated locations and translations from upstream SVN. + + -- Sebastian Dröge Tue, 08 Jan 2008 14:38:02 +0100 + +gnome-applets (2.20.1-1) unstable; urgency=low + + [ Loic Minier ] + * Add Finnish translation of the debconf templates; thanks Esko Arajärvi; + closes: #448415. + + [ Sebastian Dröge ] + * New upstream bugfix release, with many translation updates: + + debian/patches/98_autoreconf.patch: + - Regenerated for the new version. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + Add build dependency on po-debconf. + + -- Sebastian Dröge Mon, 07 Jan 2008 10:25:50 +0100 + +gnome-applets (2.20.0-1) unstable; urgency=low + + [ Christian Perrier] + * Debconf translation updates: + - Vietnamese. Closes: #429908 + - Italian. Closes: #430198 + - French. Closes: #430990 + - German. Closes: #431152 + - Czech. Closes: #431187 + * Fix missing comma in debconf templates. Closes: #431155 + Translation unfuzzied + + [ Guilherme de S. Pastore ] + * Debconf translation updates: + - Malayalam. Closes: #430699 + - Russian. Closes: #430703 + + [ Loic Minier ] + * Document need for libgnomevfs2-extra for GNOME Weather applet in + README.Debian too; closes: #418990. + * Promote libgonmevfs2-extra to a Depends instead of a Recommends as APT + enforcement will take a little while. + + [ Sebastian Dröge ] + * New upstream release: + + debian/control.in: + - Require newer versions of GLib and Gtk. + + debian/patches/60_acpi-info-missing.patch: + - Dropped, similar solution merged upstream. + + debian/patches/06_gweather-dist-files.patch, + - Updated. + + debian/patches/10_colourado-l10n.patch: + - Dropped, merged upstream. + * debian/patches/80_mixer_user_gstreamer_signals.patch, + debian/control.in: + + Patch from Ubuntu/Bugzilla (#370937). Use signals to get notified about + mixer changes instead of polling (Closes: #424015). This requires + gst-plugins-base >= 0.10.14. + * debian/patches/09_modemlights_use_new_gst.patch, + debian/control.in: + + Patch from Ubuntu to use the new gnome-system-tools for the modemlights + applet. + * debian/patches/98_autoreconf.patch, + debian/patches/99_ltmain_as-needed.patch: + + Updated for the above patch. + + [ Josselin Mouette ] + * Demote tomboy from recommends to suggests (closes: #435601). + + -- Sebastian Dröge Fri, 21 Sep 2007 09:17:07 +0200 + +gnome-applets (2.18.0-4) unstable; urgency=low + + [ Loic Minier ] + * Recommend python-gnome2 for gconf support; thanks Richard Antony Burton; + closes: #421421. + + [ Sven Arvidsson ] + * Update package description (Closes: #324512) + - modem lights replaced with modem monitor + - sticky notes is deprecated + + [ Josselin Mouette ] + * 99_ltmain_as-needed.patch: get --as-needed back to work. + + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. Closes: #428786 + * Debconf translation updates: + - Galician. Closes: #429282 + - Portuguese. Closes: #429328 + - Swedish. Closes: #429390 + + [ Guilherme de S. Pastore ] + * New Debconf translation: + - Bulgarian. Closes: #430639 + * debian/control.in: updated maintainer e-mail address. + + -- Guilherme de S. Pastore Tue, 26 Jun 2007 13:14:47 -0300 + +gnome-applets (2.18.0-3) unstable; urgency=low + + * Change libgucharmap5-dev build dependency to libgucharmap-dev. + + -- Sebastian Dröge Thu, 26 Apr 2007 06:52:13 +0200 + +gnome-applets (2.18.0-2) unstable; urgency=low + + * Build-depend on libgucharmap5-dev instead of libgucharmap4-dev. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Add ${misc:Depends}. + * Cleanups. + * New patch, 60_acpi-info-missing, fixes crash when /proc/acpi/info is + missing, as will soon be the case in new kernels; GNOME #427562; + closes: #418992. + + -- Loic Minier Wed, 25 Apr 2007 11:44:12 +0200 + +gnome-applets (2.18.0-1) experimental; urgency=low + + * New upstream major stable release. + - Update patches 06_gweather-dist-files, 07_autoconf-automake. + - Add a libxml2-dev (>= 2.5.0) build-dep. + - Build-depend on libgnomekbdui-dev instead of libxklavier11-dev. + - Update description to mention "Invest" instead of "Stock ticker"; don't + install the gtick manpage as the invest applet supersedes it; + Ubuntu #81157. + - Drop references to the gswitchit applet and libgswitchit which are + replaced by gnomekbd. + - Drop patch 11_umount-progress-bar, obsoleted by gnome-mount. + - Adapt man page generation. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Drop distclean in clean::. + + -- Loic Minier Sat, 24 Mar 2007 12:55:26 +0100 + +gnome-applets (2.16.2-3) experimental; urgency=low + + * Merge 2.14.3-5 and 2.14.3-6; SVN r8331:9207. + - Update patches 05_gweather-dist-fixes, 06_gweather-dist-files, + 07_autoconf-automake. + - Drop en_GB hunk in 10_colourado-l10n; merged upstream. + + -- Loic Minier Sat, 24 Mar 2007 10:51:55 +0100 + +gnome-applets (2.16.2-2) experimental; urgency=low + + [ Josselin Mouette ] + * Merge 2.14.3-4. + * Recommend libgnomevfs2-extra (closes: #405340). + * Build-depend on pygtk 2.10 to make the configure script work even + without a DISPLAY (closes: #407585). + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Add an epoch to the libgnomevfs2-dev build-dep; closes: #411661. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Bump build-deps to libgtk2.0-dev >= 2.10.0, libgnomeui-dev >= 2.16.0-2, + add build-dep on libbonobo2-dev (>= 2.15.0), librsvg2-common (>= 2.16.0-2) + to get versions past all transitions; these are workarounds for the + current build issues. + + -- Loic Minier Tue, 20 Feb 2007 14:50:36 +0100 + +gnome-applets (2.16.2-1) experimental; urgency=low + + * New upstream release. + * Update patches. + * Update all build-dependencies. + * Bump shlibs requirement. + * Recommend tomboy. + * Remove command-line applet from description. + * Use ${gnome:Version} for the gnome-applets-data dependency. + + rules: call gnome-version.mk. + + Build-depend on gnome-pkg-tools 0.6. + * Update watch file. + * gnome-applets-data.install: install the python modules. + * Call dh_pysupport to generate python dependencies. + * Build-depend on python-support 0.4. + * pyversions: require python 2.4. + + -- Josselin Mouette Thu, 21 Dec 2006 23:45:31 +0100 + +gnome-applets (2.14.3-6) unstable; urgency=low + + * Rework the packaging fix for Locations.xml translations completely. + - Rename patch 06_gweather-dist-fixes to 05_gweather-dist-fixes and limit + it to autofoo changes to: configure.in, gweather/Makefile.am, + Makefile.am. + - New patch, 06_gweather-dist-files, ships gweather/Locations.xml.in and + files which would be disted below po-locations/ (mostly *.po files). + - Rename patch 07_automake to 07_autoconf-automake and update it to also + refresh configure. + - Update patch 10_colourado-l10n to change po-locations/en_GB.po and ka.po + instead of Locations.xml. + * cpufreq-selector manpage by Theppitak Karoonboonyanan; closes: #415979. + + -- Loic Minier Fri, 23 Mar 2007 18:57:20 +0100 + +gnome-applets (2.14.3-5) unstable; urgency=high + + * Add a get-orig-source target to retrieve the upstream tarball. + * Fix upstream packaging to ship gweather/Locations.xml.in; closes: #415315. + - New patch, 06_gweather-dist-fixes, fixes gweather/Makefile.am to dist + the Locations.xml.in and adds Locations.xml.in from upstream's SVN, + gnome-2-14 branch; GNOME #419863. + - New patch, 07_automake, result of an automake-1.8 run. + - Update patch 08_gweather_locations to patch Locations.xml.in instead of + Locations.xml. + + -- Loic Minier Mon, 19 Mar 2007 18:19:29 +0100 + +gnome-applets (2.14.3-4) unstable; urgency=medium + + * gl.po: Galician debconf translation from Jacobo Tarrio + (closes: #405400). + * 08_gweather_locations.patch: updated thanks to Kevin Brown, fix + location of the Santa Clara airport (closes: #378641). + + -- Josselin Mouette Wed, 3 Jan 2007 19:42:59 +0100 + +gnome-applets (2.14.3-3) unstable; urgency=low + + [ Sven Arvidsson ] + * New patch, 11_umount-progress-bar, to display a progress bar when + umounting an USB stick (or other volumes); taken from the Ubuntu + packages as well as the translations. Includes the fix from #400996. + (Closes: #398373) + + [ Loic Minier ] + * Upload. + + -- Loic Minier Mon, 4 Dec 2006 20:18:33 +0100 + +gnome-applets (2.14.3-2) unstable; urgency=low + + [ Loic Minier ] + * Add Dutch translation of Debconf templates, thanks Esther Hanko. + (Closes: #355389) + * Add Russian translation of Debconf templates, thanks Yuri Kozlov. + (Closes: #382076) + + [ Christian Perrier ] + * Debconf translations: + - Vietnamese added. Closes: #314188 + - German added. Closes: #355557 + - Danish added. Closes: #352481 + - Italian added. Sent during the call for updates of the NMU campaign. + + [ Loic Minier ] + * Sync with latest debian/po/* files; under others: update .pot, update + de.po's encoding. + * New patch, 10_colourado-l10n, to fix use of "Colourado Springs" instead + of, well, Colorado; thanks David Breakey; closes: #396223. + + [ Christian Perrier ] + * Debconf translations: + - Romanian added. Sent during the call for updates of the NMU campaign. + * Fix a fuzzy string in ja.po. + + -- Loic Minier Sun, 5 Nov 2006 18:54:20 +0100 + +gnome-applets (2.14.3-1) unstable; urgency=low + + [ Loïc Minier ] + * New patch by Christophe Mutricy for the translation of "knots" in french. + (Closes: #369889) + [debian/patches/10_knots-french-translation.patch] + * New patch thanks to Christian Pernegger for the translation of "Vienna" in + german. (Closes: #357795) + [debian/patches/11_vienna-german-translation.patch] + + [ Josselin Mouette ] + * debian/po/lt.po: Lithuanian translation of debconf templates + (closes: #381234). + + [ Loic Minier ] + * New upstream release, "Codename Glade". + - Drop 10_knots-french-translation, merged upstream. + - Drop 11_vienna-german-translation, merged upstream. + + -- Loic Minier Tue, 8 Aug 2006 10:13:17 +0200 + +gnome-applets (2.14.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Recommend deskbar-applet (closes: #368528). + + [ Loic Minier ] + * Remove dup build-dep on xlibs-static-dev. + [debian/control, debian/control.in] + * Drop all xlibs-static-dev build-deps altogether. + [debian/control, debian/control.in] + * New upstream release. + + -- Loic Minier Wed, 31 May 2006 17:00:42 +0200 + +gnome-applets (2.14.1-1) unstable; urgency=low + + [ Loic Minier ] + * Fix GNU/kFreeBSD build-deps (libhal-dev) and dependencies + (gstreamer0.8-alsa versus -oss), thanks Robert Millan. (Closes: #353170) + [debian/control, debian/control.in, debian/rules] + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version} and ${binary:Version}. + * New upstream release. + * Update build-dependencies. + * Use debhelper mode 5. + * Switch to gstreamer 0.10. + * Use type-handling for build-dependencies. + * Remove unnecessary hacks for generating dependencies. + * gnome-applets-data.{install,postinst}: remove the horrible defaults + added to the system default source. + * 08_gweather_locations.patch: updated. + * 09_gweather_translation.patch,stickynotes-utf-8-date-title.patch, + 10_kfreebsd.patch: removed, integrated upstream. + * Enable gstreamer for hurd-i386 but don't depend on an audiosink as + there isn't one available. + * Cleanup *.install. + * gnome-applets{,-data}.install: ship libgweather. + * Add a shlibs statement about libgweather. + + -- Josselin Mouette Fri, 19 May 2006 18:45:10 +0200 + +gnome-applets (2.12.3-1) unstable; urgency=low + + * New upstream release: updated translations. + * [debian/control.in, debian/rules] The square brackets syntax for + architecture-specific dependencies is only defined for build-time + relationships, not for run time relationships like "Suggests". Use + dpkg-architecture and a sed construct to make the 'acpid' suggestion on + architectures where it is available. + + -- J.H.M. Dassen (Ray) Sun, 12 Feb 2006 17:40:59 +0100 + +gnome-applets (2.12.2-4) unstable; urgency=low + + [ Gustavo Noronha Silva ] + * Upload to unstable + + [ Josselin Mouette ] + * 03_battstat_default.patch, 07_drivemount_mediamount.patch: removed. + * gnome-applets.gconf-defaults: set the defaults here. + * control.in: require debhelper 5.0.13. + + -- Josselin Mouette Sun, 8 Jan 2006 11:41:52 +0100 + +gnome-applets (2.12.2-3) experimental; urgency=low + + * Build against dbus >= 0.60 + + -- Sjoerd Simons Sun, 18 Dec 2005 21:19:57 +0100 + +gnome-applets (2.12.2-2) experimental; urgency=low + + * Minor cleanups in debian/rules. + * Add patch from Ryuichi Arafune to convert date_title + from the current locale to UTF-8 in stickynotes. (Closes: #319127) + [debian/patches/stickynotes-utf-8-date-title.patch] + + -- Loic Minier Tue, 13 Dec 2005 10:07:29 +0100 + +gnome-applets (2.12.2-1) experimental; urgency=low + + * New upstream release + + -- Guilherme de S. Pastore Wed, 30 Nov 2005 14:35:57 -0200 + +gnome-applets (2.12.1-2) experimental; urgency=low + + * debian/control.in: + - eliminated circular dependency by removing the dependency of + gnome-applets-data on gnome-applets (Closes: #339912) + * debian/patches/10_kfreebsd.patch: + - apply patch from Aurelien Jarno to allow + build on kfreebsd-gnu. Thanks! (Closes: #320962) + * debian/po/pt_BR.po: updated/fixed. + + -- Guilherme de S. Pastore Thu, 17 Nov 2005 14:23:57 -0200 + +gnome-applets (2.12.1-1) experimental; urgency=low + + [ Guilherme de S. Pastore ] + * New maintainer + Thanks a lot for all your work, Marc! + + * New upstream release + - Fixes crash with sticky notes properties dialog (Closes: #318517) + - Displays last update time in gweather in local time (Closes: #319471) + - Keyboard indicator now includes disambiguations for layouts with + equal short descriptions (Closes: #319605) + + * Dropped the following patches; issues fixed upstream: + - 01_battstat_update.patch + - 02_battstat_icon.patch + - 04_battstat_no_suspend.patch + - 05_gtik_3decimalplaces.patch + - 06_stickynotes_docs_dupe_id.patch + - 09_cpufreq_handle_missing_scaling_available_frequencies_file.patch + + * New or updated debconf templates translations: + - fr; thanks to Jean-Luc (Closes: #317529) + - pt_PT; thanks to Rui Branco (Closes: #330381) + - sv; thanks to Daniel Nylander (Closes: #333319) + + * debian/patches: + - 09_gweather_translation.patch: get fix for German translation from + upstream CVS (Closes: #338374) + + * debian/control.in: + - dropped double build dependency on debhelper + - updated build dependencies for the new version + - tighten dependencies and recommendations for 2.12 versions + - dropped versioning for dependencies and build-dependencies on + cdbs and scrollkeeper, stable already has greater versions + + * debian/copyright: + - added note about the maintainer change + - changed downloaded-from URL to use HTTP instead of FTP + + * debian/gnome-applets.{config,postinst}: + - applied patch from Robert Millan to allow + installation on kfreebsd-gnu. Thanks! + + * debian/watch: + - updated + + [ Loic Minier ] + * Update Czech translation of debconf templates. (Closes: #321735) + + [ Josselin Mouette ] + * Pass --as-needed to ld. + + [ Gustavo Noronha Silva ] + * debian/rules, debian/gnome-applets-dev.install: + - no longer build on the debian/build directory, since it breaks + the building of gnome-doc-utils stuff and causes no dirty on the + Debian diff + + -- Guilherme de S. Pastore Wed, 16 Nov 2005 16:49:11 -0200 + +gnome-applets (2.10.1-5) unstable; urgency=low + + * Added necessary build-deps for Xorg transition. + + -- Marc Dequènes (Duck) Wed, 13 Jul 2005 15:30:39 +0200 + +gnome-applets (2.10.1-4) unstable; urgency=low + + * Recommends : s/gnome-netstatus/gnome-netstatus-applet/ + (Closes: #314176) + * Fixed override disparities for gnome-applets-dbg + (s/optional/extra/). + * Disabled gstreamer support on Hurd (thanks to Michael Banck). + * Now building in 'debian/build/' directory (cleaner). + * Applied patch for cpufreq to "handle missing scaling available + frequencies file" from Johannes Berg (Closes: #314331). + * Suggests 'cpufreqd | cpudyn | powernowd' for cpufreq applet. + * Added SUID handling via debconf for cpufreq-applet (Closes: #311109) + with updated French, Brazilian Portuguese and Czech translations + (Closes: #312436). + * Removed clean rule hack to work around #299010. + * Increased Standards-Version (no changes needed). + * Removed obsolete Conflicts/Replaces. + * Use type-handling Provides intead of this once again fucked utility + directly (Thanks to Np23[79] for advice). + + -- Marc Dequènes (Duck) Mon, 27 Jun 2005 23:50:32 +0200 + +gnome-applets (2.10.1-3) unstable; urgency=low + + * Upload to unstable. + + -- Marc Dequènes (Duck) Fri, 10 Jun 2005 21:17:02 +0200 + +gnome-applets (2.10.1-2) experimental; urgency=low + + * Get rid of buggy mc-install-default-macros ; made a .entries file to + be loaded with gconftool-2 as replacement. + * Added necessary Conflicts/Replaces/Provices for trashapplet to ease + migration from Sarge (trashapplet is now included into applets) + (Closes: #306871). + + -- Marc Dequènes (Duck) Thu, 5 May 2005 13:51:55 +0200 + +gnome-applets (2.10.1-1) experimental; urgency=low + + * New upstream release + * Mass build-depends and depends update (Closes: #292679). + * Added Replaces/Conflicts/Provides on gnome-cpufreq-applet. + * Now depending on gnome-icon-theme where several applet icons lies. + * Defaulting to 'gstreamer0.8-alsa' dependency instead of + 'gstreamer0.8-oss' (OSS is DEPRECATED and must die). + * Removed the following patches now included upstream : + + 06_gweather_utf8.patch + + 11_batstat_ui_fix.patch + * Removed the following patches now obsolete : + + 01_keep_keyprop.patch + + 02_gkb_xmmap.patch + + 03_modemlights_ppp_commands.patch + + 07_inboxmonitor_ssl.patch + + 10_batstat_transparent_background.patch + + 12_buildsys_relibtoolized.patch + * Regenerated patches : + + 08_gweather_locations.patch + + 09_drivemount_mediamount.patch + * Removed obsolete Indian & Latvian language support files. + * Fixed 'debian/gnome-keyboard-layout.xml' man page source typo + (Closes: #302733). + * Fixed in 2.10 branch : + + gkb disables VT switching in XFree86 4.3 (Closes: #233702). + + gweather: would be nice to show a moon during night-time clear sky + (Closes: #201984). + + include NYC Central Park (Closes: #304137). + + xml parsing errors during upgrade (Closes: #286125). + + gnome-keyboard-applet no longer show flag icon (flags removed) + (Closes: #285478) (see the "NO Flags Policy" thread : + http://mail.gnome.org/archives/desktop-devel-list/2003-November/ \ + msg00267.html ) + * Invalidated by major upstream changes : + + mailcheck removed (Closes: #285331, #89940, #82874, #292349, #207355, + #245142, #286360, #89940, #184186). + + cdplayer removed (Closes: #280436). + + wireless removed (no bugs). + + modemlights rewritten (Closes: #247209, #273429, #220796, #115732, + #173420). + + drivemount rewritten (Closes: #70456, #173545). + * Added 'gnome-applets-dbg.' binary package. + * Renamed 'postinst' to 'gnome-applets.postinst'. + * Added 'debian/README.Debian' with information about cpufreq applet + SUID parameter. + * Patch stolen from Ubuntu package (thanks to seb128's work) : + + 05_battstat-icon.patch : patch from Ryan Lortie to + fix some refresh issue with battstat. + + 06_battstat-default.patch : changed the default configuration for the + battstat applet (show battery activated by default). + + 08_battstat-no-suspend.patch : disable the suspend-on-double-click, + which is not yet working. + + 13_stickynotes-docs-dupe-id.patch : documentation fix. + * Reindexed patches. + * Removed extra cleanup rules (buildsys has learned hygiene). + * Fixed stupid cut-and-paste mistake in 'debian/copyright'. + * Updated 'debian/watch'. + * Temporarily reverted 'debian/control' generation to please ftpmasters + before a real solution is found and accepted. + + -- Marc Dequènes (Duck) Sun, 17 Apr 2005 02:57:49 +0200 + +gnome-applets (2.8.2-1) unstable; urgency=low + + * New upstream release. + * Suggests 'acpid' only on available architectures. + * Updated policy to 3.6.1.1 (no changes needed). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Sun, 12 Dec 2004 01:05:40 +0100 + +gnome-applets (2.8.1.1-4) unstable; urgency=low + + * Makes 'gstreamer0.8-oss' the default audiosink, as we have the OSS + burden in Sarge (Closes: #282745). + * Applied patch from CVS to add transparent background (Closes: + #272895). + * Applied patch from CVS to fix UI padding and key shortcut typo. + * CDBS Tweaks. + + -- Marc Dequènes (Duck) Sun, 28 Nov 2004 16:19:33 +0100 + +gnome-applets (2.8.1.1-3) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 19 Nov 2004 19:50:04 +0100 + +gnome-applets (2.8.1.1-2) experimental; urgency=low + + * Applied fixes : + + [inbox_monitor] patch from gnomezilla to add SSL support to + applet (Closes: #216324). + + [gweather] corrected Dulles zone (DCZ013->VAZ042), Washington DC + zone was corrected upstream (Closes: #278143). + + [drivemount] FHS compliance fix : mount point for removeable + media is /media and not /mnt (Closes: #265184). + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Sun, 14 Nov 2004 00:14:52 +0100 + +gnome-applets (2.8.1.1-1) experimental; urgency=low + + * New upstream release : + + fix sticky notes not remembering hidden status + (Closes: #275819). + * 'libapm-dev' build-dep now restricted to linux architectures + (Closes: #272773). + + -- Marc Dequènes (Duck) Thu, 14 Oct 2004 23:14:28 +0200 + +gnome-applets (2.8.0-1) experimental; urgency=low + + * New upstream release : + + corrected tabs titles (Closes: #264293). + + gswitchit help added (Closes: #241892). + + modemlights connect time and throughtput not shown is obsolete + bug (Closes: #114524). + + gkb is now setxkbmap-compatible (Closes: #255680). + * Removed '05_gkb_swedish_dollar.patch' now included upstream. + * Regenerated relibtoolize patch. + * 'debian/control.in' : using more ${misc:Depends} and updated + versions. + * Added gtik patch from Jason Thomas to get 3 + decimal places instead of 2 to comply with Yahoo behavior (Closes: + #267526). + * Added gweather patch from Gareth Owen in + gnomezilla to correct UTF-8 problems (Closes: #205303). + + -- Marc Dequènes (Duck) Wed, 15 Sep 2004 00:16:05 +0200 + +gnome-applets (2.7.0-1) unstable; urgency=low + + * New upstream release + * Removed now included patch '05_cvs_gweather_windspeed.patch'. + * Removed now included patch '06_cvs_gweather_size.patch'. + * Regenerated relibtoolize patch. + + -- Marc Dequènes (Duck) Wed, 21 Jul 2004 22:13:31 +0200 + +gnome-applets (2.6.2-1) unstable; urgency=low + + * The 'Bughunt party release'. + * New upstream release, fix the following : + + [mixer] restore saved channel on startup (Closes: #253232) + + [gweather] fixed memory leaks (Closes: #171743) + * Gstreamer support is back. + * Moved Gstreamer Audio output pluggins to Depends as too many people + complains Mixer applet is not working and not looking carefully at + pkg information (Closes: #250393). + * Added watch file (Thx to seb128). + * Applied patches from CVS : + + [gweather] (corrected) get windspeed mesurement in m/s + (Closes: #169699) + + [gweather] size follow panel size (Closes: #217087) + * Applied patch to add dollar sign for swedish keyboard (Closes: + #234103). + * Added Latvian language support in gkb provided by Aigars Mahinovs + (Closes: #220451). + * Removed APM PPC patch as the problem is now fixed upstream. + * Regenerated relibtoolize patch (now much lighter : 2.9MB -> 60KB + uncompressed, upstream stopped using prehistoric tools ;-). + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS magic feature for updating autostuff files. + * Updated some Build-Depends/Depends versions. + + -- Marc Dequènes (Duck) Sun, 4 Jul 2004 20:03:12 +0200 + +gnome-applets (2.6.1-7) unstable; urgency=high + + * Urgency high because needed in testing. + * Gstreamer support temporarily deactivated to allow applets to enter + testing (gst-plugins0.8 not available in testing yet). + * Added missing Recommends on 'gnome-system-monitor' (in addition to + the rebuild with libgtop2 in -6, Closes: #246567). + * Added missing Builddep on 'sharutils'. + * Added Conflict/Replace on 'gnome-core' needed for woody transition + (Closes: #252474). + * Added 'gnome-media' to Recommends (Closes: #252435). + + -- Marc Dequènes (Duck) Tue, 22 Jun 2004 11:10:06 +0200 + +gnome-applets (2.6.1-6) unstable; urgency=low + + * Updated Build-dep on 'libgtop2-dev' because new pkg correct + important shlibdeps problems (and would perhaps correct #246567). + + -- Marc Dequènes (Duck) Sun, 30 May 2004 18:03:42 +0200 + +gnome-applets (2.6.1-5) unstable; urgency=low + + * Added Gstreamer Audio output pluggins to Recommends, needed by the + Mixer applet (Closes: #250393). + * Added Indian Languages support (GKB flag & keyprops) created by the + IndLinux project (Thx to Jaldhar H. Vyas) (files licensed under GPL) + (Closes: #250694). + * Added patch for battstat applet from Ludovic Rousseau (should + Closes: #234889). + + -- Marc Dequènes (Duck) Sat, 29 May 2004 17:33:39 +0200 + +gnome-applets (2.6.1-4) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 19:53:56 +0200 + +gnome-applets (2.6.1-3) experimental; urgency=low + + * Added missing build-dep on 'xlibs-static-dev' (Closes: #250365). + * Now building against gstreamer 0.8. + * gtk-doc generation disabled. + + -- Marc Dequènes (Duck) Sun, 23 May 2004 12:44:09 +0200 + +gnome-applets (2.6.1-2) experimental; urgency=low + + * Readded 04_apm_ppc.patch still necessary (Closes: #249622). + * Improved gnome-applets-data dependencies (Closes: #247060). + * s/2.6.0/2.6.1/ on all Depends/Build-Depends. + + -- Marc Dequènes (Duck) Thu, 20 May 2004 16:36:04 +0200 + +gnome-applets (2.6.1-1) experimental; urgency=low + + * New upstream release + * Removed 03_gweather_fix_meteo_condition.patch now included upstream. + * Relibtoolized to avoid inflated dependencies ('Makefile.in' files + regenerated too to build correctly => fat patch). + * Added some more cleanups in 'clean' rule. + * Removed 04_apm_ppc.patch not needed anymore. + + -- Marc Dequènes (Duck) Sat, 15 May 2004 04:05:07 +0200 + +gnome-applets (2.6.0-4) experimental; urgency=low + + * Corrected a silly mistake in Build-Depends. + + -- Marc Dequènes (Duck) Fri, 9 Apr 2004 04:59:26 +0200 + +gnome-applets (2.6.0-3) experimental; urgency=low + + * Added improved patch from Arnaud Patard to correct parsing of meteo + condition. + * Added missing Build-Depends on libxklavier. + * Rebuilt using libgstreamer needed by the mixer applet. + * Activated IPv6 support. + * Added patch for APM on PPC from Thom May. + + -- Marc Dequènes (Duck) Wed, 31 Mar 2004 01:49:30 +0200 + +gnome-applets (2.6.0-2) experimental; urgency=low + + * Reactivated mini-commander default macros generation. + * Created new binary pkg 'gnome-applets-dev' containing materials to + build extensions for some applets. + * Added patch from Arnaud Patard to correct parsing of meteo + condition. + * Reapplied old patch for modemlights using bad commands : + s/pppon/pon/ & s/pppoff/poff/. + * Added missing manpages for 'gnome-keyboard-layout' and 'gswitchit- + plugins-capplet'. + * Rebuild against new libgtop2-2. + * Updated Build-Depends. + * Improved 'debian/copyright'. + * 'debian/control', 'debian/changelog' and 'debian/copyright' are now + UTF-8 encoded. + + -- Marc Dequènes (Duck) Sun, 28 Mar 2004 23:02:47 +0200 + +gnome-applets (2.6.0-1) experimental; urgency=low + + * New maintainer (Closes: 238880). + * New upstream release + * Fixed in new release : + + sticky-notes is working again (Closes: 238445). + + gweather now display '--' when temperature not available (Closes: + 239113). + + Disk Mounter USB stick icon available (Closes: 225122). + + 'debian/prerm' typo error obsoleted by new packaging (Closes: + 235685). + * Switched to compatility level 4. + * Now using CDBS. + * Removed obsolete 'prerm' & 'postrm' and cleaned 'postinst'. + * Removed silly CM 'README.Debian'. + + -- Marc Dequènes (Duck) Sat, 27 Mar 2004 23:20:58 +0100 + +gnome-applets (2.4.2-5) unstable; urgency=low + + * debian/control set Maintainer to Debian QA Group + + -- Christian Marillat Sat, 20 Mar 2004 09:48:44 +0100 + +gnome-applets (2.4.2-4) unstable; urgency=low + + * all my + + -- Christian Marillat Fri, 19 Mar 2004 15:25:44 +0100 + +gnome-applets (2.4.2-3) unstable; urgency=low + + * Split the package in two packages one package with binaries another one + with data (Closes: #233362) + * Fix typo in prerm script. + + -- Christian Marillat Sun, 22 Feb 2004 16:01:03 +0100 + +gnome-applets (2.4.2-2) unstable; urgency=low + + * Add acpid in suggests (Closes: #230867) + * Remove DTD hack and update scrollkeeper dependency to 0.3.14-5 + + -- Christian Marillat Sun, 8 Feb 2004 10:47:48 +0100 + +gnome-applets (2.4.2-1) unstable; urgency=low + + * New upstream release. + * Call mc-install-default-macros in postinst to install default macros for + mini-commander. + * Remove 03_acpi and 05_omf patches included by upstream + + -- Christian Marillat Fri, 16 Jan 2004 22:23:56 +0100 + +gnome-applets (2.4.0-5) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + + -- Christian Marillat Fri, 9 Jan 2004 15:46:37 +0100 + +gnome-applets (2.4.0-4) unstable; urgency=low + + * Update depends on gnome-panel to 2.4.0 + * Rewrote patch 04_modemlights, was broken in -3 (Closes: #224198) + + -- Christian Marillat Tue, 30 Dec 2003 22:52:41 +0100 + +gnome-applets (2.4.0-3) unstable; urgency=low + + * New patch to fix build problem with later kernel-headers package + (Closes: #221874) + * New patch to fix broken omf file (Closes: #218916) + + -- Christian Marillat Sun, 7 Dec 2003 12:03:17 +0100 + +gnome-applets (2.4.0-2) unstable; urgency=low + + * Update Build-Depends to GNOME 2.4 packages (Closes: #217580) + * Patch from bugzilla to fix acpi in batstat applet (CLoses: #212969) + + -- Christian Marillat Sun, 26 Oct 2003 09:20:02 +0100 + +gnome-applets (2.4.0-1) unstable; urgency=low + + * New upstream release. + * Imporve description for new applets (Stickynotes, accessx-status and mailcheck) + + -- Christian Marillat Sat, 18 Oct 2003 15:36:53 +0200 + +gnome-applets (2.2.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 24 Sep 2003 15:10:51 +0200 + +gnome-applets (2.2.2-2) unstable; urgency=low + + * Improve battstats description (Closes: #201268) + * For now, remove broken omf files (unmaintained by upstream) (Closes: #195939) + + -- Christian Marillat Tue, 22 Jul 2003 16:05:16 +0200 + +gnome-applets (2.2.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 18 May 2003 19:28:21 +0200 + +gnome-applets (2.2.1-2) unstable; urgency=low + + * Fix wrong install path (Closes: #184876, #184658) + * Update libgnomeui-dev build-dependency to 2.2.0.1-2 (Closes: #185104) + + -- Christian Marillat Mon, 17 Mar 2003 08:25:38 +0100 + +gnome-applets (2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 10 Mar 2003 21:20:48 +0100 + +gnome-applets (2.2.0-1) unstable; urgency=low + + * New upstream release. + * Move mc-install-default-macros in /usr/lib/gnome-panel + * Remove mixer patch included by upstream. + * Need to Build-Depends on libapm-dev + * Weather applet apply changes immediately (Closes: #135788) + + -- Christian Marillat Sun, 26 Jan 2003 19:52:42 +0100 + +gnome-applets (2.1.3-1) unstable; urgency=low + + * New upstream release. + * Bump Standards-Version to 3.5.8 + * Remove acpi patche included by upstream. + * Move applets binaries in /usr/lib/gnome-panel + * Update description, new wireless applet. + + -- Christian Marillat Fri, 17 Jan 2003 22:14:25 +0100 + +gnome-applets (2.0.4-1) unstable; urgency=low + + * New upstream release. + * Remove previous acpi patche and acpi dependency. Add a new patche from + http://cvs.gentoo.org/~hanno/ + Should (Closes: #168283, #169496, #169753, #169944) + + -- Christian Marillat Fri, 22 Nov 2002 14:16:40 +0100 + +gnome-applets (2.0.3-7) unstable; urgency=low + + * Patch from Itay Ben-Yaacov to use the acpi backend instead of the broken + acpi code in the battstat applet (Closes: #168283) + + -- Christian Marillat Fri, 15 Nov 2002 17:53:24 +0100 + +gnome-applets (2.0.3-6) unstable; urgency=low + + * Add a conflicts for battstat-applet (Closes: #167871) + + -- Christian Marillat Tue, 5 Nov 2002 16:02:01 +0100 + +gnome-applets (2.0.3-5) unstable; urgency=low + + * Upload to unstable + * Mixer applet work with devfs (Closes: #146028) + * No more problem with the mini-commander and focus (Closes: #115704, #116986) + * The gnotes applet has been removed (Closes: #143353) + * The tick-a-stat applet has been removed (Closes: #149408, #105225) + * Now you can add an URL for radar map in the gweather applet (Closes: #111974) + * ACPI support for battstat applet (Closes: #144604) + * Diskusage applet has been removed (Closes: #147074) + * gweather now display pressure in the right unit (Closes: #97137) + * No more redraw problem with battstat (Closes: #99488) + * Same as above but for the gweather applet (Closes: #106290, #126256) + * Typo fixed in German translation for modemlights (Closes: #111906) + * Gweather should uses non-blocking network I/O (Closes: #131624) + * mini-commander properties box can be resized (Closes: #83068) + + -- Christian Marillat Mon, 28 Oct 2002 15:17:22 +0100 + +gnome-applets (2.0.3-4) experimental; urgency=low + + * Apply patch from Chris Hanson to not reset the speaker volume in the + mixer applet (Closes: #164949) + * Apply patche from James D Strandboge to fix ACPI in battstat applet + (Closes: #152183) + + -- Christian Marillat Wed, 23 Oct 2002 20:25:12 +0200 + +gnome-applets (2.0.3-3) experimental; urgency=low + + * Upload with original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:54:44 +0200 + +gnome-applets2 (2.0.3-2) experimental; urgency=low + + * Upload without the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 19:02:48 +0200 + +gnome-applets2 (2.0.3-1) experimental; urgency=low + + * New upstream release. + * Update to standards version 3.5.7 + + -- Christian Marillat Sun, 15 Sep 2002 17:15:42 +0200 + +gnome-applets2 (2.0.2-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 27 Aug 2002 11:18:15 +0200 + +gnome-applets2 (2.0.1-4) experimental; urgency=low + + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:50:58 +0200 + +gnome-applets2 (2.0.1-3) experimental; urgency=low + + * Replace pppon/pppoff by pon/poff in modemlights applet. + * Rebuild against the latest libgtk 2.0.6 + + -- Christian Marillat Tue, 13 Aug 2002 15:45:20 +0200 + +gnome-applets2 (2.0.1-2) experimental; urgency=low + + * Cleanup the diff (remove omf, server.in, server files) (Closes: #154120) + + -- Christian Marillat Tue, 23 Jul 2002 15:51:03 +0200 + +gnome-applets2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 21 Jul 2002 19:53:44 +0200 + +gnome-applets2 (2.0.0-2) experimental; urgency=low + + * Fix broken omf files (Closes: #153659) + + -- Christian Marillat Sat, 20 Jul 2002 19:09:27 +0200 + +gnome-applets2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 11 Jun 2002 16:18:18 +0200 + +gnome-applets2 (1.105.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 3 Jun 2002 16:53:17 +0200 + +gnome-applets2 (1.104.0-1) experimental; urgency=low + + * New upstream release. + * Remove call Internet DTD. + + -- Christian Marillat Tue, 28 May 2002 20:35:15 +0200 + +gnome-applets2 (1.103.0-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * debian/postinst check if schemas files are present before calling + gconftool-2 + + -- Christian Marillat Mon, 27 May 2002 15:53:46 +0200 + +gnome-applets2 (1.103.0-1) experimental; urgency=low + + * new upstream release. + + -- Christian Marillat Tue, 21 May 2002 14:38:17 +0200 + +gnome-applets2 (1.102.1-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Wed, 15 May 2002 21:53:06 +0200 + +gnome-applets2 (1.101.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:41:55 +0200 + +gnome-applets2 (1.100.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 29 Apr 2002 21:14:09 +0200 + +gnome-applets2 (1.99.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 17 Apr 2002 16:23:56 +0200 + +gnome-applets2 (1.98.0-1) experimental; urgency=low + + * News upstream release. + + -- Christian Marillat Sun, 14 Apr 2002 18:12:50 +0200 + +gnome-applets2 (1.96.0-1) experimental; urgency=low + + * New upstream release. + * Added scrollkeeper support in postinst/postrm + + -- Christian Marillat Mon, 11 Mar 2002 14:16:12 +0100 + +gnome-applets2 (1.95.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 5 Mar 2002 16:48:38 +0100 + +gnome-applets2 (1.94.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 25 Feb 2002 14:21:04 +0100 + +gnome-applets2 (1.93.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 18 Feb 2002 14:30:43 +0100 + +gnome-applets2 (1.92.2-1) experimental; urgency=low + + * New upstream release + + -- Christian Marillat Fri, 15 Feb 2002 00:33:38 +0100 + +gnome-applets2 (1.90.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 15:49:42 +0100 + +gnome-applets (1.4.0.4-2) unstable; urgency=low + + * debian/control replace xml-i18n-tools by intltool + * debian/control Spell check (Closes: #124683) + * Clicking on gweather brings up detailed forecast (Closes: #90911) + * New patch against the battery applet to enable ACPI support. Thanks to + Matthew Danish (Closes: #116467) + + -- Christian Marillat Sat, 22 Dec 2001 19:23:35 +0100 + +gnome-applets (1.4.0.4-1) unstable; urgency=low + + * New upstream release. + * Fix typo in description (Closes: #110464) + * Fix some typos in sgml files + + -- Christian Marillat Wed, 5 Sep 2001 17:33:10 +0200 + +gnome-applets (1.4.0.3-1) unstable; urgency=low + + * New upstream release. + * debian/*.sgml Use docbook 4.1 + + -- Christian Marillat Fri, 10 Aug 2001 16:50:00 +0200 + +gnome-applets (1.4.0.2-1) unstable; urgency=low + + * New upstream release. + * Switch to debhelper V3 + * Removed mixer patch included by upstream. + * Update config.{guess,sub} we never know :) + * Patch against cpumemusage/proc.c to call the right libgtop function (Closes: #102466) + * slash_applet background not harcoded (Closes: #96113) + * In multiload_applet speed is replaced by interval (Closes: #75780) + + -- Christian Marillat Thu, 12 Jul 2001 23:14:09 +0200 + +gnome-applets (1.4.0.1-2) unstable; urgency=low + + * Add replace sound-monitor (Closes: #97791) + + -- Christian Marillat Thu, 17 May 2001 14:55:25 +0200 + +gnome-applets (1.4.0.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 9 May 2001 16:37:10 +0200 + +gnome-applets (1.4.0-2) unstable; urgency=low + + * Build depends on scrollkeeper (Closes: #93979) + + -- Christian Marillat Sat, 14 Apr 2001 20:48:23 +0200 + +gnome-applets (1.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 19 Mar 2001 12:11:23 +0100 + +gnome-applets (1.3.1-1) unstable; urgency=low + + * New upstream release + * debian/control Add xml-i18n-tools and scrollkeeper in build-depends + * debian/control Add scrollkeeper in depends + * debian/{postinst,prerm} Call scrollkeeper-update. + * New patch applet-docs.make for scrollkeeper + * gweather doesn't eats up cpu time (Closes: #87370) + * mini commander doesn't hangs on empty command line (Closes: #84293) + * mini commander now save its properties (Closes: #81602) + * The mixer applet works on PPC (Closes: #71681) + * New patch, make slashdot the default for the slashapp applet (Closes: #88459) + * I wrote 31 manpages then add docbook-to-man in build depends (Closes: #86974) + + -- Christian Marillat Tue, 6 Mar 2001 19:08:52 +0100 + +gnome-applets (1.2.4-5) unstable; urgency=low + + * Add libzvt-dev in build-depends (Closes: #87065) + + -- Christian Marillat Fri, 23 Feb 2001 09:38:02 +0100 + +gnome-applets (1.2.4-4) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.11 + + -- Christian Marillat Wed, 14 Feb 2001 14:12:29 +0100 + +gnome-applets (1.2.4-3) unstable; urgency=low + + * debian/control Add recommends imagemagick (Closes: #82955, #83229) + + -- Christian Marillat Sat, 20 Jan 2001 15:02:46 +0100 + +gnome-applets (1.2.4-2) unstable; urgency=low + + * Apply patch for mixer on PPC (Closes: #78268) + + -- Christian Marillat Wed, 6 Dec 2000 21:54:49 +0100 + +gnome-applets (1.2.4-1) unstable; urgency=low + + * New upstream release. + * Corrected spanish locale (Closes: #74536) + * Disk usage applet show correct free space (Closes: #75407) + + -- Christian Marillat Thu, 16 Nov 2000 01:37:57 +0100 + +gnome-applets (1.2.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 24 Oct 2000 11:35:12 +0200 + +gnome-applets (1.2.2-1) unstable; urgency=low + + * New upstream release + * Switch to debhelper V2 + * gkb_applet now save his state between session (Closes: #71070) + + -- Christian Marillat Tue, 26 Sep 2000 15:22:22 +0200 + +gnome-applets (1.2.1-1) unstable; urgency=low + + * New upstream release (Closes: #69690). + * Add modemlights patch. + * Rewrote debian/control (Closes: #68035). + * debian/control add asclock-themes in the depends field. + + -- Christian Marillat Tue, 22 Aug 2000 13:05:10 +0200 + +gnome-applets (1.2.0-1) unstable; urgency=low + + * Initial Release. + * This package close all these bugs in gnome-core: + Closes: #46253, #63561, #46251, #36537, #38434, #45286, #45791, #49718, + #52609, #53125, #54865, #54866, #59080, #60057, #60938, #61611, #62114, + #63215, #64350, #64475, #66666, #66840, #59292, #65858, #57414 + + -- Christian Marillat Wed, 26 Jul 2000 11:35:25 +0200 + + --- gnome-applets-2.30.0.orig/debian/patches/88_hide_deprecated_mixer.patch +++ gnome-applets-2.30.0/debian/patches/88_hide_deprecated_mixer.patch @@ -0,0 +1,12 @@ +Index: gnome-applets-2.27.4/null_applet/GNOME_MixerApplet.server.in +=================================================================== +--- gnome-applets-2.27.4.orig/null_applet/GNOME_MixerApplet.server.in 2009-08-12 23:06:59.000000000 +0100 ++++ gnome-applets-2.27.4/null_applet/GNOME_MixerApplet.server.in 2009-08-12 23:07:12.000000000 +0100 +@@ -11,7 +11,6 @@ + + + +- + + + --- gnome-applets-2.30.0.orig/debian/patches/80_correct_minicommander_install.patch +++ gnome-applets-2.30.0/debian/patches/80_correct_minicommander_install.patch @@ -0,0 +1,30 @@ +Index: gnome-applets-2.27.3/Makefile.am +=================================================================== +--- gnome-applets-2.27.3.orig/Makefile.am 2009-06-04 02:38:36.000000000 +0100 ++++ gnome-applets-2.27.3/Makefile.am 2009-06-17 23:24:43.000000000 +0100 +@@ -40,11 +40,14 @@ + mixer_applet_SUBDIR = mixer + endif + ++if BUILD_MINICOMMANDER_APPLET ++minicommander_applet_SUBDIR = mini-commander ++endif ++ + always_built_SUBDIRS = \ + charpick \ + drivemount \ + geyes \ +- mini-commander \ + gkb-new \ + stickynotes \ + trashapplet \ +@@ -62,7 +65,8 @@ + $(keyboard_applet_SUBDIRS) \ + $(invest_applet_SUBDIR) \ + $(cpufreq_SUBDIR) \ +- $(mixer_applet_SUBDIR) ++ $(mixer_applet_SUBDIR) \ ++ $(minicommander_applet_SUBDIR) + + DIST_SUBDIRS = \ + po \ --- gnome-applets-2.30.0.orig/debian/patches/81_silent_applet_cleaning +++ gnome-applets-2.30.0/debian/patches/81_silent_applet_cleaning @@ -0,0 +1,56 @@ +Index: gnome-applets-2.27.4/null_applet/null_applet.c +=================================================================== +--- gnome-applets-2.27.4.orig/null_applet/null_applet.c 2009-04-23 07:28:03.000000000 +0100 ++++ gnome-applets-2.27.4/null_applet/null_applet.c 2009-08-03 23:17:38.000000000 +0100 +@@ -48,11 +48,13 @@ + + static gboolean already_running; + ++/* + static void + response_cb (GtkWidget *dialog, gint arg1, gpointer user_data) + { + gtk_widget_destroy (dialog); + } ++*/ + + static char + *get_all_applets (void) +@@ -131,16 +133,18 @@ + gpointer user_data) + { + char *applet_list; ++ /* + GtkWidget *dialog; ++ */ + + if (already_running) + { + return FALSE; + } + already_running = TRUE; +- ++ + applet_list = get_all_applets (); +- ++ /* + dialog = gtk_message_dialog_new_with_markup (NULL, + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, GTK_BUTTONS_OK, +@@ -154,13 +158,14 @@ + applet_list, + _("You will not receive this message again.") + ); +- ++ */ + g_free (applet_list); +- ++ /* + g_signal_connect (G_OBJECT (dialog), "response", + G_CALLBACK (response_cb), applet); + + gtk_widget_show_all (dialog); ++ */ + + return TRUE; + } --- gnome-applets-2.30.0.orig/debian/patches/98_autoreconf.patch +++ gnome-applets-2.30.0/debian/patches/98_autoreconf.patch @@ -0,0 +1,3881 @@ +--- + Makefile.in | 24 +- + accessx-status/Makefile.in | 8 + accessx-status/docs/Makefile.in | 4 + accessx-status/pixmaps/Makefile.in | 4 + aclocal.m4 | 26 +- + battstat/Makefile.in | 8 + battstat/apmlib/Makefile.in | 4 + battstat/docs/Makefile.in | 4 + battstat/sounds/Makefile.in | 4 + charpick/Makefile.in | 8 + charpick/help/Makefile.in | 4 + configure | 337 ++++++++++++++++++++++--------- + cpufreq/Makefile.in | 8 + cpufreq/help/Makefile.in | 4 + cpufreq/pixmaps/Makefile.in | 4 + cpufreq/src/Makefile.in | 8 + cpufreq/src/cpufreq-selector/Makefile.in | 4 + drivemount/Makefile.in | 8 + drivemount/help/Makefile.in | 4 + geyes/Makefile.in | 8 + geyes/docs/Makefile.in | 4 + geyes/themes/Makefile.in | 4 + gkb-new/Makefile.in | 8 + gkb-new/xmodmap.sun/Makefile.in | 4 + gkb-new/xmodmap/Makefile.in | 4 + gswitchit/Makefile.in | 8 + gswitchit/help/Makefile.in | 4 + gweather/Makefile.in | 16 - + gweather/docs/Makefile.in | 4 + invest-applet/Makefile.in | 8 + invest-applet/data/Makefile.in | 8 + invest-applet/data/art/Makefile.in | 4 + invest-applet/docs/Makefile.in | 4 + invest-applet/invest/Makefile.in | 4 + ltmain.sh | 8 + m4/ltversion.m4 | 10 + man/Makefile.in | 4 + mini-commander/Makefile.in | 8 + mini-commander/help/Makefile.in | 4 + mini-commander/src/Makefile.in | 4 + mixer/Makefile.in | 8 + mixer/docs/Makefile.in | 4 + modemlights/Makefile.in | 4 + multiload/Makefile.in | 8 + multiload/docs/Makefile.in | 4 + null_applet/Makefile.in | 13 - + stickynotes/Makefile.in | 8 + stickynotes/data/Makefile.in | 4 + stickynotes/docs/Makefile.in | 4 + stickynotes/pixmaps/Makefile.in | 4 + trashapplet/Makefile.in | 8 + trashapplet/docs/Makefile.in | 4 + trashapplet/src/Makefile.in | 4 + 53 files changed, 479 insertions(+), 203 deletions(-) + +Index: gnome-applets-2.30.0/accessx-status/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/accessx-status/docs/Makefile.in ++++ gnome-applets-2.30.0/accessx-status/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/accessx-status/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/accessx-status/Makefile.in ++++ gnome-applets-2.30.0/accessx-status/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -227,16 +227,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -548,17 +550,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -573,17 +575,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/accessx-status/pixmaps/Makefile.in ++++ gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/aclocal.m4 +=================================================================== +--- gnome-applets-2.30.0.orig/aclocal.m4 ++++ gnome-applets-2.30.0/aclocal.m4 +@@ -1,25 +1,25 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.11.1 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY, to the extent permitted by law; without + # even the implied warranty of MERCHANTABILITY or FITNESS FOR A + # PARTICULAR PURPOSE. + + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, +-[m4_warning([this file was generated for autoconf 2.64. ++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, ++[m4_warning([this file was generated for autoconf 2.65. + You have another version of autoconf. It may work, but is not guaranteed to. + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + + dnl AM_GCONF_SOURCE_2 + dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas + dnl (i.e. pass to gconftool-2 + dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +@@ -839,33 +839,33 @@ fi[]dnl + # ---------------------------- + # Automake X.Y traces this macro to ensure aclocal.m4 has been + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], + [am__api_version='1.11' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + + # _AM_AUTOCONF_VERSION(VERSION) + # ----------------------------- + # aclocal traces this macro to find the Autoconf version. + # This is a private macro too. Using m4_define simplifies + # the logic in aclocal, which can simply ignore this definition. + m4_define([_AM_AUTOCONF_VERSION], []) + + # AM_SET_CURRENT_AUTOMAKE_VERSION + # ------------------------------- + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.11.1])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + + # AM_AUX_DIR_EXPAND -*- Autoconf -*- + + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # +@@ -1723,16 +1723,24 @@ python2.1 python2.0]) + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + +@@ -1753,16 +1761,24 @@ python2.1 python2.0]) + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + +Index: gnome-applets-2.30.0/battstat/apmlib/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/battstat/apmlib/Makefile.in ++++ gnome-applets-2.30.0/battstat/apmlib/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -168,16 +168,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/battstat/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/battstat/docs/Makefile.in ++++ gnome-applets-2.30.0/battstat/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/battstat/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/battstat/Makefile.in ++++ gnome-applets-2.30.0/battstat/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -232,16 +232,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -629,17 +631,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -654,17 +656,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/battstat/sounds/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/battstat/sounds/Makefile.in ++++ gnome-applets-2.30.0/battstat/sounds/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/charpick/help/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/charpick/help/Makefile.in ++++ gnome-applets-2.30.0/charpick/help/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/charpick/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/charpick/Makefile.in ++++ gnome-applets-2.30.0/charpick/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -226,16 +226,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -574,17 +576,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -599,17 +601,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/configure +=================================================================== +--- gnome-applets-2.30.0.orig/configure ++++ gnome-applets-2.30.0/configure +@@ -1,15 +1,17 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for gnome-applets 2.30.0. ++# Generated by GNU Autoconf 2.65 for gnome-applets 2.30.0. ++# + # + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +-# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. + ## -------------------- ## + ## M4sh Initialization. ## + ## -------------------- ## + + # Be more Bourne compatible +@@ -668,17 +670,18 @@ fi + lt_ECHO=$ECHO + if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + fi + + + + +-exec 7<&0 &1 ++test -n "$DJDIR" || exec 7<&0 &1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, + # so uname gets run too. + ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + + # + # Initializations. +@@ -821,16 +824,18 @@ SCROLLKEEPER_CONFIG + XSLTPROC + GCONFTOOL + GLIB_GENMARSHAL + GDK_PIXBUF_CSOURCE + BUILD_MIXER_APPLET_FALSE + BUILD_MIXER_APPLET_TRUE + MIXER_LIBS + MIXER_CFLAGS ++LIBNTRACK_LIBS ++LIBNTRACK_CFLAGS + NETWORKMANAGER_LIBS + NETWORKMANAGER_CFLAGS + BUILD_LIBGWEATHER_APPLETS_FALSE + BUILD_LIBGWEATHER_APPLETS_TRUE + LIBGWEATHER_LIBS + LIBGWEATHER_CFLAGS + XML2_LIBS + XML2_CFLAGS +@@ -1038,16 +1043,17 @@ with_gnu_ld + enable_libtool_lock + with_x + enable_compile_warnings + enable_iso_c + enable_more_warnings + enable_polkit + with_hal + enable_networkmanager ++enable_libntrack + enable_mixer_applet + with_gconf_source + with_gconf_schema_file_dir + enable_schemas_install + with_help_dir + with_omf_dir + with_help_formats + enable_scrollkeeper +@@ -1100,16 +1106,18 @@ GUCHARMAP_LIBS + PYGTK_CFLAGS + PYGTK_LIBS + XML2_CFLAGS + XML2_LIBS + LIBGWEATHER_CFLAGS + LIBGWEATHER_LIBS + NETWORKMANAGER_CFLAGS + NETWORKMANAGER_LIBS ++LIBNTRACK_CFLAGS ++LIBNTRACK_LIBS + MIXER_CFLAGS + MIXER_LIBS' + + + # Initialize some variables set by options. + ac_init_help= + ac_init_version=false + ac_unrecognized_opts= +@@ -1740,17 +1748,18 @@ Optional Features: + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-compile-warnings=[no/minimum/yes/maximum/error] + Turn on compiler warnings + --enable-iso-c Try to warn if code is not ISO C + --enable-more-warnings Maximum compiler warnings + --enable-polkit Enable PolicyKit support [default auto] +- --enable-networkmanager Enable NetworkManager support [default=yes] ++ --enable-networkmanager Enable NetworkManager support [default=no] ++ --enable-libntrack Enable libntrack support [default=yes] + --enable-mixer-applet Enable the gstreamer-based mixer applet. + --disable-schemas-install + Disable the schemas installation + --disable-scrollkeeper do not make updates to the scrollkeeper database + --disable-battstat=[no/yes] + don't build battery monitor applet [default: no] + --enable-mini-commander build mini-commander + [default: no, transparent upgrade to deskbar-applet] +@@ -1781,17 +1790,17 @@ Optional Packages: + list of formats + + Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + PKG_CONFIG path to pkg-config utility + CPP C preprocessor + XMKMF Path to xmkmf, Makefile generator for X Window System + GIT_CFLAGS C compiler flags for GIT, overriding pkg-config + GIT_LIBS linker flags for GIT, overriding pkg-config + GIO_CFLAGS C compiler flags for GIO, overriding pkg-config + GIO_LIBS linker flags for GIO, overriding pkg-config +@@ -1845,16 +1854,20 @@ Some influential environment variables: + LIBGWEATHER_CFLAGS + C compiler flags for LIBGWEATHER, overriding pkg-config + LIBGWEATHER_LIBS + linker flags for LIBGWEATHER, overriding pkg-config + NETWORKMANAGER_CFLAGS + C compiler flags for NETWORKMANAGER, overriding pkg-config + NETWORKMANAGER_LIBS + linker flags for NETWORKMANAGER, overriding pkg-config ++ LIBNTRACK_CFLAGS ++ C compiler flags for LIBNTRACK, overriding pkg-config ++ LIBNTRACK_LIBS ++ linker flags for LIBNTRACK, overriding pkg-config + MIXER_CFLAGS + C compiler flags for MIXER, overriding pkg-config + MIXER_LIBS linker flags for MIXER, overriding pkg-config + + Use these variables to override the choices made by `configure' or to help + it to find libraries and programs with nonstandard names/locations. + + Report bugs to the package provider. +@@ -1916,17 +1929,17 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_ + cd "$ac_pwd" || { ac_status=$?; break; } + done + fi + + test -n "$ac_init_help" && exit $ac_status + if $ac_init_version; then + cat <<\_ACEOF + gnome-applets configure 2.30.0 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. + _ACEOF + exit + fi + +@@ -1963,17 +1976,17 @@ $as_echo "$ac_try_echo"; } >&5 + ac_retval=0 + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + + # ac_fn_c_try_link LINENO + # ----------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. + ac_fn_c_try_link () + { +@@ -2009,17 +2022,17 @@ sed 's/^/| /' conftest.$ac_ext >&5 + ac_retval=1 + fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + + # ac_fn_c_check_func LINENO FUNC VAR + # ---------------------------------- + # Tests whether FUNC exists, setting the cache variable VAR accordingly + ac_fn_c_check_func () + { +@@ -2113,17 +2126,17 @@ $as_echo "$ac_try_echo"; } >&5 + ac_retval=0 + else + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + + # ac_fn_c_try_run LINENO + # ---------------------- + # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes + # that executables *can* be run. + ac_fn_c_try_run () +@@ -2155,17 +2168,17 @@ else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- + # Tests whether HEADER exists and can be compiled using the include files in + # INCLUDES, setting the cache variable VAR accordingly. + ac_fn_c_check_header_compile () +@@ -2377,17 +2390,17 @@ $as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + + } # ac_fn_c_check_decl + cat >config.log <<_ACEOF + This file contains any messages produced by compilers while + running configure, to aid debugging if configure makes a mistake. + + It was created by gnome-applets $as_me 2.30.0, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + + _ACEOF + exec 5>>config.log + { + cat <<_ASUNAME + ## --------- ## +@@ -2630,28 +2643,28 @@ elif test "x$prefix" != xNONE; then + ac_site_file2=$prefix/etc/config.site + else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site + fi + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +@@ -3064,24 +3077,24 @@ do + esac + done + done + done + IFS=$as_save_IFS + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 + $as_echo "$MKDIR_P" >&6; } + + mkdir_p="$MKDIR_P" + case $mkdir_p in +@@ -3254,16 +3267,17 @@ PYGOBJECT_REQUIRED=2.6 + GNOME_PYTHON_REQUIRED=2.10 + GNOME_ICON_THEME_REQUIRED=2.15.91 + LIBXML_REQUIRED=2.5.0 + GWEATHER_REQUIRED=2.22.1 + GUCHARMAP2_REQUIRED=2.23.0 + GUCHARMAP_REQUIRED=1.4.0 + POLKIT_REQUIRED=0.92 + NETWORKMANAGER_REQUIRED=0.7 ++LIBNTRACK_REQUIRED=006 + GST10_REQUIRED=0.10.2 + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. + if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval +@@ -3678,42 +3692,40 @@ eval ac_try_echo="\"\$as_me:${as_lineno- + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: + ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + + ac_rmfiles= + for ac_file in $ac_files + do +@@ -3765,72 +3777,39 @@ do + break;; + esac + done + test "$ac_cv_exeext" = no && ac_cv_exeext= + + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { as_fn_set_status 77 + as_fn_error "C compiler cannot create executables + See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +@@ -3853,23 +3832,82 @@ for ac_file in conftest.exe conftest con + esac + done + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + as_fn_error "cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -5234,18 +5272,18 @@ eval ac_try_echo="\"\$as_me:${as_lineno- + $as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 + $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } + if test "${ac_cv_c_compiler_gnu+set}" = set; then : + $as_echo_n "(cached) " >&6 +@@ -6023,18 +6061,18 @@ fi + case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 + $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + esac + + + +-macro_version='2.2.6' +-macro_revision='1.3012' ++macro_version='2.2.6b' ++macro_revision='1.3017' + + + + + + + + +@@ -6565,23 +6603,23 @@ test -z "$NM" && NM=nm + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 + $as_echo_n "checking the name lister ($NM) interface... " >&6; } + if test "${lt_cv_nm_interface+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6573: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6611: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6576: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6614: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6579: output\"" >&5) ++ (eval echo "\"\$as_me:6617: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 + $as_echo "$lt_cv_nm_interface" >&6; } +@@ -7776,17 +7814,17 @@ ia64-*-hpux*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7784 "configure"' > conftest.$ac_ext ++ echo '#line 7822 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -9056,21 +9094,21 @@ else + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9064: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9102: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9068: \$? = $ac_status" >&5 ++ echo "$as_me:9106: \$? = $ac_status" >&5 + 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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi +@@ -9395,21 +9433,21 @@ else + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9403: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9441: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9407: \$? = $ac_status" >&5 ++ echo "$as_me:9445: \$? = $ac_status" >&5 + 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. + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi +@@ -9500,21 +9538,21 @@ else + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9508: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9512: \$? = $ac_status" >&5 ++ echo "$as_me:9550: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -9555,21 +9593,21 @@ else + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9563: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9601: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9567: \$? = $ac_status" >&5 ++ echo "$as_me:9605: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes +@@ -11938,17 +11976,17 @@ if test "${lt_cv_dlopen_self+set}" = set + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11946 "configure" ++#line 11984 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H + #include + #endif + + #include + +@@ -12034,17 +12072,17 @@ if test "${lt_cv_dlopen_self_static+set} + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self_static=cross + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 12042 "configure" ++#line 12080 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H + #include + #endif + + #include + +@@ -13108,16 +13146,24 @@ else + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; ++ *) ++ case $am_py_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 + $as_echo "$am_cv_python_pythondir" >&6; } + pythondir=$am_cv_python_pythondir + + +@@ -13138,16 +13184,24 @@ else + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; ++ *) ++ case $am_py_exec_prefix in ++ /usr|/System*) ;; ++ *) ++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ ;; ++ esac ++ ;; + esac + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 + $as_echo "$am_cv_python_pyexecdir" >&6; } + pyexecdir=$am_cv_python_pyexecdir + + +@@ -14989,17 +15043,17 @@ else + BUILD_LIBGWEATHER_APPLETS_FALSE= + fi + + + # Check whether --enable-networkmanager was given. + if test "${enable_networkmanager+set}" = set; then : + enableval=$enable_networkmanager; ENABLE_NETWORKMANAGER=$enableval + else +- ENABLE_NETWORKMANAGER=yes ++ ENABLE_NETWORKMANAGER=no + fi + + + HAVE_NETWORKMANAGER=no + if test "x$ENABLE_NETWORKMANAGER" = "xyes"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORKMANAGER" >&5 +@@ -15076,16 +15130,111 @@ fi + + $as_echo "#define HAVE_NETWORKMANAGER 1" >>confdefs.h + + + + fi + fi + ++# Check whether --enable-libntrack was given. ++if test "${enable_libntrack+set}" = set; then : ++ enableval=$enable_libntrack; ENABLE_LIBNTRACK=$enableval ++else ++ ENABLE_LIBNTRACK=yes ++fi ++ ++ ++HAVE_LIBNTRACK=no ++if test "x$ENABLE_LIBNTRACK" = "xyes"; then ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNTRACK" >&5 ++$as_echo_n "checking for LIBNTRACK... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBNTRACK_CFLAGS"; then ++ pkg_cv_LIBNTRACK_CFLAGS="$LIBNTRACK_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libntrack-gobject >= \$LIBNTRACK_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libntrack-gobject >= $LIBNTRACK_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBNTRACK_CFLAGS=`$PKG_CONFIG --cflags "libntrack-gobject >= $LIBNTRACK_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$LIBNTRACK_LIBS"; then ++ pkg_cv_LIBNTRACK_LIBS="$LIBNTRACK_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libntrack-gobject >= \$LIBNTRACK_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libntrack-gobject >= $LIBNTRACK_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_LIBNTRACK_LIBS=`$PKG_CONFIG --libs "libntrack-gobject >= $LIBNTRACK_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ LIBNTRACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libntrack-gobject >= $LIBNTRACK_REQUIRED"` ++ else ++ LIBNTRACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libntrack-gobject >= $LIBNTRACK_REQUIRED"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$LIBNTRACK_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ HAVE_LIBNTRACK=no ++elif test $pkg_failed = untried; then ++ HAVE_LIBNTRACK=no ++else ++ LIBNTRACK_CFLAGS=$pkg_cv_LIBNTRACK_CFLAGS ++ LIBNTRACK_LIBS=$pkg_cv_LIBNTRACK_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ HAVE_LIBNTRACK=yes ++fi ++ ++ if test "x$HAVE_LIBNTRACK" = "xyes"; then ++ ++$as_echo "#define HAVE_LIBNTRACK 1" >>confdefs.h ++ ++ ++ ++ fi ++fi ++ ++if test "x$HAVE_LIBNTRACK" = "xyes" -a "x$HAVE_NETWORKMANAGER" = "xyes"; then ++ as_fn_error "--enable-libntrack and --enable-networkmanager cannot be used at same time" "$LINENO" 5 ++fi ++ + # Check whether --enable-mixer-applet was given. + if test "${enable_mixer_applet+set}" = set; then : + enableval=$enable_mixer_applet; enable_mixer=$enableval + else + enable_mixer=no + fi + + MIXER_CFLAGS= +@@ -17802,17 +17951,17 @@ _ASEOF + test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + + cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + # Save the log message, to keep $0 and so on meaningful, and to + # report actual input values of CONFIG_FILES etc. instead of their + # values after options handling. + ac_log=" + This file was extended by gnome-applets $as_me 2.30.0, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + + on `(hostname || uname -n) 2>/dev/null | sed 1q` +@@ -17842,16 +17991,17 @@ ac_cs_usage="\ + \`$as_me' instantiates files and other configuration actions + from templates according to the current configuration. Unless the files + and actions are specified as TAGs, all are instantiated by default. + + Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE +@@ -17864,20 +18014,21 @@ $config_headers + + Configuration commands: + $config_commands + + Report bugs to the package provider." + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + gnome-applets config.status 2.30.0 +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + + Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it." + + ac_pwd='$ac_pwd' + srcdir='$srcdir' + INSTALL='$INSTALL' +@@ -17905,16 +18056,18 @@ do + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" +@@ -18402,31 +18555,31 @@ p + g + s/^[^!]*!// + :repl + t repl + s/'"$ac_delim"'$// + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p + n + b repl + :more1 + s/["\\]/\\&/g; s/^/"/; s/$/"\\/ + p + g + s/.\{148\}// + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p + b + :more2 + s/["\\]/\\&/g; s/^/"/; s/$/"\\/ + p + g +Index: gnome-applets-2.30.0/cpufreq/help/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/cpufreq/help/Makefile.in ++++ gnome-applets-2.30.0/cpufreq/help/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/cpufreq/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/cpufreq/Makefile.in ++++ gnome-applets-2.30.0/cpufreq/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -206,16 +206,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -490,17 +492,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -515,17 +517,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/cpufreq/pixmaps/Makefile.in ++++ gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/cpufreq/src/cpufreq-selector/Makefile.in ++++ gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -217,16 +217,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/cpufreq/src/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/cpufreq/src/Makefile.in ++++ gnome-applets-2.30.0/cpufreq/src/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -220,16 +220,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -513,17 +515,17 @@ clean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -538,17 +540,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/drivemount/help/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/drivemount/help/Makefile.in ++++ gnome-applets-2.30.0/drivemount/help/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/drivemount/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/drivemount/Makefile.in ++++ gnome-applets-2.30.0/drivemount/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -226,16 +226,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -576,17 +578,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -601,17 +603,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/geyes/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/geyes/docs/Makefile.in ++++ gnome-applets-2.30.0/geyes/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/geyes/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/geyes/Makefile.in ++++ gnome-applets-2.30.0/geyes/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -226,16 +226,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -586,17 +588,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -611,17 +613,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/geyes/themes/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/geyes/themes/Makefile.in ++++ gnome-applets-2.30.0/geyes/themes/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -170,16 +170,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/gkb-new/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gkb-new/Makefile.in ++++ gnome-applets-2.30.0/gkb-new/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -181,16 +181,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -364,17 +366,17 @@ clean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -389,17 +391,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gkb-new/xmodmap/Makefile.in ++++ gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gkb-new/xmodmap.sun/Makefile.in ++++ gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/gswitchit/help/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gswitchit/help/Makefile.in ++++ gnome-applets-2.30.0/gswitchit/help/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/gswitchit/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gswitchit/Makefile.in ++++ gnome-applets-2.30.0/gswitchit/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -180,16 +180,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -361,17 +363,17 @@ clean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -386,17 +388,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/gweather/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gweather/docs/Makefile.in ++++ gnome-applets-2.30.0/gweather/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/gweather/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/gweather/Makefile.in ++++ gnome-applets-2.30.0/gweather/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -56,17 +56,17 @@ am__installdirs = "$(DESTDIR)$(libexecdi + PROGRAMS = $(libexec_PROGRAMS) + am_gweather_applet_2_OBJECTS = main.$(OBJEXT) gweather-about.$(OBJEXT) \ + gweather-pref.$(OBJEXT) gweather-dialog.$(OBJEXT) \ + gweather-applet.$(OBJEXT) + gweather_applet_2_OBJECTS = $(am_gweather_applet_2_OBJECTS) + am__DEPENDENCIES_1 = + gweather_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -229,16 +229,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -370,32 +372,34 @@ top_srcdir = @top_srcdir@ + SUBDIRS = docs + INCLUDES = \ + -I$(srcdir) \ + -I$(top_srcdir) \ + $(GNOME_APPLETS_CFLAGS) \ + $(GNOME_LIBS2_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(LIBGWEATHER_CFLAGS) \ +- $(NETWORKMANAGER_CFLAGS) ++ $(NETWORKMANAGER_CFLAGS) \ ++ $(LIBNTRACK_CFLAGS) + + gweather_applet_2_SOURCES = \ + gweather.h \ + main.c \ + gweather-about.c gweather-about.h \ + gweather-pref.c gweather-pref.h \ + gweather-dialog.c gweather-dialog.h \ + gweather-applet.c gweather-applet.h + + gweather_applet_2_LDADD = \ + $(LIBNOTIFY_LIBS) \ + $(GNOME_APPLETS_LIBS) \ + $(GNOME_LIBS2_LIBS) \ + $(LIBGWEATHER_LIBS) \ +- $(NETWORKMANAGER_LIBS) ++ $(NETWORKMANAGER_LIBS) \ ++ $(LIBNTRACK_LIBS) + + uidir = $(datadir)/gnome-2.0/ui + ui_DATA = GNOME_GWeatherApplet.xml + serverdir = $(libdir)/bonobo/servers + server_in_files = GNOME_GWeatherApplet_Factory.server.in + server_DATA = $(server_in_files:.server.in=.server) + CLEANFILES = $(server_in_files) $(server_DATA) + EXTRA_DIST = \ +@@ -564,17 +568,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -589,17 +593,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/invest-applet/data/art/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/invest-applet/data/art/Makefile.in ++++ gnome-applets-2.30.0/invest-applet/data/art/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/invest-applet/data/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/invest-applet/data/Makefile.in ++++ gnome-applets-2.30.0/invest-applet/data/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -205,16 +205,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -494,17 +496,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -519,17 +521,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/invest-applet/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/invest-applet/docs/Makefile.in ++++ gnome-applets-2.30.0/invest-applet/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/invest-applet/invest/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/invest-applet/invest/Makefile.in ++++ gnome-applets-2.30.0/invest-applet/invest/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -167,16 +167,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/invest-applet/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/invest-applet/Makefile.in ++++ gnome-applets-2.30.0/invest-applet/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -180,16 +180,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -361,17 +363,17 @@ clean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -386,17 +388,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/ltmain.sh +=================================================================== +--- gnome-applets-2.30.0.orig/ltmain.sh ++++ gnome-applets-2.30.0/ltmain.sh +@@ -1,11 +1,11 @@ + # Generated from ltmain.m4sh. + +-# ltmain.sh (GNU libtool) 2.2.6 ++# ltmain.sh (GNU libtool) 2.2.6b + # Written by Gordon Matzigkeit , 1996 + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. + # This is free software; see the source for copying conditions. There is NO + # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + # GNU Libtool is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by +@@ -60,27 +60,27 @@ + # When reporting a bug, please describe a test case to reproduce it and + # include the following information: + # + # host-triplet: $host + # shell: $SHELL + # compiler: $LTCC + # compiler flags: $LTCFLAGS + # linker: $LD (gnu? $with_gnu_ld) +-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 ++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 + # automake: $automake_version + # autoconf: $autoconf_version + # + # Report bugs to . + + PROGRAM=ltmain.sh + PACKAGE=libtool +-VERSION="2.2.6 Debian-2.2.6a-4" ++VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" + TIMESTAMP="" +-package_revision=1.3012 ++package_revision=1.3017 + + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +Index: gnome-applets-2.30.0/m4/ltversion.m4 +=================================================================== +--- gnome-applets-2.30.0.orig/m4/ltversion.m4 ++++ gnome-applets-2.30.0/m4/ltversion.m4 +@@ -4,20 +4,20 @@ + # Written by Scott James Remnant, 2004 + # + # This file is free software; the Free Software Foundation gives + # unlimited permission to copy and/or distribute it, with or without + # modifications, as long as this notice is preserved. + + # Generated from ltversion.in. + +-# serial 3012 ltversion.m4 ++# serial 3017 ltversion.m4 + # This file is part of GNU Libtool + +-m4_define([LT_PACKAGE_VERSION], [2.2.6]) +-m4_define([LT_PACKAGE_REVISION], [1.3012]) ++m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++m4_define([LT_PACKAGE_REVISION], [1.3017]) + + AC_DEFUN([LTVERSION_VERSION], +-[macro_version='2.2.6' +-macro_revision='1.3012' ++[macro_version='2.2.6b' ++macro_revision='1.3017' + _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) + _LT_DECL(, macro_revision, 0) + ]) +Index: gnome-applets-2.30.0/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/Makefile.in ++++ gnome-applets-2.30.0/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -198,16 +198,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -346,38 +348,39 @@ modemlights_applets = \ + modemlights + + @APPLET_MODEMLIGHTS_TRUE@modemlights_SUBDIRS = $(modemlights_applets) + @BUILD_BATTSTAT_APPLET_TRUE@battstat_SUBDIR = battstat + @APPLET_ACCESSX_TRUE@accessx_status_SUBDIR = accessx-status + @BUILD_CPUFREQ_APPLET_TRUE@cpufreq_SUBDIR = cpufreq + @BUILD_INVEST_APPLET_TRUE@invest_applet_SUBDIR = invest-applet + @BUILD_MIXER_APPLET_TRUE@mixer_applet_SUBDIR = mixer ++@BUILD_MINICOMMANDER_APPLET_TRUE@minicommander_applet_SUBDIR = mini-commander + always_built_SUBDIRS = \ + charpick \ + drivemount \ + geyes \ +- mini-commander \ + gkb-new \ + stickynotes \ + trashapplet \ + null_applet + + SUBDIRS = \ + po \ + $(always_built_SUBDIRS) \ + $(modemlights_SUBDIRS) \ + $(gtop_SUBDIRS) \ + $(libgweather_SUBDIRS) \ + $(vfs_SUBDIRS) \ + $(battstat_SUBDIR) \ + $(accessx_status_SUBDIR)\ + $(invest_applet_SUBDIR) \ + $(cpufreq_SUBDIR) \ +- $(mixer_applet_SUBDIR) ++ $(mixer_applet_SUBDIR) \ ++ $(minicommander_applet_SUBDIR) + + DIST_SUBDIRS = \ + po \ + modemlights \ + drivemount \ + charpick \ + geyes \ + mini-commander \ +@@ -488,17 +491,17 @@ distclean-libtool: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -513,17 +516,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +@@ -677,17 +680,18 @@ distdir: $(DISTFILES) + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done + -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ || find "$(distdir)" -type d ! -perm -755 \ ++ -exec chmod u+rwx,go+rx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r "$(distdir)" + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +@@ -721,27 +725,27 @@ dist dist-all: distdir + $(am__remove_distdir) + + # This target untars the dist file and tries a VPATH configuration. Then + # it guarantees that the distribution is self-contained by making another + # tarfile. + distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ +- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ ++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ +- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ ++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ ++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ +Index: gnome-applets-2.30.0/man/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/man/Makefile.in ++++ gnome-applets-2.30.0/man/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/mini-commander/help/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/mini-commander/help/Makefile.in ++++ gnome-applets-2.30.0/mini-commander/help/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/mini-commander/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/mini-commander/Makefile.in ++++ gnome-applets-2.30.0/mini-commander/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -204,16 +204,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -414,17 +416,17 @@ uninstall-serverDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -439,17 +441,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/mini-commander/src/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/mini-commander/src/Makefile.in ++++ gnome-applets-2.30.0/mini-commander/src/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -201,16 +201,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/mixer/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/mixer/docs/Makefile.in ++++ gnome-applets-2.30.0/mixer/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/mixer/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/mixer/Makefile.in ++++ gnome-applets-2.30.0/mixer/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -230,16 +230,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -588,17 +590,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -613,17 +615,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/modemlights/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/modemlights/Makefile.in ++++ gnome-applets-2.30.0/modemlights/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -189,16 +189,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/multiload/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/multiload/docs/Makefile.in ++++ gnome-applets-2.30.0/multiload/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/multiload/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/multiload/Makefile.in ++++ gnome-applets-2.30.0/multiload/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -228,16 +228,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -589,17 +591,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -614,17 +616,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/null_applet/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/null_applet/Makefile.in ++++ gnome-applets-2.30.0/null_applet/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -186,16 +186,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -325,36 +327,41 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + INCLUDES = \ + -I. \ + -I$(srcdir) \ + $(GNOME_APPLETS_CFLAGS) + + @BUILD_MIXER_APPLET_FALSE@mixer_server_in = GNOME_MixerApplet.server.in ++@BUILD_BATTSTAT_APPLET_FALSE@battstat_server_in = GNOME_BattstatApplet.server.in + null_applet_SOURCES = null_applet.c + null_applet_LDADD = $(GNOME_APPLETS_LIBS) + serverdir = $(libdir)/bonobo/servers + server_in_files = \ + GNOME_NullApplet_Factory.server.in \ + GNOME_CDPlayerApplet.server.in \ + GNOME_MailcheckApplet_Factory.server.in \ ++ GNOME_ModemLights.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_KeyboardApplet.server.in \ +- $(mixer_server_in) ++ $(mixer_server_in) \ ++ $(battstat_server_in) + + server_DATA = $(server_in_files:.server.in=.server) + CLEANFILES = GNOME_NullApplet_Factory.server.in $(server_DATA) + EXTRA_DIST = \ + GNOME_NullApplet_Factory.server.in.in \ + GNOME_CDPlayerApplet.server.in \ + GNOME_MailcheckApplet_Factory.server.in \ ++ GNOME_ModemLights.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ +- GNOME_KeyboardApplet.server.in ++ GNOME_KeyboardApplet.server.in \ ++ GNOME_BattstatApplet.server.in + + all: all-am + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ +Index: gnome-applets-2.30.0/stickynotes/data/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/stickynotes/data/Makefile.in ++++ gnome-applets-2.30.0/stickynotes/data/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -167,16 +167,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/stickynotes/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/stickynotes/docs/Makefile.in ++++ gnome-applets-2.30.0/stickynotes/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/stickynotes/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/stickynotes/Makefile.in ++++ gnome-applets-2.30.0/stickynotes/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -240,16 +240,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -626,17 +628,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -651,17 +653,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/stickynotes/pixmaps/Makefile.in ++++ gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/trashapplet/docs/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/trashapplet/docs/Makefile.in ++++ gnome-applets-2.30.0/trashapplet/docs/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -165,16 +165,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +Index: gnome-applets-2.30.0/trashapplet/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/trashapplet/Makefile.in ++++ gnome-applets-2.30.0/trashapplet/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -205,16 +205,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +@@ -458,17 +460,17 @@ uninstall-uiDATA: + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ +@@ -483,17 +485,17 @@ $(RECURSIVE_TARGETS): + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + $(RECURSIVE_CLEAN_TARGETS): +- @failcom='exit 1'; \ ++ @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ +Index: gnome-applets-2.30.0/trashapplet/src/Makefile.in +=================================================================== +--- gnome-applets-2.30.0.orig/trashapplet/src/Makefile.in ++++ gnome-applets-2.30.0/trashapplet/src/Makefile.in +@@ -1,9 +1,9 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.11.1 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, + # Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -164,16 +164,18 @@ JW = @JW@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LIBCPUFREQ_LIBS = @LIBCPUFREQ_LIBS@ + LIBDIR = @LIBDIR@ + LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ + LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ ++LIBNTRACK_CFLAGS = @LIBNTRACK_CFLAGS@ ++LIBNTRACK_LIBS = @LIBNTRACK_LIBS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ + LIBTOOL = @LIBTOOL@ + LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ + LIBWNCK_LIBS = @LIBWNCK_LIBS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ --- gnome-applets-2.30.0.orig/debian/patches/series +++ gnome-applets-2.30.0/debian/patches/series @@ -0,0 +1,9 @@ +15_path-max.patch +80_correct_minicommander_install.patch +81_silent_applet_cleaning +86_deprecate_battstatus.patch +87_deprecate_modemlights.patch +88_hide_deprecated_mixer.patch +98_autoreconf.patch +99_ltmain_as-needed.patch + --- gnome-applets-2.30.0.orig/debian/patches/86_deprecate_battstatus.patch +++ gnome-applets-2.30.0/debian/patches/86_deprecate_battstatus.patch @@ -0,0 +1,74 @@ +Index: gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-applets-2.30.0/null_applet/GNOME_BattstatApplet.server.in 2010-03-29 11:55:08.885546800 +0200 +@@ -0,0 +1,21 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +Index: gnome-applets-2.30.0/null_applet/Makefile.am +=================================================================== +--- gnome-applets-2.30.0.orig/null_applet/Makefile.am 2010-03-28 07:29:51.000000000 +0200 ++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-29 11:57:44.597546031 +0200 +@@ -8,6 +8,11 @@ + mixer_server_in = GNOME_MixerApplet.server.in + endif + ++## The null applet takes over if the battstat applet isn't built ++if !BUILD_BATTSTAT_APPLET ++battstat_server_in = GNOME_BattstatApplet.server.in ++endif ++ + libexec_PROGRAMS = null_applet + + null_applet_SOURCES = null_applet.c +@@ -21,7 +26,8 @@ + GNOME_MailcheckApplet_Factory.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_KeyboardApplet.server.in \ +- $(mixer_server_in) ++ $(mixer_server_in) \ ++ $(battstat_server_in) + server_DATA = $(server_in_files:.server.in=.server) + + @INTLTOOL_SERVER_RULE@ +@@ -39,6 +45,7 @@ + GNOME_MailcheckApplet_Factory.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ +- GNOME_KeyboardApplet.server.in ++ GNOME_KeyboardApplet.server.in \ ++ GNOME_BattstatApplet.server.in + + -include $(top_srcdir)/git.mk +Index: gnome-applets-2.30.0/null_applet/null_applet.c +=================================================================== +--- gnome-applets-2.30.0.orig/null_applet/null_applet.c 2010-03-29 11:55:08.000000000 +0200 ++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-29 11:58:38.588546843 +0200 +@@ -46,6 +46,8 @@ + "OAFIID:GNOME_MixerApplet", _("Volume Control")); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); ++ g_hash_table_insert (hash_table, ++ "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor")); + } + + static gboolean already_running; --- gnome-applets-2.30.0.orig/debian/patches/15_path-max.patch +++ gnome-applets-2.30.0/debian/patches/15_path-max.patch @@ -0,0 +1,58 @@ +From beada5329098bb50f7b0dca3e96b577b9e3de3eb Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +Date: Mon, 7 Dec 2009 17:18:35 +0100 +Subject: [PATCH] Bug 603997: Don't unconditionally use PATH_MAX + +Since PATH_MAX is not guaranteed to be defined, unconditionally +using it will cause a build failure on platforms that don't define +it. So stop using it and use dynamic allocation to achieve the same +result. +--- + multiload/linux-proc.c | 28 ++++++++++++++++------------ + 1 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/multiload/linux-proc.c b/multiload/linux-proc.c +index e168722..5782eec 100644 +--- a/multiload/linux-proc.c ++++ b/multiload/linux-proc.c +@@ -288,21 +288,25 @@ is_net_device_virtual(char *device) + * /sys/class/net/name-of-dev/ . This second method is more complex + * but more reliable. + */ +- char path[PATH_MAX]; ++ gboolean ret = FALSE; ++ char *path = malloc (strlen (device) + strlen ("/sys/class/net//device") + 1); + + /* Check if /sys/class/net/name-of-dev/ exists (may be old linux kernel + * or not linux at all). */ +- if (sprintf(path, "/sys/class/net/%s", device) < 0) +- return FALSE; +- if (access(path, F_OK) != 0) +- return FALSE; /* unknown */ +- +- if (sprintf(path, "/sys/class/net/%s/device", device) < 0) +- return FALSE; +- if (access(path, F_OK) != 0) +- return TRUE; +- +- return FALSE; ++ do { ++ if (sprintf(path, "/sys/class/net/%s", device) < 0) ++ break; ++ if (access(path, F_OK) != 0) ++ break; /* unknown */ ++ ++ if (sprintf(path, "/sys/class/net/%s/device", device) < 0) ++ break; ++ if (access(path, F_OK) != 0) ++ ret = TRUE; ++ } while (0); ++ ++ free (path); ++ return ret; + } + + void +-- +1.6.5.4 + --- gnome-applets-2.30.0.orig/debian/patches/99_ltmain_as-needed.patch +++ gnome-applets-2.30.0/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,56 @@ +--- + ltmain.sh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +Index: gnome-applets-2.30.0/ltmain.sh +=================================================================== +--- gnome-applets-2.30.0.orig/ltmain.sh ++++ gnome-applets-2.30.0/ltmain.sh +@@ -4711,16 +4711,21 @@ func_mode_link () + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" + done + IFS="$save_ifs" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + IFS="$save_ifs" + func_quote_for_eval "$flag" +@@ -5065,16 +5070,25 @@ func_mode_link () + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in --- gnome-applets-2.30.0.orig/debian/patches/87_deprecate_modemlights.patch +++ gnome-applets-2.30.0/debian/patches/87_deprecate_modemlights.patch @@ -0,0 +1,59 @@ +Index: gnome-applets-2.30.0/null_applet/GNOME_ModemLights.server.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-applets-2.30.0/null_applet/GNOME_ModemLights.server.in 2010-03-29 12:00:10.201547164 +0200 +@@ -0,0 +1,21 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +Index: gnome-applets-2.30.0/null_applet/null_applet.c +=================================================================== +--- gnome-applets-2.30.0.orig/null_applet/null_applet.c 2010-03-29 11:59:59.000000000 +0200 ++++ gnome-applets-2.30.0/null_applet/null_applet.c 2010-03-29 12:00:46.173545772 +0200 +@@ -48,6 +48,8 @@ + "OAFIID:GNOME_KeyboardApplet", _("Keyboard Indicator")); + g_hash_table_insert (hash_table, + "OAFIID:GNOME_BattstatApplet", _("Battery Charge Monitor")); ++ g_hash_table_insert (hash_table, ++ "OAFIID:GNOME_ModemLightsApplet", _("Modem Monitor")); + } + + static gboolean already_running; +Index: gnome-applets-2.30.0/null_applet/Makefile.am +=================================================================== +--- gnome-applets-2.30.0.orig/null_applet/Makefile.am 2010-03-29 11:59:59.000000000 +0200 ++++ gnome-applets-2.30.0/null_applet/Makefile.am 2010-03-29 12:00:10.213548548 +0200 +@@ -24,6 +24,7 @@ + GNOME_NullApplet_Factory.server.in \ + GNOME_CDPlayerApplet.server.in \ + GNOME_MailcheckApplet_Factory.server.in \ ++ GNOME_ModemLights.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_KeyboardApplet.server.in \ + $(mixer_server_in) \ +@@ -43,6 +44,7 @@ + GNOME_NullApplet_Factory.server.in.in \ + GNOME_CDPlayerApplet.server.in \ + GNOME_MailcheckApplet_Factory.server.in \ ++ GNOME_ModemLights.server.in \ + GNOME_Panel_WirelessApplet.server.in \ + GNOME_MixerApplet.server.in \ + GNOME_KeyboardApplet.server.in \ --- gnome-applets-2.30.0.orig/gweather/Makefile.am +++ gnome-applets-2.30.0/gweather/Makefile.am @@ -9,7 +9,8 @@ $(GNOME_LIBS2_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(LIBGWEATHER_CFLAGS) \ - $(NETWORKMANAGER_CFLAGS) + $(NETWORKMANAGER_CFLAGS) \ + $(LIBNTRACK_CFLAGS) libexec_PROGRAMS = gweather-applet-2 @@ -26,7 +27,8 @@ $(GNOME_APPLETS_LIBS) \ $(GNOME_LIBS2_LIBS) \ $(LIBGWEATHER_LIBS) \ - $(NETWORKMANAGER_LIBS) + $(NETWORKMANAGER_LIBS) \ + $(LIBNTRACK_LIBS) uidir = $(datadir)/gnome-2.0/ui ui_DATA = GNOME_GWeatherApplet.xml --- gnome-applets-2.30.0.orig/gweather/gweather-applet.c +++ gnome-applets-2.30.0/gweather/gweather-applet.c @@ -34,6 +34,11 @@ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE +#ifdef HAVE_LIBNTRACK +#include +#include +#endif + #ifdef HAVE_NETWORKMANAGER #include #include @@ -298,7 +303,7 @@ weather_info_abort (gw_applet->gweather_info); } -#ifdef HAVE_NETWORKMANAGER +#if defined(HAVE_NETWORKMANAGER) || defined(HAVE_LIBNTRACK) static void setup_network_monitor (GWeatherApplet *gw_applet); #endif @@ -369,7 +374,7 @@ place_widgets(gw_applet); -#ifdef HAVE_NETWORKMANAGER +#if defined(HAVE_NETWORKMANAGER) || defined(HAVE_LIBNTRACK) setup_network_monitor (gw_applet); #endif } @@ -624,3 +629,27 @@ } } #endif /* HAVE_NETWORKMANAGER */ + +#ifdef HAVE_LIBNTRACK +static void +ntrack_monitor_cb (NTrackGMonitor *self, + NTrackGlibState oldstate, + NTrackGlibState newstate, + gpointer user_data) +{ + GWeatherApplet *gw_applet = user_data; + res_init (); + gweather_update (gw_applet); +} + +static void +setup_network_monitor (GWeatherApplet *gw_applet) +{ + NTrackGMonitor *monitor = ntrack_g_monitor_get(); + + g_signal_connect (G_OBJECT (monitor), "ntrack-state-changed", + (GCallback) ntrack_monitor_cb, gw_applet); +} + +#endif /* HAVE_LIBNTRACK */ +