[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/intrepid, updated. ppa/1.5.4-1.hyper1.intrepid-7-g96ac75f

[Chow Loong Jin]

The following commit has been merged in the ppa/intrepid branch:
commit 96ac75fcf65b33cae3559202ec571a9ba4ab2a98
Merge: 6c192956f902138d54e356c5d93be0dd57ce0c92 265037af855ac1e0fe491ee83b53a9f6f8a44d05
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Wed Mar 3 01:24:34 2010 +0800

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

diff --combined debian/changelog
index 55cbcc8,607bce3..e800559
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,21 +1,45 @@@
++banshee-community-extensions (1.5.4-1~hyper2~intrepid) intrepid; urgency=low
++
++  * Merge from jaunty, remaining changes:
++    + debian/control:
++      - Use mono-gmcs | c-sharp-2.0-compiler instead of mono-devel
++      - Add libmono-dev (>= 1.9.1) build-dep
++      - Use libgconf2.0-cil instead of libgconf2.24-cil
++    + debian/rules:
++      - Drop MCS override
++
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 03 Mar 2010 01:24:24 +0800
++
+ banshee-community-extensions (1.5.4-1~hyper2~jaunty) jaunty; urgency=low
+ 
+   * Merge from karmic, remaining changes:
+     + debian/{control,rules}
+       - Use mono-devel 2.0.1 and /usr/bin/csc
+       - libgconf2.0-cil => libgconf2.24-cil
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 03 Mar 2010 01:18:30 +0800
+ 
+ banshee-community-extensions (1.5.4-1~hyper2~karmic) karmic; urgency=low
+ 
+   * debian/control:
+     + Shift awn dependency to banshee-extension-awn
+   * debian/patches/01_random-by-similar.patch:
+     + Fix crash with random-by-similar
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 03 Mar 2010 00:53:41 +0800
+ 
 +banshee-community-extensions (1.5.4-1~hyper1~intrepid) intrepid; urgency=low
 +
 +  * Backport to intrepid, changes:
 +    + debian/control:
 +      - Use mono-gmcs | c-sharp-2.0-compiler instead of mono-devel
 +      - Add libmono-dev (>= 1.9.1) build-dep
 +      - Use libgconf2.0-cil instead of libgconf2.24-cil
 +    + debian/rules:
 +      - Drop MCS override
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 28 Feb 2010 18:38:10 +0800
 +
  banshee-community-extensions (1.5.4-1~hyper1~jaunty) jaunty; urgency=low
  
    * Backport to jaunty, changes:
diff --combined debian/control
index 4909ebc,02842b5..c5c7200
--- a/debian/control
+++ b/debian/control
@@@ -5,8 -5,8 +5,9 @@@ Maintainer: Debian CLI Applications Tea
  Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 cli-common-dev (>= 0.5.7),
 -               mono-devel (>= 2.0.1),
 +               mono-gmcs | c-sharp-2.0-compiler,
 +               libmono-dev (>= 1.9.1),
+                quilt (>= 0.46-7~),
                 autotools-dev,
                 banshee (>= 1.5.4),
                 pkg-config,
@@@ -19,7 -19,7 +20,7 @@@
                 libsamplerate0-dev,
                 intltool (>= 0.35),
                 libwebkit1.0-cil,
 -               libgconf2.24-cil,
 +               libgconf2.0-cil,
                 libglib2.0-cil,
                 libgtk2.0-cil,
                 libtaglib-cil-dev,
@@@ -59,7 -59,6 +60,6 @@@ Package: banshee-extension-alar
  Architecture: all
  Depends: banshee (>= ${banshee:Version}),
           banshee-extensions-common (= ${source:Version}),
-          avant-window-navigator,
           ${cli:Depends}, ${misc:Depends}
  Description: Alarm extension for Banshee
   Banshee Alarm Extension is an extension for Banshee which allows alarms to be
@@@ -74,6 -73,7 +74,7 @@@
  Package: banshee-extension-awn
  Architecture: all
  Depends: banshee (>= ${banshee:Version}),
+          avant-window-navigator,
           banshee-extensions-common (= ${source:Version}),
           ${cli:Depends}, ${misc:Depends}
  Description: AWN integration extension for Banshee
diff --combined debian/rules
index 1c2d66c,c4034b8..ca52097
--- a/debian/rules
+++ b/debian/rules
@@@ -21,7 -21,8 +21,7 @@@ override_dh_auto_configure
  		--disable-liveradio \
  		--enable-mirage \
  		--enable-radiostationfetcher \
 -		--enable-streamrecorder \
 -		MCS=/usr/bin/csc
 +		--enable-streamrecorder
  
  override_dh_gencontrol:
  	for pkg in `sed -n 's/^Package: //p' debian/control`; do \
@@@ -30,4 -31,4 +30,4 @@@
  	dh_gencontrol
  
  %:
- 	dh $@
+ 	dh --with=quilt $@

-- 
banshee-community-extensions