diff -u gnome-applets-2.30.0/debian/control.in gnome-applets-2.30.0/debian/control.in --- gnome-applets-2.30.0/debian/control.in +++ gnome-applets-2.30.0/debian/control.in @@ -40,7 +40,7 @@ docbook-to-man, docbook-utils, gnome-doc-utils (>= 0.3.2), - network-manager-dev (>= 0.7) | not+linux-gnu, + libntrack-gobject-dev | not+linux-gnu, x11proto-kb-dev, python-gnome2-desktop-dev, gnome-pkg-tools (>= 0.10), diff -u gnome-applets-2.30.0/debian/rules gnome-applets-2.30.0/debian/rules --- gnome-applets-2.30.0/debian/rules +++ gnome-applets-2.30.0/debian/rules @@ -9,7 +9,7 @@ LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed -DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc --disable-scrollkeeper --enable-ipv6 --disable-battstat +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 diff -u gnome-applets-2.30.0/debian/control gnome-applets-2.30.0/debian/control --- gnome-applets-2.30.0/debian/control +++ gnome-applets-2.30.0/debian/control @@ -8,7 +8,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Guilherme de S. Pastore -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette +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), @@ -45,7 +45,7 @@ docbook-to-man, docbook-utils, gnome-doc-utils (>= 0.3.2), - network-manager-dev (>= 0.7) | not+linux-gnu, + libntrack-gobject-dev | not+linux-gnu, x11proto-kb-dev, python-gnome2-desktop-dev, gnome-pkg-tools (>= 0.10), diff -u gnome-applets-2.30.0/debian/changelog gnome-applets-2.30.0/debian/changelog --- gnome-applets-2.30.0/debian/changelog +++ gnome-applets-2.30.0/debian/changelog @@ -1,3 +1,9 @@ +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: diff -u gnome-applets-2.30.0/debian/patches/98_autoreconf.patch gnome-applets-2.30.0/debian/patches/98_autoreconf.patch --- gnome-applets-2.30.0/debian/patches/98_autoreconf.patch +++ gnome-applets-2.30.0/debian/patches/98_autoreconf.patch @@ -1,24 +1,133 @@ +--- + 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/accessx-status/docs/Makefile.in 2010-03-29 12:03:00.421547745 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/accessx-status/Makefile.in 2010-03-29 12:03:00.241546377 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -553,7 +553,7 @@ + # 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): @@ -27,7 +136,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -578,7 +578,7 @@ + *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): @@ -36,27 +155,63 @@ 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/accessx-status/pixmaps/Makefile.in 2010-03-29 12:03:00.521547263 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:54.000000000 +0200 -+++ gnome-applets-2.30.0/aclocal.m4 2010-03-29 12:02:52.880547631 +0200 -@@ -1,4 +1,4 @@ +--- 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. -@@ -13,8 +13,8 @@ + # 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 @@ -67,7 +222,17 @@ 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'.])]) -@@ -844,7 +844,7 @@ + + 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. @@ -76,7 +241,15 @@ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) -@@ -860,7 +860,7 @@ + # _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], @@ -85,7 +258,17 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -@@ -1728,6 +1728,14 @@ + + # 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,"` ;; @@ -100,7 +283,17 @@ esac ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) -@@ -1758,6 +1766,14 @@ + + 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,"` ;; @@ -115,37 +308,119 @@ 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/battstat/apmlib/Makefile.in 2010-03-29 12:03:00.717547381 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/battstat/docs/Makefile.in 2010-03-29 12:03:00.909546499 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:57.000000000 +0200 -+++ gnome-applets-2.30.0/battstat/Makefile.in 2010-03-29 12:03:00.629547864 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -634,7 +634,7 @@ + # 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): @@ -154,7 +429,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -659,7 +659,7 @@ + *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): @@ -163,37 +448,119 @@ 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/battstat/sounds/Makefile.in 2010-03-29 12:03:01.001546395 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/charpick/help/Makefile.in 2010-03-29 12:03:01.293546489 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/charpick/Makefile.in 2010-03-29 12:03:01.105546420 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -579,7 +579,7 @@ + # 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): @@ -202,7 +569,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -604,7 +604,7 @@ + *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): @@ -211,11 +588,16 @@ 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 2010-03-28 08:27:56.000000000 +0200 -+++ gnome-applets-2.30.0/configure 2010-03-29 12:02:57.412545623 +0200 -@@ -1,10 +1,12 @@ +--- 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. @@ -231,7 +613,17 @@ # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -@@ -673,7 +675,8 @@ + ## -------------------- ## + ## 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 + @@ -241,7 +633,93 @@ # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -@@ -1786,7 +1789,7 @@ + # 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 @@ -250,7 +728,38 @@ you have headers in a nonstandard directory PKG_CONFIG path to pkg-config utility CPP C preprocessor -@@ -1921,7 +1924,7 @@ + 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 @@ -259,7 +768,17 @@ Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation -@@ -1968,7 +1971,7 @@ + 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;} @@ -268,7 +787,17 @@ } # ac_fn_c_try_compile -@@ -2014,7 +2017,7 @@ + # 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;} @@ -277,7 +806,17 @@ } # ac_fn_c_try_link -@@ -2118,7 +2121,7 @@ + # 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;} @@ -286,7 +825,17 @@ } # ac_fn_c_try_cpp -@@ -2160,7 +2163,7 @@ + # 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;} @@ -295,7 +844,17 @@ } # ac_fn_c_try_run -@@ -2382,7 +2385,7 @@ + # 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 @@ -304,7 +863,17 @@ $ $0 $@ -@@ -2635,7 +2638,7 @@ + _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 @@ -313,7 +882,8 @@ { $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 -@@ -2644,9 +2647,9 @@ + . "$ac_site_file" + fi done if test -r "$cache_file"; then @@ -326,7 +896,17 @@ { $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 -@@ -3069,6 +3072,7 @@ + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi + else +@@ -3064,24 +3077,24 @@ do + esac + done + done + done + IFS=$as_save_IFS fi @@ -334,7 +914,7 @@ if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else -@@ -3076,7 +3080,6 @@ + # 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. @@ -342,7 +922,35 @@ MKDIR_P="$ac_install_sh -d" fi fi -@@ -3683,32 +3686,30 @@ + { $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 @@ -380,7 +988,17 @@ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: -@@ -3770,10 +3771,10 @@ + 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 @@ -394,7 +1012,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -3781,51 +3782,18 @@ + $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; }; } @@ -454,7 +1072,17 @@ { $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" -@@ -3858,13 +3826,72 @@ + 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 @@ -528,7 +1156,17 @@ { $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 : -@@ -5239,8 +5266,8 @@ + $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 @@ -538,7 +1176,17 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -@@ -6028,8 +6055,8 @@ + + { $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 @@ -549,107 +1197,197 @@ -@@ -6570,13 +6597,13 @@ + + + + + +@@ -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:6600: $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:6603: $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:6606: 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" -@@ -7781,7 +7808,7 @@ + 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 7811 "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=$? -@@ -9061,11 +9088,11 @@ + $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:9091: $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:9095: \$? = $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. -@@ -9400,11 +9427,11 @@ + $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:9430: $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:9434: \$? = $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. -@@ -9505,11 +9532,11 @@ + $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:9535: $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:9539: \$? = $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 -@@ -9560,11 +9587,11 @@ + # 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:9590: $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:9594: \$? = $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 -@@ -11943,7 +11970,7 @@ + # 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 11973 "configure" ++#line 11984 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12039,7 +12066,7 @@ + #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 12069 "configure" ++#line 12080 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -13113,6 +13140,14 @@ + #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,"` ;; @@ -664,7 +1402,17 @@ esac fi -@@ -13143,6 +13178,14 @@ + { $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,"` ;; @@ -679,7 +1427,148 @@ esac fi -@@ -17807,7 +17850,7 @@ + { $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 @@ -688,7 +1577,17 @@ CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS -@@ -17847,6 +17890,7 @@ + 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 @@ -696,7 +1595,17 @@ -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files -@@ -17869,10 +17913,11 @@ + --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 @@ -710,7 +1619,17 @@ Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation -@@ -17910,6 +17955,8 @@ + 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 ;; @@ -719,7 +1638,17 @@ --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) -@@ -18407,7 +18454,7 @@ + $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 @@ -728,7 +1657,13 @@ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p -@@ -18421,7 +18468,7 @@ + n + b repl + :more1 + s/["\\]/\\&/g; s/^/"/; s/$/"\\/ + p + g + s/.\{148\}// t nl :delim h @@ -737,27 +1672,85 @@ 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/cpufreq/help/Makefile.in 2010-03-29 12:03:01.509547343 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/cpufreq/Makefile.in 2010-03-29 12:03:01.389546470 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -495,7 +495,7 @@ + # 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): @@ -766,7 +1759,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -520,7 +520,7 @@ + *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): @@ -775,37 +1778,119 @@ 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/cpufreq/pixmaps/Makefile.in 2010-03-29 12:03:01.585546392 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/cpufreq/src/cpufreq-selector/Makefile.in 2010-03-29 12:03:01.789546469 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/cpufreq/src/Makefile.in 2010-03-29 12:03:01.681546649 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -518,7 +518,7 @@ + # 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): @@ -814,7 +1899,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -543,7 +543,7 @@ + *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): @@ -823,27 +1918,85 @@ 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/drivemount/help/Makefile.in 2010-03-29 12:03:02.009546784 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:58.000000000 +0200 -+++ gnome-applets-2.30.0/drivemount/Makefile.in 2010-03-29 12:03:01.893547607 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -581,7 +581,7 @@ + # 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): @@ -852,7 +2005,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -606,7 +606,7 @@ + *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): @@ -861,27 +2024,85 @@ 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/geyes/docs/Makefile.in 2010-03-29 12:03:02.245548073 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/geyes/Makefile.in 2010-03-29 12:03:02.113546250 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -591,7 +591,7 @@ + # 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): @@ -890,7 +2111,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -616,7 +616,7 @@ + *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): @@ -899,27 +2130,85 @@ 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/geyes/themes/Makefile.in 2010-03-29 12:03:02.333545775 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gkb-new/Makefile.in 2010-03-29 12:03:02.413546868 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -369,7 +369,7 @@ + # 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): @@ -928,7 +2217,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -394,7 +394,7 @@ + *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): @@ -937,47 +2236,153 @@ 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gkb-new/xmodmap/Makefile.in 2010-03-29 12:03:02.577546492 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gkb-new/xmodmap.sun/Makefile.in 2010-03-29 12:03:02.497546305 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gswitchit/help/Makefile.in 2010-03-29 12:03:02.833546543 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gswitchit/Makefile.in 2010-03-29 12:03:02.657547162 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -366,7 +366,7 @@ + # 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): @@ -986,7 +2391,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -391,7 +391,7 @@ + *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): @@ -995,27 +2410,141 @@ 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gweather/docs/Makefile.in 2010-03-29 12:03:03.137546087 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/gweather/Makefile.in 2010-03-29 12:03:02.961545916 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -569,7 +569,7 @@ + # 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): @@ -1024,7 +2553,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -594,7 +594,7 @@ + *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): @@ -1033,27 +2572,85 @@ 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/invest-applet/data/art/Makefile.in 2010-03-29 12:03:03.385546590 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/invest-applet/data/Makefile.in 2010-03-29 12:03:03.313545537 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -499,7 +499,7 @@ + # 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): @@ -1062,7 +2659,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -524,7 +524,7 @@ + *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): @@ -1071,37 +2678,119 @@ 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/invest-applet/docs/Makefile.in 2010-03-29 12:03:03.557546533 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/invest-applet/invest/Makefile.in 2010-03-29 12:03:03.676545595 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:27:59.000000000 +0200 -+++ gnome-applets-2.30.0/invest-applet/Makefile.in 2010-03-29 12:03:03.229546320 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -366,7 +366,7 @@ + # 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): @@ -1110,7 +2799,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -391,7 +391,7 @@ + *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): @@ -1119,11 +2818,16 @@ 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 2010-03-28 08:27:52.000000000 +0200 -+++ gnome-applets-2.30.0/ltmain.sh 2010-03-29 12:02:54.109547556 +0200 -@@ -1,6 +1,6 @@ +--- 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 @@ -1131,7 +2835,17 @@ # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -@@ -65,7 +65,7 @@ + # 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) @@ -1140,7 +2854,7 @@ # automake: $automake_version # autoconf: $autoconf_version # -@@ -73,9 +73,9 @@ + # Report bugs to . PROGRAM=ltmain.sh PACKAGE=libtool @@ -1152,11 +2866,21 @@ # 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 2010-03-28 08:27:52.000000000 +0200 -+++ gnome-applets-2.30.0/m4/ltversion.m4 2010-03-29 12:02:44.625547635 +0200 -@@ -9,15 +9,15 @@ +--- 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. @@ -1179,15 +2903,44 @@ ]) Index: gnome-applets-2.30.0/Makefile.in =================================================================== ---- gnome-applets-2.30.0.orig/Makefile.in 2010-03-28 08:28:02.000000000 +0200 -+++ gnome-applets-2.30.0/Makefile.in 2010-03-29 12:03:05.704546357 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -351,11 +351,11 @@ + # 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 @@ -1200,7 +2953,16 @@ gkb-new \ stickynotes \ trashapplet \ -@@ -372,7 +372,8 @@ + 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) \ @@ -1210,7 +2972,17 @@ DIST_SUBDIRS = \ po \ -@@ -493,7 +494,7 @@ + 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): @@ -1219,7 +2991,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -518,7 +519,7 @@ + *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): @@ -1228,7 +3010,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -682,7 +683,8 @@ + *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)" \ @@ -1238,7 +3030,17 @@ ! -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 {} {} \; \ -@@ -726,17 +728,17 @@ + || 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*) \ @@ -1260,37 +3062,119 @@ *.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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/man/Makefile.in 2010-03-29 12:03:03.764545387 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/mini-commander/help/Makefile.in 2010-03-29 12:03:04.020546367 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/mini-commander/Makefile.in 2010-03-29 12:03:03.840545757 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -419,7 +419,7 @@ + # 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): @@ -1299,7 +3183,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -444,7 +444,7 @@ + *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): @@ -1308,37 +3202,119 @@ 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/mini-commander/src/Makefile.in 2010-03-29 12:03:04.156547174 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/mixer/docs/Makefile.in 2010-03-29 12:03:04.448547126 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:00.000000000 +0200 -+++ gnome-applets-2.30.0/mixer/Makefile.in 2010-03-29 12:03:04.272548220 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -593,7 +593,7 @@ + # 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): @@ -1347,7 +3323,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -618,7 +618,7 @@ + *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): @@ -1356,37 +3342,119 @@ 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/modemlights/Makefile.in 2010-03-29 12:03:04.548546994 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/multiload/docs/Makefile.in 2010-03-29 12:03:04.792546501 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/multiload/Makefile.in 2010-03-29 12:03:04.648545459 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -594,7 +594,7 @@ + # 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): @@ -1395,7 +3463,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -619,7 +619,7 @@ + *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): @@ -1404,17 +3482,51 @@ 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/null_applet/Makefile.in 2010-03-29 12:03:04.884546742 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -330,6 +330,7 @@ + # 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 @@ -1422,7 +3534,7 @@ null_applet_SOURCES = null_applet.c null_applet_LDADD = $(GNOME_APPLETS_LIBS) serverdir = $(libdir)/bonobo/servers -@@ -337,9 +338,11 @@ + server_in_files = \ GNOME_NullApplet_Factory.server.in \ GNOME_CDPlayerApplet.server.in \ GNOME_MailcheckApplet_Factory.server.in \ @@ -1435,7 +3547,7 @@ server_DATA = $(server_in_files:.server.in=.server) CLEANFILES = GNOME_NullApplet_Factory.server.in $(server_DATA) -@@ -347,9 +350,11 @@ + EXTRA_DIST = \ GNOME_NullApplet_Factory.server.in.in \ GNOME_CDPlayerApplet.server.in \ GNOME_MailcheckApplet_Factory.server.in \ @@ -1448,37 +3560,119 @@ 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/stickynotes/data/Makefile.in 2010-03-29 12:03:05.080546035 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/stickynotes/docs/Makefile.in 2010-03-29 12:03:05.208545818 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/stickynotes/Makefile.in 2010-03-29 12:03:05.004547265 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -631,7 +631,7 @@ + # 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): @@ -1487,7 +3681,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -656,7 +656,7 @@ + *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): @@ -1496,37 +3700,119 @@ 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/stickynotes/pixmaps/Makefile.in 2010-03-29 12:03:05.304545720 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/trashapplet/docs/Makefile.in 2010-03-29 12:03:05.528547035 +0200 -@@ -1,4 +1,4 @@ +--- 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 2010-03-28 08:28:01.000000000 +0200 -+++ gnome-applets-2.30.0/trashapplet/Makefile.in 2010-03-29 12:03:05.388545854 +0200 -@@ -1,4 +1,4 @@ +--- 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, -@@ -463,7 +463,7 @@ + # 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): @@ -1535,7 +3821,17 @@ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -488,7 +488,7 @@ + *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): @@ -1547,10 +3843,39 @@ + *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 2010-03-28 08:28:02.000000000 +0200 -+++ gnome-applets-2.30.0/trashapplet/src/Makefile.in 2010-03-29 12:03:05.616546211 +0200 -@@ -1,4 +1,4 @@ +--- 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@ diff -u gnome-applets-2.30.0/debian/patches/99_ltmain_as-needed.patch gnome-applets-2.30.0/debian/patches/99_ltmain_as-needed.patch --- gnome-applets-2.30.0/debian/patches/99_ltmain_as-needed.patch +++ gnome-applets-2.30.0/debian/patches/99_ltmain_as-needed.patch @@ -1,8 +1,17 @@ -Index: gnome-applets-2.26.1/ltmain.sh +--- + ltmain.sh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +Index: gnome-applets-2.30.0/ltmain.sh =================================================================== ---- gnome-applets-2.26.1.orig/ltmain.sh 2009-06-17 22:01:22.602313283 +0200 -+++ gnome-applets-2.26.1/ltmain.sh 2009-06-17 22:04:35.394810636 +0200 -@@ -4716,6 +4716,11 @@ func_mode_link () +--- 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 ;; @@ -14,7 +23,17 @@ -Wl,*) func_stripname '-Wl,' '' "$arg" args=$func_stripname_result -@@ -5070,6 +5075,15 @@ func_mode_link () + 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 @@ -32,0 +52,5 @@ + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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.]), only in patch2: unchanged: --- 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 only in patch2: unchanged: --- 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 */ +