[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/intrepid, updated. ppa/1.5.3-0ubuntu1.hyper1.intrepid-14-g031c3a7

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit 031c3a7987ee3990a91dc51a89d9c3805f7f22b8
Merge: cfbf960926b2ad212fb130bc895b25c113c6a166 e2401a434971fdcca8ac12a97768a0c28b451fb5
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sun Feb 28 07:44:19 2010 +0800

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

diff --combined debian/changelog
index 6fdbc21,46968ba..20ca817
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,3 +1,12 @@@
 +banshee (1.5.4-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>  Sun, 28 Feb 2010 07:32:20 +0800
 +
  banshee (1.5.4-1~hyper1~jaunty) jaunty; urgency=low
  
    * Merge from Karmic, remaining changes:
@@@ -14,11 -5,12 +14,12 @@@
        - libgconf2.0-cil -> libgconf2.24-cil
        - Lower mono-devel version
        - Disable clutter support (dependencies not satisfiable)
+       - Re-add libgnome2.24-cil, mono-addins-gui needs it
      + debian/rules:
        - Revert to using csc instead of mono-csc
        - --disable-clutter
  
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 28 Feb 2010 07:27:26 +0800
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 28 Feb 2010 07:35:46 +0800
  
  banshee (1.5.4-1~hyper1~karmic) karmic; urgency=low
  
@@@ -79,15 -71,6 +80,15 @@@ banshee (1.5.4-1) UNRELEASED; urgency=l
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 26 Feb 2010 01:23:59 +0800
  
 +banshee (1.5.3-0ubuntu1~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, 29 Jan 2010 03:08:40 +0800
 +
  banshee (1.5.3-0ubuntu1~hyper1~jaunty) jaunty; urgency=low
  
    * Merge from Karmic, remaining changes:
@@@ -224,15 -207,6 +225,15 @@@ banshee (1.5.2-1) unstable; urgency=lo
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 21 Jan 2010 13:19:04 +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:
@@@ -469,14 -443,6 +470,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:
@@@ -488,12 -454,6 +489,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 d447051,4d702fd..8871d85
--- 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,
@@@ -22,7 -21,8 +22,8 @@@
                 libnotify0.4-cil,
                 libglib2.0-cil (>= 2.10),
                 libgtk2.0-cil (>= 2.12),
 -               libgconf2.24-cil,
 -               libgnome2.24-cil,
 +               libgconf2.0-cil (>= 2.10),
++               libgnome2.0-cil,
                 libipod-cil-dev (>= 0.8.5),
                 libipodui-cil-dev (>= 0.8.5),
                 libkarma-cil (>= 0.0.5),

-- 
banshee