[Pkg-cli-apps-commits] [SCM] banshee branch, ppa/unstable/karmic, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu5-151-g0e266cc

[Chow Loong Jin]

The following commit has been merged in the ppa/unstable/karmic branch:
commit 0e266ccbe79fe864f589cc95da5a8516f30bbf20
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Dec 25 01:31:45 2010 +0800

    Merge from Lucid, remaining changes:
    
    * Merge from Lucid, remaining changes:
      + debian/control:
        - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
          gio#, gtk#beans, and libgpod which were backported)
        - Use mono-devel 2.4.2.3
        - Revert gst-plugins-base-dev version bump
        - Drop UbuntuOne
      + debian/patches/02_bundle-inotifywatcher.patch:
        - Revert the InotifyWatcher removal commit from upstream and
          force-enable LibraryWatcher
      + debian/rules:
        - Disable gapless (gstreamer not new enough)
        - Drop UbuntuOne

diff --git a/debian/changelog b/debian/changelog
index 740d9fd..2399e5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+banshee (1.9.1-1ubuntu1~hyper1+karmic) karmic; urgency=low
+
+  * Merge from Lucid, remaining changes:
+    + debian/control:
+      - Revert -cil-dev transition (except taglib#, gudev#, gkeyfile#,
+        gio#, gtk#beans, and libgpod which were backported)
+      - Use mono-devel 2.4.2.3
+      - Revert gst-plugins-base-dev version bump
+      - Drop UbuntuOne
+    + debian/patches/02_bundle-inotifywatcher.patch:
+      - Revert the InotifyWatcher removal commit from upstream and
+        force-enable LibraryWatcher
+    + debian/rules:
+      - Disable gapless (gstreamer not new enough)
+      - Drop UbuntuOne
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 25 Dec 2010 01:30:16 +0800
+
 banshee (1.9.1-1ubuntu1~hyper1+lucid) lucid; urgency=low
 
   * Merge from Maverick, remaining changes:
diff --git a/debian/rules b/debian/rules
index a393621..57e3324 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,6 @@ override_dh_install:
 	      debian/banshee/usr/lib/banshee-1/MeeGo.exe \
 	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
-	# Remove U1MS and Sound Menu stuff from banshee
-	rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	cd po; intltool-update --pot
 

-- 
banshee