[Pkg-mono-svn-commits] rev 3497 - in non-group/banshee/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Tue Dec 4 13:50:33 UTC 2007
Author: slomo
Date: 2007-12-04 13:50:33 +0000 (Tue, 04 Dec 2007)
New Revision: 3497
Added:
non-group/banshee/trunk/debian/patches/99_ltmain_as-needed.patch
Removed:
non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch
Modified:
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/control
non-group/banshee/trunk/debian/patches/99_autoreconf.patch
non-group/banshee/trunk/debian/rules
Log:
* TODO: backport everything worth backporting from the stable branch, i.e.
everything that is not ipod or last.fm specific.
* debian/patches/03_fix_2.18_multimedia_keys.patch:
+ Dropped as this patch is not necessary anymore since a longer time.
* debian/patches/99_ltmain_as-needed.patch,
debian/rules:
+ Drop some unnecessary dependencies by using --as-needed.
* debian/patches/99_autoreconf.patch:
+ Regenerated.
* debian/control:
+ Build depend on libnjb-cil (>= 0.3.0-2) for fewer dependencies.
+ Update Standards-Version to 3.7.3.
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2007-12-03 22:49:20 UTC (rev 3496)
+++ non-group/banshee/trunk/debian/changelog 2007-12-04 13:50:33 UTC (rev 3497)
@@ -1,3 +1,20 @@
+banshee (0.13.1+dfsg-6) UNRELEASED; urgency=low
+
+ * TODO: backport everything worth backporting from the stable branch, i.e.
+ everything that is not ipod or last.fm specific.
+ * debian/patches/03_fix_2.18_multimedia_keys.patch:
+ + Dropped as this patch is not necessary anymore since a longer time.
+ * debian/patches/99_ltmain_as-needed.patch,
+ debian/rules:
+ + Drop some unnecessary dependencies by using --as-needed.
+ * debian/patches/99_autoreconf.patch:
+ + Regenerated.
+ * debian/control:
+ + Build depend on libnjb-cil (>= 0.3.0-2) for fewer dependencies.
+ + Update Standards-Version to 3.7.3.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 03 Dec 2007 10:50:46 +0100
+
banshee (0.13.1+dfsg-5) unstable; urgency=low
* debian/control:
Modified: non-group/banshee/trunk/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control 2007-12-03 22:49:20 UTC (rev 3496)
+++ non-group/banshee/trunk/debian/control 2007-12-04 13:50:33 UTC (rev 3497)
@@ -2,8 +2,8 @@
Section: sound
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.6.4), libipodui-cil (>= 0.6.4), libnjb-cil (>= 0.3.0), libsqlite3-dev (>= 3.2), libmono-sqlite2.0-cil, gstreamer0.10-tools, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.90), libdbus-glib-1-dev (>= 0.70), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool (>= 0.35.0), libmono-cairo2.0-cil, libmono2.0-cil, libmono-system-web2.0-cil, libmono-system-data2.0-cil, boo (>= 0.7.6), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), sharutils, libtaglib2.0-cil (>= 2.0.0)
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), cdbs, cli-common-dev (>= 0.4.4), mono-gmcs (>= 1.1.10) | c-sharp-2.0-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.6.4), libipodui-cil (>= 0.6.4), libnjb-cil (>= 0.3.0-2), libsqlite3-dev (>= 3.2), libmono-sqlite2.0-cil, gstreamer0.10-tools, gstreamer0.10-plugins-base-apps, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-gnomevfs, libgstreamer0.10-dev (>= 0.10.3), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev (>= 0.90), libdbus-glib-1-dev (>= 0.70), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi1.0-cil (>= 0.6), pkg-config, intltool (>= 0.35.0), libmono-cairo2.0-cil, libmono2.0-cil, libmono-system-web2.0-cil, libmono-system-data2.0-cil, boo (>= 0.7.6), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), sharutils, libtaglib2.0-cil (>= 2.0.0)
+Standards-Version: 3.7.3
Package: banshee
Architecture: any
Deleted: non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch 2007-12-03 22:49:20 UTC (rev 3496)
+++ non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch 2007-12-04 13:50:33 UTC (rev 3497)
@@ -1,175 +0,0 @@
---- src/Plugins/Banshee.Plugins.MMKeys/Makefile.am.old 2007-06-14 22:53:21.000000000 +0200
-+++ src/Plugins/Banshee.Plugins.MMKeys/Makefile.am 2007-06-14 22:53:38.000000000 +0200
-@@ -13,7 +13,7 @@
- $(srcdir)/MMKeysConfigPage.cs
-
- $(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-+ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-
- include $(top_srcdir)/build/gconf-schema-rules
-
---- src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs.old 2007-08-14 21:14:19.000000000 +0200
-+++ src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs 2007-08-14 21:17:55.000000000 +0200
-@@ -2,6 +2,7 @@
- * MMKeysPlugin.cs
- *
- * Written by Danilo Reinhardt (danilo.reinhardt at gmx.net)
-+ * Jan Arne Petersen (jap at gnome.org)
- ****************************************************************************/
-
- /* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -31,6 +32,8 @@
- using Gdk;
- using Mono.Unix;
-
-+using NDesk.DBus;
-+
- using Banshee.Base;
- using Banshee.Configuration;
-
-@@ -46,10 +49,22 @@
-
- namespace Banshee.Plugins.MMKeys
- {
-+ public delegate void MediaPlayerKeyPressedHandler(string application, string key);
-+
-+ [Interface ("org.gnome.SettingsDaemon")]
-+ public interface ISettingsDaemon
-+ {
-+ void GrabMediaPlayerKeys(string application, uint time);
-+ void ReleaseMediaPlayerKeys(string application);
-+ event MediaPlayerKeyPressedHandler MediaPlayerKeyPressed;
-+ }
-+
- public class MMKeysPlugin : Banshee.Plugins.Plugin
- {
-+ private const string BusName = "org.gnome.SettingsDaemon";
-+ private const string ObjectPath = "/org/gnome/SettingsDaemon";
- protected override string ConfigurationName { get { return "mmkeys"; } }
-- public override string DisplayName { get { return Catalog.GetString("Multimedia Keys"); } }
-+ public override string DisplayName { get { return Catalog.GetString("Multimedia Keys"); } }
-
- public override string Description {
- get {
-@@ -62,63 +77,67 @@
- public override string [] Authors {
- get {
- return new string [] {
-- "Danilo Reinhardt"
-+ "Danilo Reinhardt",
-+ "Jan Arne Petersen"
- };
- }
- }
-
-- private SpecialKeys special_keys;
-+ private ISettingsDaemon settings_daemon;
-
-- protected override void PluginInitialize()
-- {
-- special_keys = new SpecialKeys();
-- special_keys.Delay = new TimeSpan(500 * TimeSpan.TicksPerMillisecond);
--
-- special_keys.RegisterHandler(OnSpecialKeysPressed,
-- SpecialKey.AudioPlay,
-- SpecialKey.AudioPrev,
-- SpecialKey.AudioNext,
-- SpecialKey.AudioStop
-- );
-- }
--
-- private void OnSpecialKeysPressed(object o, SpecialKey key)
-- {
-- switch(key) {
-- case SpecialKey.AudioPlay:
-- Globals.ActionManager["PlayPauseAction"].Activate();
-- break;
-- case SpecialKey.AudioNext:
-- Globals.ActionManager["NextAction"].Activate();
-- break;
-- case SpecialKey.AudioPrev:
-- Globals.ActionManager["PreviousAction"].Activate();
-- break;
-- case SpecialKey.AudioStop:
-- PlayerEngineCore.Close();
-- break;
-- }
-- }
--
-- protected override void PluginDispose()
-- {
-- special_keys.UnregisterHandler(OnSpecialKeysPressed,
-- SpecialKey.AudioPlay,
-- SpecialKey.AudioPrev,
-- SpecialKey.AudioNext);
-- special_keys.Dispose();
-- }
--
-- public override Gtk.Widget GetConfigurationWidget()
-- {
-- return new MMKeysConfigPage();
-- }
--
-- public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
-- "plugins.mmkeys", "enabled",
-- false,
-- "Plugin enabled",
-- "Multimedia Keys plugin enabled"
-- );
-+ protected override void PluginInitialize()
-+ {
-+ settings_daemon = Bus.Session.GetObject<ISettingsDaemon>(BusName, new ObjectPath(ObjectPath));;
-+
-+ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
-+ settings_daemon.MediaPlayerKeyPressed += OnMediaPlayerKeyPressed;
-+ }
-+
-+ protected override void InterfaceInitialize()
-+ {
-+ InterfaceElements.MainWindow.FocusInEvent += OnFocusInEvent;
-+ }
-+
-+ private void OnMediaPlayerKeyPressed(string application, string key)
-+ {
-+ if (application != "Banshee") {
-+ return;
-+ }
-+ switch(key) {
-+ case "Play":
-+ Globals.ActionManager["PlayPauseAction"].Activate();
-+ break;
-+ case "Next":
-+ Globals.ActionManager["NextAction"].Activate();
-+ break;
-+ case "Previous":
-+ Globals.ActionManager["PreviousAction"].Activate();
-+ break;
-+ }
-+ }
-+
-+ private void OnFocusInEvent(object o, FocusInEventArgs args)
-+ {
-+ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
-+ }
-+
-+ protected override void PluginDispose()
-+ {
-+ InterfaceElements.MainWindow.FocusInEvent -= OnFocusInEvent;
-+ settings_daemon.MediaPlayerKeyPressed -= OnMediaPlayerKeyPressed;
-+ settings_daemon.ReleaseMediaPlayerKeys("Banshee");
-+ }
-+
-+ public override Gtk.Widget GetConfigurationWidget()
-+ {
-+ return new MMKeysConfigPage();
-+ }
-+
-+ public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
-+ "plugins.mmkeys", "enabled",
-+ false,
-+ "Plugin enabled",
-+ "Multimedia Keys plugin enabled"
-+ );
- }
- }
Modified: non-group/banshee/trunk/debian/patches/99_autoreconf.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/99_autoreconf.patch 2007-12-03 22:49:20 UTC (rev 3496)
+++ non-group/banshee/trunk/debian/patches/99_autoreconf.patch 2007-12-04 13:50:33 UTC (rev 3497)
@@ -1,6 +1,6 @@
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/aclocal.m4 banshee-0.13.1+dfsg/aclocal.m4
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/aclocal.m4 banshee-0.13.1+dfsg/aclocal.m4
--- banshee-0.13.1+dfsg.old/aclocal.m4 2007-08-20 05:15:14.000000000 +0200
-+++ banshee-0.13.1+dfsg/aclocal.m4 2007-08-20 07:00:41.000000000 +0200
++++ banshee-0.13.1+dfsg/aclocal.m4 2007-12-04 14:35:14.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
@@ -231,7 +231,7 @@
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-+ PKG_PROG_PKG_CONFIG([0.7])
++ PKG_PROG_PKG_CONFIG([0.16])
-],
-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
@@ -1974,7 +1974,7 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#include <stdio.h>
-+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -16170,49 +16170,9 @@
m4_include([build/m4/shamrock/i18n.m4])
m4_include([build/m4/shamrock/mono-nunit.m4])
m4_include([build/m4/shamrock/mono.m4])
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/autogen.sh banshee-0.13.1+dfsg/autogen.sh
---- banshee-0.13.1+dfsg.old/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ banshee-0.13.1+dfsg/autogen.sh 2007-08-20 07:00:29.000000000 +0200
-@@ -0,0 +1,36 @@
-+#!/bin/bash
-+# Run this to generate all the initial makefiles, etc.
-+
-+srcdir=`dirname $0`
-+test -z "$srcdir" && srcdir=.
-+
-+PKG_NAME="banshee"
-+
-+(test -f $srcdir/configure.ac) || {
-+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-+ echo " top-level $PKG_NAME directory"
-+ exit 1
-+}
-+
-+which svn 1>/dev/null || {
-+ echo "**Error**: subversion was not found, please install it"
-+ exit 1
-+}
-+
-+which gnome-autogen.sh || {
-+ echo "You need to install gnome-common from the GNOME CVS"
-+ exit 1
-+}
-+
-+ACLOCAL_FLAGS="-I build/m4/shamrock -I build/m4/banshee $ACLOCAL_FLAGS" REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
-+
-+if ! test -x ./mkinstalldirs; then
-+ for automake_path in `whereis automake-1.9`; do
-+ if ! test -z `echo $automake_path | grep share`; then
-+ if test -x $automake_path/mkinstalldirs; then
-+ cp $automake_path/mkinstalldirs .
-+ fi
-+ fi
-+ done
-+fi
-+
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/branding/Makefile.in banshee-0.13.1+dfsg/branding/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/branding/Makefile.in banshee-0.13.1+dfsg/branding/Makefile.in
--- banshee-0.13.1+dfsg.old/branding/Makefile.in 2007-08-20 05:15:18.000000000 +0200
-+++ banshee-0.13.1+dfsg/branding/Makefile.in 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/branding/Makefile.in 2007-12-04 14:35:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -16538,9 +16498,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/build/m4/Makefile.in banshee-0.13.1+dfsg/build/m4/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/build/m4/Makefile.in banshee-0.13.1+dfsg/build/m4/Makefile.in
--- banshee-0.13.1+dfsg.old/build/m4/Makefile.in 2007-08-20 05:15:18.000000000 +0200
-+++ banshee-0.13.1+dfsg/build/m4/Makefile.in 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/build/m4/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -16849,9 +16809,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/build/Makefile.in banshee-0.13.1+dfsg/build/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/build/Makefile.in banshee-0.13.1+dfsg/build/Makefile.in
--- banshee-0.13.1+dfsg.old/build/Makefile.in 2007-08-20 05:15:18.000000000 +0200
-+++ banshee-0.13.1+dfsg/build/Makefile.in 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/build/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -17266,9 +17226,9 @@
all: $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/configure banshee-0.13.1+dfsg/configure
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/configure banshee-0.13.1+dfsg/configure
--- banshee-0.13.1+dfsg.old/configure 2007-08-20 05:15:17.000000000 +0200
-+++ banshee-0.13.1+dfsg/configure 2007-08-20 07:00:45.000000000 +0200
++++ banshee-0.13.1+dfsg/configure 2007-12-04 14:35:18.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -22906,7 +22866,7 @@
+
+fi
+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.7
++ _pkg_min_version=0.16
+ { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
@@ -24761,9 +24721,9 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.1+dfsg/data/audio-profiles/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.1+dfsg/data/audio-profiles/Makefile.in
--- banshee-0.13.1+dfsg.old/data/audio-profiles/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/data/audio-profiles/Makefile.in 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/data/audio-profiles/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25085,9 +25045,9 @@
@INTLTOOL_XML_RULE@
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/data/images/Makefile.in banshee-0.13.1+dfsg/data/images/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/data/images/Makefile.in banshee-0.13.1+dfsg/data/images/Makefile.in
--- banshee-0.13.1+dfsg.old/data/images/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/data/images/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/data/images/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25397,9 +25357,9 @@
install-data-local:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/data/Makefile.in banshee-0.13.1+dfsg/data/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/data/Makefile.in banshee-0.13.1+dfsg/data/Makefile.in
--- banshee-0.13.1+dfsg.old/data/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/data/Makefile.in 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/data/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25796,9 +25756,9 @@
%.desktop.in: %.desktop.in.in
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/depcomp banshee-0.13.1+dfsg/depcomp
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/depcomp banshee-0.13.1+dfsg/depcomp
--- banshee-0.13.1+dfsg.old/depcomp 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/depcomp 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/depcomp 2007-12-04 14:35:21.000000000 +0100
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -25897,9 +25857,9 @@
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/docs/Makefile.in banshee-0.13.1+dfsg/docs/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/docs/Makefile.in banshee-0.13.1+dfsg/docs/Makefile.in
--- banshee-0.13.1+dfsg.old/docs/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/docs/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/docs/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26225,9 +26185,9 @@
@BUILD_DOCS_TRUE at all: MonodocNodeConfig.exe
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.1+dfsg/ext/dbus-sharp/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.1+dfsg/ext/dbus-sharp/Makefile.in
--- banshee-0.13.1+dfsg.old/ext/dbus-sharp/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/ext/dbus-sharp/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/ext/dbus-sharp/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26571,9 +26531,9 @@
@EXTERNAL_NDESK_DBUS_FALSE at all: $(DBUS_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.1+dfsg/ext/hal-sharp/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.1+dfsg/ext/hal-sharp/Makefile.in
--- banshee-0.13.1+dfsg.old/ext/hal-sharp/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/ext/hal-sharp/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/ext/hal-sharp/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26917,9 +26877,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/ext/Makefile.in banshee-0.13.1+dfsg/ext/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/ext/Makefile.in banshee-0.13.1+dfsg/ext/Makefile.in
--- banshee-0.13.1+dfsg.old/ext/Makefile.in 2007-08-20 05:15:19.000000000 +0200
-+++ banshee-0.13.1+dfsg/ext/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/ext/Makefile.in 2007-12-04 14:35:20.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -27285,9 +27245,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.1+dfsg/ext/taglib-sharp/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.1+dfsg/ext/taglib-sharp/Makefile.in
--- banshee-0.13.1+dfsg.old/ext/taglib-sharp/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/ext/taglib-sharp/Makefile.in 2007-08-20 07:00:48.000000000 +0200
++++ banshee-0.13.1+dfsg/ext/taglib-sharp/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -27662,9 +27622,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/extras/Makefile.in banshee-0.13.1+dfsg/extras/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/extras/Makefile.in banshee-0.13.1+dfsg/extras/Makefile.in
--- banshee-0.13.1+dfsg.old/extras/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/extras/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/extras/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -28030,9 +27990,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/extras/tools/Makefile.in banshee-0.13.1+dfsg/extras/tools/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/extras/tools/Makefile.in banshee-0.13.1+dfsg/extras/tools/Makefile.in
--- banshee-0.13.1+dfsg.old/extras/tools/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/extras/tools/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/extras/tools/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -28358,9 +28318,9 @@
all: $(BANSHEE_IMPORT_ASSEMBLY) $(DBUS_CLIENT_ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/install-sh banshee-0.13.1+dfsg/install-sh
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/install-sh banshee-0.13.1+dfsg/install-sh
--- banshee-0.13.1+dfsg.old/install-sh 2007-08-20 05:15:18.000000000 +0200
-+++ banshee-0.13.1+dfsg/install-sh 2007-08-20 07:00:47.000000000 +0200
++++ banshee-0.13.1+dfsg/install-sh 2007-12-04 14:35:19.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -28830,15 +28790,15 @@
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/intltool-extract.in banshee-0.13.1+dfsg/intltool-extract.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/intltool-extract.in banshee-0.13.1+dfsg/intltool-extract.in
--- banshee-0.13.1+dfsg.old/intltool-extract.in 2007-08-20 05:15:10.000000000 +0200
-+++ banshee-0.13.1+dfsg/intltool-extract.in 2007-08-20 07:00:35.000000000 +0200
++++ banshee-0.13.1+dfsg/intltool-extract.in 2007-12-04 14:35:09.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.1";
++my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -28853,15 +28813,15 @@
return $_;
}
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/intltool-merge.in banshee-0.13.1+dfsg/intltool-merge.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/intltool-merge.in banshee-0.13.1+dfsg/intltool-merge.in
--- banshee-0.13.1+dfsg.old/intltool-merge.in 2007-08-20 05:15:10.000000000 +0200
-+++ banshee-0.13.1+dfsg/intltool-merge.in 2007-08-20 07:00:35.000000000 +0200
++++ banshee-0.13.1+dfsg/intltool-merge.in 2007-12-04 14:35:09.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.1";
++my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -28877,7 +28837,7 @@
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
-+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
+ return 0;
+}
+
@@ -28891,7 +28851,52 @@
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
-@@ -494,16 +509,15 @@
+@@ -260,8 +275,42 @@
+
+ sub gather_po_files
+ {
+- for my $po_file (glob "$PO_DIR/*.po") {
+- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ if (my $linguas = $ENV{"LINGUAS"})
++ {
++ for my $lang (split / /, $linguas) {
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++ else
++ {
++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
++ {
++ while (<LINGUAS_FILE>)
++ {
++ next if /^#/;
++
++ if (/([-a-zA-Z_ at .]+)\n/)
++ {
++ my $lang = $1;
++
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++
++ close LINGUAS_FILE;
++ }
++ else
++ {
++ for my $po_file (glob "$PO_DIR/*.po") {
++ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ }
++ }
+ }
+ }
+
+@@ -494,16 +543,15 @@
return $string;
}
@@ -28910,15 +28915,15 @@
return $_;
}
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/intltool-update.in banshee-0.13.1+dfsg/intltool-update.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/intltool-update.in banshee-0.13.1+dfsg/intltool-update.in
--- banshee-0.13.1+dfsg.old/intltool-update.in 2007-08-20 05:15:10.000000000 +0200
-+++ banshee-0.13.1+dfsg/intltool-update.in 2007-08-20 07:00:35.000000000 +0200
++++ banshee-0.13.1+dfsg/intltool-update.in 2007-12-04 14:35:09.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.5";
-+my $VERSION = "0.36.1";
++my $VERSION = "0.36.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -29143,9 +29148,9 @@
}
else
{
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/libbanshee/Makefile.in banshee-0.13.1+dfsg/libbanshee/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/libbanshee/Makefile.in banshee-0.13.1+dfsg/libbanshee/Makefile.in
--- banshee-0.13.1+dfsg.old/libbanshee/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/libbanshee/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/libbanshee/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -29549,9 +29554,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/ltmain.sh banshee-0.13.1+dfsg/ltmain.sh
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/ltmain.sh banshee-0.13.1+dfsg/ltmain.sh
--- banshee-0.13.1+dfsg.old/ltmain.sh 2006-11-25 12:34:55.000000000 +0100
-+++ banshee-0.13.1+dfsg/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
++++ banshee-0.13.1+dfsg/ltmain.sh 2007-11-27 22:23:09.000000000 +0100
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -29569,7 +29574,7 @@
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
++VERSION="1.5.24 Debian 1.5.24-2"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-# See if we are running on zsh, and set the options which allow our
@@ -30105,9 +30110,9 @@
All other options (arguments beginning with \`-') are ignored.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/Makefile.in banshee-0.13.1+dfsg/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/Makefile.in banshee-0.13.1+dfsg/Makefile.in
--- banshee-0.13.1+dfsg.old/Makefile.in 2007-08-20 05:15:25.000000000 +0200
-+++ banshee-0.13.1+dfsg/Makefile.in 2007-08-20 07:00:55.000000000 +0200
++++ banshee-0.13.1+dfsg/Makefile.in 2007-12-04 14:35:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -30521,9 +30526,9 @@
run:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/missing banshee-0.13.1+dfsg/missing
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/missing banshee-0.13.1+dfsg/missing
--- banshee-0.13.1+dfsg.old/missing 2007-08-20 05:15:18.000000000 +0200
-+++ banshee-0.13.1+dfsg/missing 2007-08-20 07:00:46.000000000 +0200
++++ banshee-0.13.1+dfsg/missing 2007-12-04 14:35:19.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -30706,9 +30711,9 @@
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/mkinstalldirs banshee-0.13.1+dfsg/mkinstalldirs
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/mkinstalldirs banshee-0.13.1+dfsg/mkinstalldirs
--- banshee-0.13.1+dfsg.old/mkinstalldirs 2007-08-20 05:15:25.000000000 +0200
-+++ banshee-0.13.1+dfsg/mkinstalldirs 2007-08-20 07:00:55.000000000 +0200
++++ banshee-0.13.1+dfsg/mkinstalldirs 2007-12-04 14:35:26.000000000 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -30728,9 +30733,9 @@
errstatus=0
dirmode=
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/po/Makefile.in.in banshee-0.13.1+dfsg/po/Makefile.in.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/po/Makefile.in.in banshee-0.13.1+dfsg/po/Makefile.in.in
--- banshee-0.13.1+dfsg.old/po/Makefile.in.in 2007-08-20 05:15:10.000000000 +0200
-+++ banshee-0.13.1+dfsg/po/Makefile.in.in 2007-08-20 07:00:35.000000000 +0200
++++ banshee-0.13.1+dfsg/po/Makefile.in.in 2007-12-04 14:35:09.000000000 +0100
@@ -133,7 +133,7 @@
dvi info tags TAGS ID:
@@ -30740,9 +30745,9 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Core/Banshee/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Core/Banshee/Makefile.in 2007-08-20 07:00:50.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Core/Banshee/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31105,9 +31110,9 @@
$(ASSEMBLY): $(BANSHEE_SOURCE_BUILD) $(BANSHEE_EXPANDED_RESOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Base/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Base/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Core/Banshee.Base/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Core/Banshee.Base/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Core/Banshee.Base/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31458,9 +31463,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Hyena/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Hyena/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Core/Banshee.Hyena/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Core/Banshee.Hyena/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Core/Banshee.Hyena/Makefile.in 2007-12-04 14:35:21.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31786,9 +31791,9 @@
all: $(HYENA_ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Widgets/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.1+dfsg/src/Core/Banshee.Widgets/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Core/Banshee.Widgets/Makefile.in 2007-08-20 05:15:20.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Core/Banshee.Widgets/Makefile.in 2007-08-20 07:00:49.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Core/Banshee.Widgets/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32133,9 +32138,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Core/Makefile.in banshee-0.13.1+dfsg/src/Core/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Core/Makefile.in banshee-0.13.1+dfsg/src/Core/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Core/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Core/Makefile.in 2007-08-20 07:00:50.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Core/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32500,9 +32505,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-08-20 07:00:50.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32849,9 +32854,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-08-20 07:00:50.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33198,9 +33203,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-08-20 07:00:50.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33545,9 +33550,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-08-20 05:15:21.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-12-04 14:35:22.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33894,9 +33899,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34243,9 +34248,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Dap/Makefile.in banshee-0.13.1+dfsg/src/Dap/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Dap/Makefile.in banshee-0.13.1+dfsg/src/Dap/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Dap/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Dap/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Dap/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34612,9 +34617,9 @@
uninstall-hook:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34960,9 +34965,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Engines/Makefile.in banshee-0.13.1+dfsg/src/Engines/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Engines/Makefile.in banshee-0.13.1+dfsg/src/Engines/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Engines/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Engines/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Engines/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -35329,9 +35334,9 @@
uninstall-hook:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.1+dfsg/src/Extras/Boo/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.1+dfsg/src/Extras/Boo/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/Boo/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/Boo/Makefile.in 2007-08-20 07:00:51.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/Boo/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -35659,9 +35664,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.1+dfsg/src/Extras/BooBuddy/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.1+dfsg/src/Extras/BooBuddy/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/BooBuddy/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/BooBuddy/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/BooBuddy/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36006,9 +36011,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(BOO_MACRO_SRC)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36354,9 +36359,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.1+dfsg/src/Extras/Last.FM/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.1+dfsg/src/Extras/Last.FM/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/Last.FM/Makefile.in 2007-08-20 05:15:22.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/Last.FM/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/Last.FM/Makefile.in 2007-12-04 14:35:23.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36701,9 +36706,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(srcdir)/badge.png $(srcdir)/badge-hover.png
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/Makefile.in banshee-0.13.1+dfsg/src/Extras/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/Makefile.in banshee-0.13.1+dfsg/src/Extras/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37068,9 +37073,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.1+dfsg/src/Extras/MusicBrainz/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.1+dfsg/src/Extras/MusicBrainz/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Extras/MusicBrainz/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Extras/MusicBrainz/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Extras/MusicBrainz/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37415,9 +37420,9 @@
@ENABLE_TESTS_TRUE at all: $(ASSEMBLY) test
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Makefile.in banshee-0.13.1+dfsg/src/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Makefile.in banshee-0.13.1+dfsg/src/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Makefile.in 2007-08-20 07:00:52.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37782,9 +37787,9 @@
run:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-08-20 07:00:53.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38135,9 +38140,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2007-08-20 07:00:53.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38489,9 +38494,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-08-20 05:15:23.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-08-20 07:00:53.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38841,9 +38846,9 @@
@DAAP_ENABLED_TRUE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-08-20 07:00:53.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -39194,9 +39199,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) MetadataSearchMenu.xml
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -39548,9 +39553,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-08-20 07:00:53.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-12-04 14:35:24.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -39872,7 +39877,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -612,23 +591,26 @@
+@@ -612,19 +591,22 @@
ps-am:
@@ -39901,14 +39906,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-+ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-
- $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
- if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -40261,9 +40261,9 @@
uninstall-notificationareaiconSCRIPTS uninstall-schemaDATA
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -40615,9 +40615,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -40969,9 +40969,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-08-20 05:15:24.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -41323,9 +41323,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2007-08-20 05:15:25.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2007-08-20 07:00:54.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2007-12-04 14:35:25.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -41651,9 +41651,9 @@
all: $(ASSEMBLY)
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/src/Plugins/Makefile.in banshee-0.13.1+dfsg/src/Plugins/Makefile.in
--- banshee-0.13.1+dfsg.old/src/Plugins/Makefile.in 2007-08-20 05:15:25.000000000 +0200
-+++ banshee-0.13.1+dfsg/src/Plugins/Makefile.in 2007-08-20 07:00:55.000000000 +0200
++++ banshee-0.13.1+dfsg/src/Plugins/Makefile.in 2007-12-04 14:35:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -42020,9 +42020,9 @@
uninstall-hook:
-diff -x'*config.guess' -x'*config.sub' -Naur banshee-0.13.1+dfsg.old/tests/Makefile.in banshee-0.13.1+dfsg/tests/Makefile.in
+diff -x'*autogen.sh' -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.1+dfsg.old/tests/Makefile.in banshee-0.13.1+dfsg/tests/Makefile.in
--- banshee-0.13.1+dfsg.old/tests/Makefile.in 2007-08-20 05:15:25.000000000 +0200
-+++ banshee-0.13.1+dfsg/tests/Makefile.in 2007-08-20 07:00:55.000000000 +0200
++++ banshee-0.13.1+dfsg/tests/Makefile.in 2007-12-04 14:35:26.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
Added: non-group/banshee/trunk/debian/patches/99_ltmain_as-needed.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/99_ltmain_as-needed.patch (rev 0)
+++ non-group/banshee/trunk/debian/patches/99_ltmain_as-needed.patch 2007-12-04 13:50:33 UTC (rev 3497)
@@ -0,0 +1,30 @@
+--- ltmain.sh.old 2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh 2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+@@ -2137,6 +2142,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: non-group/banshee/trunk/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules 2007-12-03 22:49:20 UTC (rev 3496)
+++ non-group/banshee/trunk/debian/rules 2007-12-04 13:50:33 UTC (rev 3497)
@@ -9,13 +9,15 @@
export MONO_SHARED_DIR=$(CURDIR)
-DEB_CONFIGURE_EXTRA_FLAGS=--disable-static --disable-helix --disable-vlc \
- --disable-xing --disable-mtp --disable-docs \
- --enable-gstreamer=0.10 --enable-avahi \
- --enable-external-boo --enable-external-ndesk-dbus \
- --enable-external-taglib-sharp
+LDFLAGS+=-Wl,--as-needed
+DEB_CONFIGURE_EXTRA_FLAGS+=--disable-static --disable-helix --disable-vlc \
+ --disable-xing --disable-mtp --disable-docs \
+ --enable-gstreamer=0.10 --enable-avahi \
+ --enable-external-boo --enable-external-ndesk-dbus \
+ --enable-external-taglib-sharp
+
install/banshee::
rm -f debian/tmp/usr/bin/banshee-import \
debian/tmp/usr/lib/banshee/banshee-import.exe
More information about the Pkg-mono-svn-commits
mailing list