[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/2.1.0-1-16-g1655f3d
Iain Lane
laney at debian.org
Mon Jul 25 13:42:03 UTC 2011
The following commit has been merged in the experimental branch:
commit 1bcfca3f31e3b4979a92f94e5164ecaf85d80577
Merge: a72b20ad2468f0754a185ad52f24cb11647598d4 6023eb1d9b9b886df0e7f58562c7cb49929bbf6f
Author: Iain Lane <laney at debian.org>
Date: Mon Jul 25 14:23:16 2011 +0100
Merge branch 'master' (early part) into experimental
Conflicts:
debian/control
debian/patches/series
debian/rules
diff --combined debian/changelog
index 98a28c7,e9e7fc6..18f667a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,18 +1,60 @@@
+banshee (2.1.0-1) experimental; urgency=low
+
+ * [6b1b0d2] New upstream release:
+ + New features:
+ - eMusic store
+ + Enhancements:
+ - ArtworkManager: add --fetch-artwork argument
+ - bgo#647754: Xperia X12 support
+ - bgo#508713: MiniMode: Reduce height of window
+ - bgo#648941: Support .spc files
+ - bgo#649401: Set UserAgent when doing MusicBrainz queries
+ + Notable bug fixes:
+ - Windows installer fixes
+ - bgo#647059: Fix Remote Daap crash
+ - bgo#647089: Daap: Bind to IPAddress.Loopback instead of Any
+ (LP: #753986)
+ - bgo#644648: libbanshee fixes
+ - bgo#642113: Change Remote dialog's button from Ok to Add
+ - bgo#647144: StreamPositionLabel fixes
+ - AmazonMp3.Store: Fix signed-in detection for UK store
+ - bgo#633552: AppleDevice: Ensure m4a/mp3 are supported
+ - bgo#634647: Have ctrl-a select text in SearchEntry
+ - bgo#642140: Last.fm: Close HTTP streams when finished with them
+ - bgo#648133: build: Don't delete gnome-doc-utils.make during distclean
+ - bgo#647932: DatabaseSource: Fix NRE in SkipTrackIfRemoved
+ - bgo#646991: AlbumListView: Fix disappearing option in Preferences
+ - bgo#647024: Lastfm: Fix NRE crash
+ - bgo#636057: Fix rendering glitch
+ - PodcastFeedPropertiesDialog: Fix display of feed URL
+ - bgo#648458: PlsPlaylistFormat: Make parsing the header case-insensitive
+ - bgo#611489: GStreamer: Use Banshee.IO instead of System.IO
+ - bgo#641748: ViewActions: enable eq once we know backend supports it
+ - bgo#638889: Banshee.Services: Avoid creating dupes after moves
+ * [227b3ca] Add new GNOME URL to debian/watch
+ * [89f38cb] Bump build depends to match build system changes
+ * [b384a5b] Drop obsolete configure flags
+ * [ca2a400] Provide banshee-{api,asm}-* virtual packages
+ * [741d31a] Workaround clideps issue
+ * [287ec44] Workaround meego panel clideps failure
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sat, 14 May 2011 22:06:44 +0800
+
+ banshee (2.0.1-2) unstable; urgency=low
+
+ [ Chow Loong Jin ]
+ * [fd5aed2] Cherry-pick patch to port Banshee to DBus#
+ * [4706fbe] Amend build-deps to use dbus# instead of ndesk-dbus
+ * [3b30572] Add autoreconf
+ * [a1fb6fe] Bump version of bce that Banshee breaks
+
+ [ Iain Lane ]
+ * [65625a4] Remove .la files.
+ Thanks to Luk Claes <luk at debian.org> (Closes: #621324)
+ * [7c776aa] Pass --as-needed to dh_autoreconf to enable support in ltmain.sh
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 10 Jul 2011 09:57:33 +0100
+
banshee (2.0.1-1) unstable; urgency=low
* [5f2e8a7] Switch over to bz2 in debian/watch
diff --combined debian/control
index 9f8ac60,4a35242..33e36fa
--- a/debian/control
+++ b/debian/control
@@@ -4,19 -4,20 +4,20 @@@ Priority: optiona
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at debian.org>, Chow Loong Jin <hyperair at ubuntu.com>
Build-Depends: debhelper (>= 7.0.50),
+ dh-autoreconf,
autotools-dev,
cli-common-dev (>= 0.5.7),
intltool (>= 0.35),
lsb-release,
mono-devel (>= 2.4.3),
libboo-cil-dev (>= 0.8.1),
- libdbus1.0-cil-dev (>= 0.5),
- libdbus-glib1.0-cil-dev (>= 0.3),
+ libdbus1.0-cil-dev (>= 0.7),
+ libdbus-glib1.0-cil-dev (>= 0.5),
libmono-addins-cil-dev (>= 0.3.1),
libtaglib-cil-dev (>= 2.0.3.7),
libmono-zeroconf-cil-dev (>= 0.7.3),
libnotify-cil-dev,
- libglib2.0-cil-dev (>= 2.10),
+ libglib2.0-cil-dev (>= 2.12.10),
libgtk2.0-cil-dev (>= 2.12),
libgconf2.0-cil-dev,
libgudev1.0-cil-dev (>= 0.1) [linux-any],
@@@ -33,18 -34,19 +34,19 @@@
libsqlite3-dev (>= 3.4),
libmtp-dev (>= 0.3.0),
gconf2,
+ libgconf2-dev,
libglib2.0-dev,
libwnck-dev,
- libgtk2.0-dev (>= 2.8),
+ libgtk2.0-dev (>= 2.12.10),
# libclutter-1.0-dev (>= 1.0.1),
libx11-dev,
libxrandr-dev (>= 2:1.1.1),
libxxf86vm-dev (>= 1:1.0.1),
- libgstreamer0.10-dev (>= 0.10.23),
+ libgstreamer0.10-dev (>= 0.10.26),
libgstreamer-plugins-base0.10-dev (>= 0.10.26),
gnome-doc-utils (>= 0.17.3),
libgnome-desktop-dev
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
Homepage: http://www.banshee.fm
Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee.git
@@@ -65,9 -67,7 +67,9 @@@ Suggests: gstreamer0.10-plugins-bad
gstreamer0.10-plugins-ugly,
gstreamer0.10-ffmpeg,
banshee-dbg (=${binary:Version})
+Provides: banshee-api-${banshee:API},
+ banshee-asm-${banshee:ASM}
- Breaks: banshee-extensions-common (<< 1.6.1-2.)
+ Breaks: banshee-extensions-common (<< 2.0.1-2~)
Description: Media Management and Playback application
Banshee is a media management and playback application for the GNOME
desktop, allowing users to import audio from CDs, search their library,
diff --combined debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
index c73efab,c73efab..d931b9d
--- a/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
+++ b/debian/patches/0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
@@@ -8,11 -8,11 +8,11 @@@ This reverts commit 768c76da611a990054f
.../Banshee.Collection.Gui/ArtworkManager.cs | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
--diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
--index cba8ec8..2414ca1 100644
----- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
--+++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
--@@ -49,7 +49,6 @@ namespace Banshee.Collection.Gui
++Index: banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++===================================================================
++--- banshee.orig/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs 2011-07-25 14:18:38.960048322 +0100
+++++ banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs 2011-07-25 14:22:38.728100902 +0100
++@@ -50,7 +50,6 @@
{
private Dictionary<int, SurfaceCache> scale_caches = new Dictionary<int, SurfaceCache> ();
private HashSet<int> cacheable_cover_sizes = new HashSet<int> ();
@@@ -20,7 -20,7 +20,7 @@@
private class SurfaceCache : LruCache<string, Cairo.ImageSurface>
{
--@@ -117,13 +116,8 @@ namespace Banshee.Collection.Gui
++@@ -122,13 +121,8 @@
return surface;
}
@@@ -34,7 -34,7 +34,7 @@@
return null;
}
--@@ -163,17 +157,12 @@ namespace Banshee.Collection.Gui
++@@ -168,17 +162,12 @@
return null;
}
@@@ -52,7 -52,7 +52,7 @@@
return null;
}
}
--@@ -190,7 +179,6 @@ namespace Banshee.Collection.Gui
++@@ -195,7 +184,6 @@
Pixbuf pixbuf = new Pixbuf (unconverted_path);
if (pixbuf.Width < 50 || pixbuf.Height < 50) {
Hyena.Log.DebugFormat ("Ignoring cover art {0} because less than 50x50", unconverted_path);
@@@ -60,7 -60,7 +60,7 @@@
return null;
}
--@@ -231,7 +219,6 @@ namespace Banshee.Collection.Gui
++@@ -236,7 +224,6 @@
} catch {}
}
@@@ -68,7 -68,7 +68,7 @@@
return null;
}
--@@ -251,8 +238,6 @@ namespace Banshee.Collection.Gui
++@@ -256,8 +243,6 @@
scale_caches[size].Remove (id);
}
@@@ -77,6 -77,6 +77,3 @@@
if (inMemoryCacheOnly) {
return;
}
----
--1.7.1
--
diff --combined debian/rules
index 881fd66,3fb2e35..e1c793b
--- a/debian/rules
+++ b/debian/rules
@@@ -4,9 -4,6 +4,9 @@@ include /usr/share/cli-common/cli.mak
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+BANSHEE_API_VERSION = $(shell grep API_VERSION= configure | cut -f2 -d=)
+BANSHEE_ASM_VERSION = $(shell grep ASM_VERSION= configure | cut -f2 -d=)
+
CONFFLAGS = \
--disable-static \
--disable-tests \
@@@ -17,17 -14,20 +17,17 @@@
--enable-user-help \
--enable-docs \
--enable-youtube \
- --disable-hal \
--enable-gio \
--disable-moonlight \
--enable-gnome \
--enable-schemas-install \
--enable-mtp \
--enable-appledevice \
- --disable-ipod \
--enable-daap \
--disable-remote-audio \
--disable-torrent \
--enable-meego \
--enable-gapless-playback \
- --enable-podcast \
--enable-release \
--disable-shave \
MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
@@@ -71,6 -71,8 +71,8 @@@ override_dh_makeclilibs
override_dh_install:
# make sure we don't include a generated MIME database
find debian/tmp/usr/share/mime/ -mindepth 1 -maxdepth 1 -not -name packages -print0 | xargs -0 rm -rf
+ # strip la files
+ find debian/tmp -name '*.la' -delete
rm -f debian/tmp/usr/share/applications/mimeinfo.cache
dh_install
# Remove MeeGo stuff from banshee binary package
@@@ -90,11 -92,8 +92,13 @@@ ifeq ($(shell dpkg-vendor --query vendo
done
endif
+override_dh_gencontrol:
+ dh_gencontrol -- \
+ -V"banshee:API=$(BANSHEE_API_VERSION)" \
+ -V"banshee:ASM=$(BANSHEE_ASM_VERSION)"
+
+ override_dh_autoreconf:
+ NOCONFIGURE=1 dh_autoreconf --as-needed ./autogen.sh --
%:
- dh $@
+ dh $@ --with=autoreconf
--
banshee
More information about the Pkg-cli-apps-commits
mailing list