[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. debian/1.5.1-1-31-gec20464

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit ec2046481a5664005c46ae166b2b59f3cc30aafc
Merge: cf8d8b1c6d1f63a3ca78da7d6e12071aff463577 1bf4779de6005abc95a2b8c2d4ab308b7ded5394
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Dec 4 15:24:58 2009 +0800

    Merge branch 'ppa/jaunty' into ppa/intrepid
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 6d96c1f,3215db0..b9da612
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,71 +1,89 @@@
++banshee (1.5.2-1~hyper1~intrepid) intrepid; urgency=low
++
++  * Merge from Jaunty, remaining changes:
++    + debian/control:
++      - Revert GNOME# 2.24 changes
++      - Revert Mono 2 transition
++
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 04 Dec 2009 15:24:10 +0800
++
+ banshee (1.5.2-1~hyper1~jaunty) jaunty; urgency=low
+ 
+   * Merge from Karmic, remaining changes:
+     + debian/control:
+       - libgconf2.0-cil -> libgconf2.24-cil
+       - Lower mono-devel version
+       - Disable clutter support (dependencies not satisfiable)
+     + debian/rules:
+       - Revert to using csc instead of mono-csc
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 04 Dec 2009 15:01:20 +0800
+ 
+ banshee (1.5.2-1~hyper1~karmic) karmic; urgency=low
+ 
+   * No change upload to PPA
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Dec 2009 23:16:11 +0800
+ 
+ banshee (1.5.2-1) UNRELEASED; urgency=low
+ 
+   * New upstream release (Closes: #558611)
+     + New Features:
+       - The Internet Archive extension
+       - The iTunes importer
+       - Metadata ratings and playcount import and export
+       - Add support for Pulse and Droid phones
+       - Use new Last.fm API (Closes: #548029, LP: #415937)
+ 
+     + Enhancements:
+       - Many accessibility enhancements
+       - When sorting by score also sort by playcount (bgo#598431)
+       - Add WICD support (bgo#596918)
+       - Add the USB id for the Palm Pre in developer mode
+       - Improve the import media dialog (bgo#559013)
+       - Allow seeking in DAAP streams
+       - Tooltip for the AutoDJ source combobox (bgo#598504)
+       - Improve recognition of Android devices
+       - Recognize Samsung Galaxy device in debug mode
+       - PlaybackError query field (bgo#590946)
+       - Additional tokens for file system organization (bgo#489861)
+       - Remember direction when sorting the list view (bgo#590869)
+       - Cleaner track change notification popup (LP: #445965)
+       - Move Last.fm settings to the preferences dialog
+       - Double click toggles fullscreen in Now Playing (bgo#577971)
+ 
+     + Notable bug fixes:
+       - Fix the playcount update (LP: #388360)
+       - Correct default button in message dialogs (bgo#599495)
+       - Hide shuffle menu when shuffling is disabled (bgo#599465)
+       - Fix bug with AutoDJ updating LastPlayed erroneously (bgo#594701)
+       - Fix next playback source (bgo#599834)
+       - Fix adding tracks to the play queue (LP: #469134)
+       - Fix up iPod podcast support (bgo#434237)
+       - Fix cover art pick up for multi-disc albums (bgo#591982)
+       - Fix the play queue when StopWhenFinished is on (bgo#563021)
+       - Fix race when saving track metadata (bgo#598321)
+ 
+     + Other bug fixes:
+       - Fix System.DivideByZeroException when rescanning (LP: #452366)
+ 
+   * debian/control:
+     + Bump libipod{,ui}-cil dependency versions to 0.8.5
+     + Build-depend on -dev packages for libipod{,ui}-cil
+   * debian/patches/01_fix-ipod-sharp-ftbfs:
+     + Dropped, applied upstream
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 03 Dec 2009 00:40:41 +0800
+ 
 +banshee (1.5.1-1~hyper1~intrepid) intrepid; urgency=low
 +
 +  * Merge from Jaunty, remaining changes:
 +    + debian/control:
 +      - Revert GNOME# 2.24 changes
 +      - Revert Mono 2 transition
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Oct 2009 10:21:18 +0800
 +
  banshee (1.5.1-1~hyper1~jaunty) jaunty; urgency=low
  
    * Merge from Karmic, remaining changes:
@@@ -243,14 -302,6 +320,14 @@@ banshee (1.4.3-5) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at gmail.com>  Mon, 25 May 2009 20:02:35 +0800
  
 +banshee (1.4.3-4~hyper1+intrepid1) intrepid; urgency=low
 +
 +  * Merge from Jaunty, remaining changes:
 +    + debian/control:
 +      - GNOME# 2.24
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Tue, 21 Apr 2009 19:11:52 +0800
 +
  banshee (1.4.3-4) unstable; urgency=low
  
    * debian/control:
@@@ -262,12 -313,6 +339,12 @@@
      + Bump Standards-Version
  
   -- Chow Loong Jin <hyperair at gmail.com>  Thu, 16 Apr 2009 18:26:25 +0800
 +banshee (1.4.3-3~hyper1+intrepid1) intrepid; urgency=low
 +
 +  * Merge from Debian, remaining changes:
 +    + Revert Mono 2.0 transition
 +
 + -- Chow Loong Jin <hyperair at gmail.com>  Sun, 22 Mar 2009 13:37:56 +0800
  
  banshee (1.4.3-3) unstable; urgency=low
  
diff --combined debian/control
index be0b11e,c246426..d3a43ca
--- a/debian/control
+++ b/debian/control
@@@ -9,8 -9,7 +9,8 @@@ Build-Depends: debhelper (>= 7.0.50)
                 cli-common-dev (>= 0.5.7),
                 intltool (>= 0.35),
                 lsb-release,
 -               mono-devel (>= 2.0.1),
 +               mono-gmcs | c-sharp-2.0-compiler,
 +               libmono-dev (>= 1.9.1),
                 boo (>= 0.8.1),
                 libmono-cairo2.0-cil,
                 libmono-sqlite2.0-cil,
@@@ -23,10 -22,10 +23,10 @@@
                 libglib2.0-cil (>= 2.10),
                 libgtk2.0-cil (>= 2.12),
                 libglade2.0-cil (>= 2.10),
 -               libgconf2.24-cil,
 -               libgnome2.24-cil,
 +               libgconf2.0-cil (>= 2.10),
 +               libgnome2.0-cil (>= 2.10),
-                libipod-cil (>= 0.8.2),
-                libipodui-cil (>= 0.8.2),
+                libipod-cil-dev (>= 0.8.5),
+                libipodui-cil-dev (>= 0.8.5),
                 libkarma-cil (>= 0.0.5),
                 monodoc-base (>= 1.1.9),
                 libsqlite3-dev (>= 3.4),

-- 
banshee