[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/natty, updated. debian/2.2.0-1ubuntu2-52-gb0a4066

[Chow Loong Jin]

The following commit has been merged in the ppa/natty branch:
commit e905e928f554bf549623253f38f5b5d9ab56ff60
Merge: 33b3a4c98f2eb1f63b5179391986655cc6a4c199 729087eb21ea05c7b62e2ccc62bcabbe688a9eae
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Sep 27 05:34:42 2011 +0800

    Merge branch 'ppa/oneiric' into ppa/natty
    
    Conflicts:
    	debian/gbp.conf

diff --combined debian/changelog
index 3609f1f,b2d3ee6..e9c777f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,74 +1,80 @@@
+ banshee (2.2.0-1ubuntu2~hyper1+oneiric) oneiric; urgency=low
+ 
+   * Merge from Ubuntu Oneiric, remaining changes:
+     + Re-enable boo and karma
+     + Drop amazon URL patch
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 27 Sep 2011 00:25:31 +0800
+ 
+ banshee (2.2.0-1ubuntu2) oneiric; urgency=low
+ 
+   * [cd59790] Backport patch to add U1MS URI support (LP: #856542)
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Sep 2011 12:03:29 +0800
+ 
+ banshee (2.2.0-1ubuntu1) oneiric; urgency=low
+ 
+   * Merge from Debian Experimental, remaining changes:
+     + Enable SoundMenu and Disable NotificationArea by default
+     + Disable boo and karma extensions
+     + Enable and recommnd u1ms and soundmenu extensions
+     + Move desktop file for Meego UI to /usr/share/une/applications
+     + Change the url for the Amazon store redirector
+     + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 21 Sep 2011 13:54:50 +0800
+ 
+ banshee (2.2.0-1) unstable; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * [197bbe7] Imported Upstream version 2.2.0:
+     + Notable bug fixes:
+       - Bookmark: Fix loading of bookmarks so that playing starts
+       - bgo#658509: PodcastService: Update podcast storage location immediately
+         (LP: #844279)
+       - bgo#657565: TrackActions: Make sure keyboard accelerators are editable
+         (LP: #836136)
+       - bgo#658110: Playlists: Replace DOS folder separators in URLs
+ 
+   [ Iain Lane ]
+   * [406b1c9] Fix randomly inserted characters in d/copyright (♥ Lintian)
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 20 Sep 2011 14:15:54 +0800
+ 
+ banshee (2.1.4-1ubuntu1) oneiric; urgency=low
+ 
+   * Merge from Debian Experimental, remaining changes:
+     + Enable SoundMenu and Disable NotificationArea by default
+     + Disable boo and karma extensions
+     + Enable and recommnd u1ms and soundmenu extensions
+     + Move desktop file for Meego UI to /usr/share/une/applications
+     + Change the url for the Amazon store redirector
+   * [5ba1472] Move banshee-extension-ubuntuonemusicstore to Suggests.
+     Thanks to Rodney Dawes <rodney.dawes at ubuntu.com> (LP: #833824)
+   * [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Sep 2011 02:37:59 +0800
+ 
+ banshee (2.1.4-1) experimental; urgency=low
+ 
+   * [9c90bff] Imported Upstream version 2.1.4
+     + Notable Bugs Fixed (11 fixed since 2.1.3):
+       - bgo#601554: Don't resolve external references when parsing bad RSS feeds
+       - bgo#633939: Fix crash in SearchEntry.FilterMenuItem
+       - bgo#647917: Dap.MassStorage: decode URI before using it as playlist name
+       - bgo#650325: MtpSource: Remove obsolete URL from error message
+       - bgo#657479: Make sure empty default smart playlists are hidden
+       - libbanshee: Fix crash on g_free when looking for subtitle description
+   * [889b204] Fix invalid cast causing ftbfs with libgpod
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 08 Sep 2011 10:02:04 +0800
+ 
 +banshee (2.1.3-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 30 Aug 2011 02:07:42 +0800
 +
  banshee (2.1.3-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * Merge from Ubuntu Oneiric, remaining changes:
@@@ -114,12 -179,6 +185,12 @@@ banshee (2.1.0-1ubuntu1~hyper1+oneiric
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:29:16 +0800
  
 +banshee (2.1.0-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * Backport to Natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:34:56 +0800
 +
  banshee (2.1.0-1) experimental; urgency=low
  
    * [6b1b0d2] New upstream release:
@@@ -162,6 -221,13 +233,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 14 May 2011 22:06:44 +0800
  
+ banshee (2.0.1-4) unstable; urgency=low
+ 
+   * [d747605] Update webkit build-dep for webkit 1.3 transition
+     (Closes: #635402)
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 01 Aug 2011 16:44:53 +0800
+ 
  banshee (2.0.1-3) unstable; urgency=low
  
    * [66e797e] Fix Breaks version on banshee-community-extensions.
@@@ -187,18 -253,6 +265,18 @@@ banshee (2.0.1-2) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 10 Jul 2011 09:57:33 +0100
  
 +banshee (2.0.1-1ubuntu1~hyper1+natty1) natty; urgency=low
 +
 +  * Rebuild against new libgpod
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 04 Jul 2011 04:26:57 +0800
 +
 +banshee (2.0.1-1ubuntu1~hyper1+natty) natty; urgency=low
 +
 +  * No change backport to Natty
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 06 May 2011 18:45:28 +0800
 +
  banshee (2.0.1-1ubuntu1~hyper1+oneiric) oneiric; urgency=low
  
    * [b0e67d0] Merge from Ubuntu Oneiric:

-- 
banshee