[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/2.2.0-1-95-g975b37e

Chow Loong Jin hyperair at ubuntu.com
Fri Sep 23 02:01:49 UTC 2011


The following commit has been merged in the ubuntu branch:
commit 69a4cb9d9178c890ae6ac239c6949444f7486c26
Merge: 909326559f9a1e5b0d07f9b2cf2839c287a3c2e8 f5124277a531af5e99e4ebd4c20276d78073cee4
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Sep 22 13:52:30 2011 +0800

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/gbp.conf

diff --combined debian/changelog
index e779e4b,dd0b995..bbc6eb2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,50 +1,57 @@@
+ banshee-community-extensions (2.2.0-1) unstable; urgency=low
+ 
+   * [4940fab] Imported Upstream version 2.2.0
+     + Notable bug fixes:
+       - Karaoke: Fix crash when switching to Now Playing
+       - Lyrics: Fix crash when switching to Now Playing
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 20 Sep 2011 18:45:46 +0800
+ 
+ banshee-community-extensions (2.1.4-1) experimental; urgency=low
+ 
+   * [233bb9c] Imported Upstream version 2.1.4
+     + Enhancements since 2.1.3:
+       - DuplicateSongDetector: Add toggling by activating row
+       - DuplicateSongDetector: Add a refresh and close button to the toolbar
+       - OpenVP: Add new "Spectrum Scan" and "Spectrum Rain" visualizations
+       - OpenVP: Make "Scaled Voiceprint" visualization look nicer (bgo#658304)
+     + Notable bugs fixed since 2.1.3:
+       - ClutterFlow: Fix crash when searching (bgo#658334)
+       - StreamRecorder: Fix files not being split by metadata
+         (bgo#656339, LP: #824393)
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 09 Sep 2011 09:38:07 +0800
+ 
+ banshee-community-extensions (2.1.3-1) experimental; urgency=low
+ 
+   * [7f6490e] Enable lirc package
+   * [11e79bc] Imported Upstream version 2.1.3
+     + New extensions:
+       - AlbumArtWriter: Write album art to the folder containing the music files
+       - DuplicateSongDetector: Detect and remove duplicate songs in your library
+     + Enhancements:
+       - Mirage: Re-enable rescan and reset methods (bgo#653826)
+       - OpenVP: Add a new "Scaled Voiceprint" visualization
+     + Notable bugs fixed:
+       - RandomByLastfm: Do not query Last.fm when offline (bgo#634785)
+       - LastfmFingerprint: Build only if enabled in the build (bgo#657013)
+   * [6cfc562] Add Album Art Writer and Duplicate Song Detection extensions
+   * [85d613c] Drop upstreamed patches
+   * [4c4630f] No change Standards-Version bump (3.9.1 → 3.9.1)
+   * [bc88cbf] Fix deletion of .la files
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 27 Aug 2011 22:45:56 +0800
+ 
 +banshee-community-extensions (2.1.1-2ubuntu1) oneiric; urgency=low
 +
 +  * [c0b3875] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Iain Lane <laney at ubuntu.com>  Sun, 26 Jun 2011 13:31:44 +0100
 +
  banshee-community-extensions (2.1.1-2) experimental; urgency=low
  
-   * No-change rebuild vs. new zeitgeist-sharp ABI 
+   * No-change rebuild vs. new zeitgeist-sharp ABI
  
   -- Iain Lane <laney at debian.org>  Fri, 17 Jun 2011 15:31:08 +0100
  
@@@ -44,24 -81,15 +88,22 @@@ banshee-community-extensions (2.1.1-1) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 14 Jun 2011 02:31:33 +0800
  
- banshee-community-extensions (2.0.1-2) UNRELEASED; urgency=low
+ banshee-community-extensions (2.0.1-2) unstable; urgency=low
  
-   * [ea79349] Build-dep on dbus# instead of ndesk-dbus
-   * [353fb83] Forward port to DBus#
-   * [98b5b34] Add autoreconf
-   * [a83884a] Bump build-dep on Banshee to 2.1.0
-   * [0f06608] Backport upstream patch to fix autoreconf
-   * [e1773a6] Use upstream autogen.sh with dh_autoreconf
+   * [09b59ed] Bump banshee build-dep for dbus#
+   * [e468baa] Cherry-pick port to DBus#
+   * [bf2d84e] Add autogen
+   * [7025c67] Change build-deps for dbus# port
  
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 28 May 2011 19:34:16 +0800
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 10 Jul 2011 10:08:08 +0100
  
 +banshee-community-extensions (2.0.1-1ubuntu1) oneiric; urgency=low
 +
 +  * [6a83a31] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 07 May 2011 17:12:01 +0800
 +
  banshee-community-extensions (2.0.1-1) unstable; urgency=low
  
    * [c02b8fd] Move over to bz2 in debian/watch
@@@ -84,28 -112,12 +126,28 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 05 May 2011 06:59:58 +0800
  
 +banshee-community-extensions (2.0.0-2ubuntu1) natty; urgency=low
 +
 +  * [4914145] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +  * [11e40ce] Drop explicit banshee depends from -lirc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:11:26 +0800
 +
  banshee-community-extensions (2.0.0-2) unstable; urgency=low
  
    * [44303f2] Add Enhances: banshee to b-c-e (LP: #758526)
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 27 Apr 2011 22:55:21 +0800
  
 +banshee-community-extensions (2.0.0-1ubuntu1) natty; urgency=low
 +
 +  * [36d8c92] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +  * [11e40ce] Drop explicit banshee depends from -lirc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:11:26 +0800
 +
  banshee-community-extensions (2.0.0-1) unstable; urgency=low
  
    * [b1cf183] New upstream release
@@@ -115,13 -127,6 +157,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:00:13 +0800
  
 +banshee-community-extensions (1.9.6-1ubuntu1) natty; urgency=low
 +
 +  * [ceb501c] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 22:21:22 +0800
 +
  banshee-community-extensions (1.9.6-1) unstable; urgency=low
  
    * [9bb7ba5] New upstream release:
@@@ -138,13 -143,6 +180,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 27 Mar 2011 04:32:23 +0800
  
 +banshee-community-extensions (1.9.5-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 22:21:22 +0800
 +
  banshee-community-extensions (1.9.5-1) unstable; urgency=low
  
    * [aea54e9] New upstream release:
@@@ -162,13 -160,6 +204,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 21:50:31 +0800
  
 +banshee-community-extensions (1.9.3-1ubuntu1) natty; urgency=low
 +
 +  * [a5570d7] Merge from Debian Experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 01 Mar 2011 01:54:03 +0800
 +
  banshee-community-extensions (1.9.3-1) unstable; urgency=low
  
    * [2d6dcff] New upstream release:
@@@ -189,13 -180,6 +231,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 20 Feb 2011 16:48:42 +0800
  
 +banshee-community-extensions (1.9.2-1ubuntu1) UNRELEASED; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 01:58:33 +0800
 +
  banshee-community-extensions (1.9.2-1) UNRELEASED; urgency=low
  
    * [280f6c6] Enable Clutterflow
@@@ -211,13 -195,6 +253,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 19 Jan 2011 22:03:57 +0800
  
 +banshee-community-extensions (1.9.1-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 26 Dec 2010 17:09:32 +0800
 +
  banshee-community-extensions (1.9.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
@@@ -263,22 -240,6 +305,22 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 26 Dec 2010 17:06:06 +0800
  
 +banshee-community-extensions (1.9.0-1ubuntu2) natty; urgency=low
 +
 +  * [5c94c08] Disable OpenVP extension temporarily.
 +  * [609c47e] Enable Ubuntu One Music Store by default
 +  * [6d26f8b] Fix build with new RandomBy APIs included in git snapshot
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 24 Nov 2010 14:59:52 +0000
 +
 +banshee-community-extensions (1.9.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:50:07 +0800
 +
  banshee-community-extensions (1.9.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -303,14 -264,6 +345,14 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 14:19:02 +0800
  
 +banshee-community-extensions (1.8.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 02 Oct 2010 16:40:06 +0800
 +
  banshee-community-extensions (1.8.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -321,13 -274,7 +363,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 12:34:03 +0800
  
 -banshee-community-extensions (1.7.6-1) UNRELEASED; urgency=low
 +banshee-community-extensions (1.7.6-0ubuntu2) maverick; urgency=low
 +
 +  * Correct typo in banshee-extension-soundmenu recommendation
 +
 + -- Emmet Hikory <persia at ubuntu.com>  Sun, 19 Sep 2010 12:01:03 +0900
 +
 +banshee-community-extensions (1.7.6-0ubuntu1) maverick; urgency=low
  
    * New upstream release
      + Enhancements:
@@@ -347,19 -294,6 +389,19 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 03:35:36 +0800
  
 +banshee-community-extensions (1.7.4-1ubuntu2) maverick; urgency=low
 +
 +  * No-change rebuild to pick up latest libindicate ABI. (LP: #636253)
 +
 + -- Iain Lane <laney at ubuntu.com>  Mon, 13 Sep 2010 23:14:59 +0100
 +
 +banshee-community-extensions (1.7.4-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from experimental, remaining changes:
 +    + Enable AppIndicator, Lirc, SoundMenu, and U1MS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 24 Aug 2010 22:02:51 +0800
 +
  banshee-community-extensions (1.7.4-1) experimental; urgency=low
  
    * New upstream release
@@@ -411,14 -345,6 +453,14 @@@ banshee-community-extensions (1.6.1-2) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Jul 2010 01:12:38 +0800
  
 +banshee-community-extensions (1.6.1-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    + Enable appindicator, lirc, and ubuntuonemusicstore extensions
 +  * Also fixes LP: #597283, which just require a rebuild of appindicator
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 23 Jun 2010 01:14:29 +0800
 +
  banshee-community-extensions (1.6.1-1) unstable; urgency=low
  
    * New upstream bugfix release:
@@@ -447,52 -373,6 +489,52 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 08 Jun 2010 13:45:22 +0800
  
 +banshee-community-extensions (1.6.0-1ubuntu5) lucid; urgency=low
 +
 +  * Add 0001-AppIndicator-Stopping-the-notifications-from-lagging.patch to
 +    fix notification lag with Notify OSD (LP: #566112)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Apr 2010 22:36:16 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu4) lucid; urgency=low
 +
 +  * debian/control:
 +    + Build-dep on libappindicator0.1-cil-dev instead, due to adding of
 +      the API version number into the name of the package (LP: #564506)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 17 Apr 2010 14:55:24 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu3) lucid; urgency=low
 +
 +  * debian/(control, rules):
 +    + Demote avant-window-navigator to suggests in banshee-extension-awn
 +    + Drop banshee-extension-telepathy; not installable due to dependency
 +      on telepathy-gabble >= 0.9 (LP: #559978)
 +    + Tighten build-dep on libappindicator-cil-dev due to missing clilibs
 +      in older versions (LP: #560095)
 +    + Drop indicator-applet and indicator-application from binary-deps of
 +      -appindicator
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Apr 2010 00:26:37 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu2) lucid; urgency=low
 +
 +  * debian/(control, rules, patches):
 +    + Quiltify package again
 +    + Add 0001-Use-banshee-panel-icon.patch which makes AppIndicator use
 +      the correct icon
 +    + Add 99_ignore-quilt.patch to add .pc to POTFILES.skip to fix FTBFS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 10 Apr 2010 02:05:28 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
 +
 +  * debian/(control, rules):
 +    + Enable AppIndicator, Lirc and U1MS extensions
 +  * Fixes needs-packaging bug (LP: #537691)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 04 Apr 2010 18:17:28 +0800
 +
  banshee-community-extensions (1.6.0-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/control
index 9c51214,4b13f01..b07b938
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,14 +1,15 @@@
  Source: banshee-community-extensions
  Section: sound
  Priority: optional
 -Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
+                dh-autoreconf,
+                libgconf2-dev,
                 cli-common-dev (>= 0.5.7),
                 mono-devel (>= 2.4.2.3),
                 autotools-dev,
-                dh-autoreconf,
-                libgconf2-dev,
                 lsb-release,
                 banshee (>= 2.1.0),
                 pkg-config,
@@@ -29,7 -28,6 +29,7 @@@
                 libdbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 +               libappindicator0.1-cil-dev,
                 libtaoframework-opengl-cil-dev (>= 2.1),
                 libtaoframework-freeglut-cil-dev,
                 libtaoframework-sdl-cil-dev (>= 1.2.13),
@@@ -38,7 -36,7 +38,7 @@@
                 libclutter-cil-dev,
                 libclutter-gtk-cil-dev,
                 libzeitgeist-cil-dev
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git
  Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee-community-extensions.git
  Homepage: http://gitorious.org/banshee-community-extensions
@@@ -47,11 -45,12 +47,13 @@@ Package: banshee-community-extension
  Architecture: all
  Enhances: banshee
  Recommends: banshee-extension-alarm (>= ${source:Version}),
+             banshee-extension-albumartwriter (>= ${source:Version}),
              banshee-extension-ampache (>= ${source:Version}),
 +            banshee-extension-appindicator (>= ${source:Version}),
              banshee-extension-awn (>= ${source:Version}),
              banshee-extension-coverwallpaper (>= ${source:Version}),
              banshee-extension-clutterflow (>= ${source:Version}),
+             banshee-extension-duplicatesongdetector (>= ${source:Version}),
              banshee-extension-jamendo (>= ${source:Version}),
              banshee-extension-lastfmfingerprint (>= ${source:Version}),
              banshee-extension-lcd (>= ${source:Version}),
@@@ -96,6 -95,17 +98,17 @@@ Description: Alarm extension for Banshe
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
+ Package: banshee-extension-albumartwriter
+ Enhances: banshee
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+          ${cli:Depends}, ${misc:Depends}
+ Description: Album art writer extension for Banshee
+  This package contains the Album Art Writer extension for Banshee which writes
+  album art from the cache to the folder containing the music files.
+  .
+  Banshee is a media management and playback application for the GNOME desktop.
+ 
  Package: banshee-extension-ampache
  Enhances: banshee
  Architecture: all
@@@ -108,17 -118,6 +121,17 @@@ Description: Ampache extension for Bans
   .
   Banshee is a media management and playback application for the GNOME desktop
  
 +Package: banshee-extension-appindicator
 +Architecture: all
 +Depends: banshee-extensions-common (= ${source:Version}),
 +         ${cli:Depends}, ${misc:Depends}
 +Description: Application Indicator extension for Banshee
 + This package provides integration for Banshee with Application Indicators,
 + which is a replacement for the notification area in Ubuntu, as a way to add
 + menus in the panel.
 + .
 + Banshee is a media management and playback application for the GNOME desktop.
 +
  Package: banshee-extension-awn
  Enhances: banshee
  Architecture: all
@@@ -152,6 -151,16 +165,16 @@@ Description: Cover wallpaper extension 
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
+ Package: banshee-extension-duplicatesongdetector
+ Architecture: all
+ Depends: banshee-extensions-common (= ${source:Version}),
+          ${cli:Depends}, ${misc:Depends}
+ Description: Duplicate song detector extension for Banshee
+  This package adds duplicate song detection to Banshee, allowing it to detect
+  and remove duplicate songs in your library.
+  .
+  Banshee is a media management and playback application for the GNOME desktop.
+ 
  Package: banshee-extension-jamendo
  Enhances: banshee
  Architecture: all
diff --combined debian/rules
index 31d650f,2e5fc15..37b9293
--- a/debian/rules
+++ b/debian/rules
@@@ -5,10 -5,6 +5,6 @@@ include /usr/share/cli-common/cli.mak
  
  BANSHEE_VERSION = $(shell pkg-config --modversion banshee-thickclient)
  
- override_dh_autoreconf:
- 	ln -s debian/autogen.sh
- 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
- 
  # disable zeitgeistdataprovider and lirc due to dependencies missing
  override_dh_auto_configure:
  	dh_auto_configure -- \
@@@ -16,11 -12,13 +12,13 @@@
  		--enable-gnome \
  		--enable-schemas-install \
  		--enable-alarmclock \
+ 		--enable-albumartwriter \
  		--enable-ampache \
 -		--disable-appindicator \
 +		--enable-appindicator \
  		--enable-awn \
  		--enable-clutterflow \
  		--enable-coverwallpaper \
+ 		--enable-duplicatesongdetector \
  		--enable-jamendo \
  		--enable-karaoke \
  		--enable-lastfmfingerprint \
@@@ -42,7 -40,7 +40,7 @@@
  
  override_dh_auto_install:
  	dh_auto_install
- 	find debian/tmp -name '*.la' -o -name '*.a' -delete
+ 	find debian/tmp \( -name '*.la' -o -name '*.a' \) -delete
  
  override_dh_gencontrol:
  	dh_gencontrol -- -Vbanshee:Version=$(BANSHEE_VERSION)
@@@ -50,10 -48,19 +48,19 @@@
  override_dh_makeclilibs:		# do nothing -- we do not want clilibs to come
                                  # from anything, and especially not clutterflow.
  
+ override_dh_autoreconf: autogen.sh
+ 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh --
+ 
+ autogen.sh: debian/autogen.sh
+ 	ln -s $< $@
+ 
+ clean:
+ 	rm -f autogen.sh
+ 
  override_dh_clideps:
  	dh_clideps \
  		--exclude-moduleref=libgdk-win32-2.0-0.dll \
  		--exclude-moduleref=glibsharpglue-2
  
  %:
- 	dh --with=autoreconf $@
+ 	dh $@ --with=autoreconf

-- 
banshee-community-extensions



More information about the Pkg-cli-apps-commits mailing list