[Pkg-cli-apps-commits] [SCM] banshee-extension-mirage branch, ppa/intrepid, updated. debian/0.5.0-3-15-gd3181f3

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit 12b4f5f7171f30dfae39bdf6bf1bf3746c489f7d
Merge: ba26631c75f81fabc36db7ba03d8ce90edb808da 0e0d9dda859662d4d7a5491d366d682c617449e3
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Jan 29 22:27:48 2010 +0800

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

diff --combined debian/changelog
index 291aa82,110cd6e..c56a715
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,50 @@@
- banshee-extension-mirage (0.5.0-2~hyper1+intrepid1) intrepid; urgency=low
++banshee-extension-mirage (0.5.0-4~hyper1~intrepid) intrepid; urgency=low
 +
 +  * debian/rules, debian/control:
 +    + Revert Mono 2.0 transition
 +
-  -- Chow Loong Jin <hyperair at gmail.com>  Sun, 22 Mar 2009 15:02:32 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 22:27:20 +0800
++
+ banshee-extension-mirage (0.5.0-4~hyper1~jaunty) jaunty; urgency=low
+ 
+   * debian/control:
+     + GNOME# 2.24 (messed up gconf-sharp naming)
+     + Lower mono-devel to 2.0.1
+   * debian/rules:
+     + Use MCS=csc instead of mono-csc
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 21:17:15 +0800
+ 
+ banshee-extension-mirage (0.5.0-4~hyper1~karmic) karmic; urgency=low
+ 
+   * Backport to Karmic PPA:
+     + debian/control: Revert all -cil-dev
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 18:28:38 +0800
+ 
+ banshee-extension-mirage (0.5.0-4) UNRELEASED; urgency=low
+ 
+   * debian/patches/03_fix-banshee-1.5.3.patch:
+     + Fix compilation with Banshee 1.5.3
+   * debian/control:
+     + Lower mono-devel requirement to 2.4.2.3 -- mono-csc was introduced then
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 29 Jan 2010 18:48:49 +0800
+ 
+ banshee-extension-mirage (0.5.0-3) unstable; urgency=low
+ 
+   [ Chow Loong Jin ]
+   * debian/control:
+     + Vcs-* updated to reflect migration to git
+     + Bump Standards-Version to 3.8.3
+ 
+   [ Jo Shields ]
+   * debian/control,
+     debian/rules:
+     + Use mono-csc from mono-devel 2.4.3 as compiler (Closes: #562274)
+     + Update build-deps to prevent FTBFS (Closes: #566204)
+ 
+  -- Jo Shields <directhex at apebox.org>  Mon, 25 Jan 2010 11:36:43 +0000
  
  banshee-extension-mirage (0.5.0-2) unstable; urgency=low
  
diff --combined debian/control
index 95a3d01,da1bf79..3384480
--- a/debian/control
+++ b/debian/control
@@@ -2,25 -2,31 +2,31 @@@ Source: banshee-extension-mirag
  Section: sound
  Priority: optional
  Maintainer: Sebastian Dröge <slomo at debian.org>
- Build-Depends: cdbs, 
+ Build-Depends: cdbs,
                 debhelper (>= 5),
                 cli-common-dev (>= 0.4.4),
-                autotools-dev, 
-                banshee (>= 1.4.1),
+                autotools-dev,
 -               mono-devel (>= 2.0.1),
 +               mono-gmcs | c-sharp-2.0-compiler,
                 libglib2.0-dev,
                 libfftw3-dev,
                 libsqlite3-dev (>= 3.3),
                 libgstreamer0.10-dev (>= 0.10.15),
                 libgstreamer-plugins-base0.10-dev (>= 0.10.3),
                 libsamplerate0-dev,
-                libgtk2.0-cil (>= 2.10),
-                libgconf2.0-cil,
-                intltool (>= 0.35)
- Standards-Version: 3.8.0
+                intltool (>= 0.35),
+                banshee (>= 1.4.1),
+                libwebkit1.0-cil,
+                libgconf2.24-cil,
+                libglib2.0-cil,
+                libgtk2.0-cil,
+                libtaglib2.0-cil,
+                libndesk-dbus-glib1.0-cil,
+                libndesk-dbus1.0-cil,
+                libmono-addins0.2-cil
+ Standards-Version: 3.8.3
  Homepage: http://hop.at/mirage/
- Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/banshee-extension-mirage/trunk/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/banshee-extension-mirage/trunk/
+ Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-extension-mirage.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/banshee-extension-mirage.git
  
  Package: banshee-extension-mirage
  Architecture: any

-- 
banshee-extension-mirage