[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ppa/unstable/karmic, updated. ppa/1.7.4-1ubuntu1.hyper1+karmic-20-geff6294

Chow Loong Jin hyperair at ubuntu.com
Mon Sep 20 04:12:02 UTC 2010


The following commit has been merged in the ppa/unstable/karmic branch:
commit acd9c421840de1403013c25bb2594068748ba030
Merge: 5752ab7e9c52a7d5110d16e3a0fc6fc170e4cd51 f5f1a6d36d5e4a89be0e5c4226a6562f407790b4
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Mon Sep 20 04:48:35 2010 +0800

    Merge branch 'ppa/unstable/lucid' into ppa/unstable/karmic
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 6233946,cc6a9b2..6944eca
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,41 +1,50 @@@
+ banshee-community-extensions (1.7.6-0ubuntu2~hyper1+lucid) lucid; urgency=low
+ 
+   * No change backport to Lucid
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 20 Sep 2010 04:36:50 +0800
+ 
+ banshee-community-extensions (1.7.6-0ubuntu2) maverick; urgency=low
+ 
+   * Correct typo in banshee-extension-soundmenu recommendation
+ 
+  -- Emmet Hikory <persia at ubuntu.com>  Sun, 19 Sep 2010 12:01:03 +0900
+ 
+ banshee-community-extensions (1.7.6-0ubuntu1) maverick; urgency=low
+ 
+   * New upstream release
+     + Enhancements:
+       - [Lyrics] Add a Copy button to the lyrics window
+       - [Lyrics] Fix up the label in LyricsPane
+       - [Lyrics] Use Banshee.WebBrowser instead of webkit-sharp
+     + Bugs Fixed:
+       - [build] Bring gnome-doc-utils autofoo into the tree
+       - [Lyrics] Detect a false positive from lyricsplugin.com
+       - [Lyrics] Fixed LyricsWiki source
+       - [U1MS] Set a TypeUniqueId for the source (bgo#626965)
+   * Change section from gnome to sound
+   * Imported Upstream version 1.7.6
+   * Drop webkit# build-dep
+   * Bump Banshee build-dep version and loosen binary-dep version
+   * Switch banshee dep with banshee-extensions-common in metapackage
+ 
+  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 18 Sep 2010 03:35:36 +0800
+ 
+ banshee-community-extensions (1.7.4-1ubuntu2) maverick; urgency=low
+ 
+   * No-change rebuild to pick up latest libindicate ABI. (LP: #636253)
+ 
+  -- Iain Lane <laney at ubuntu.com>  Mon, 13 Sep 2010 23:14:59 +0100
+ 
 +banshee-community-extensions (1.7.4-1ubuntu1~hyper1+karmic) karmic; urgency=low
 +
 +  * Backport to Karmic
 +  * Set debian-branch to ppa/unstable/karmic
 +  * Use -cil instead of -cil-dev
 +  * Use csc instead of mono-csc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 13 Sep 2010 04:21:34 +0800
 +
  banshee-community-extensions (1.7.4-1ubuntu1~hyper1+lucid) lucid; urgency=low
  
    * Backport to Lucid
@@@ -23,7 -52,7 +61,7 @@@ banshee-community-extensions (1.7.4-1ub
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 24 Aug 2010 22:02:51 +0800
  
- banshee-community-extensions (1.7.4-1) UNRELEASED; urgency=low
+ banshee-community-extensions (1.7.4-1) experimental; urgency=low
  
    * New upstream release
      + New extensions:
diff --combined debian/control
index 0a3693e,510e75b..26984b2
--- a/debian/control
+++ b/debian/control
@@@ -1,14 -1,15 +1,15 @@@
  Source: banshee-community-extensions
- Section: gnome
+ Section: sound
  Priority: optional
- Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+ Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+ XSBC-Original-Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
  Uploaders: Chow Loong Jin <hyperair at ubuntu.com>
  Build-Depends: debhelper (>= 7.0.50),
                 cli-common-dev (>= 0.5.7),
                 mono-devel (>= 2.4.2.3),
                 autotools-dev,
                 lsb-release,
-                banshee (>= 1.7.4),
+                banshee (>= 1.7.6),
                 pkg-config,
                 liblircclient-dev (>= 0.8.6),
                 libglib2.0-dev,
@@@ -18,18 -19,19 +19,17 @@@
                 libgstreamer-plugins-base0.10-dev (>= 0.10.15),
                 libsamplerate0-dev,
                 intltool (>= 0.35),
-                libwebkit1.0-cil (>= 0.2),
 -               libgconf2.0-cil-dev,
 -               libglib2.0-cil-dev,
 -               libgtk2.0-cil-dev,
 +               libgconf2.0-cil,
 +               libglib2.0-cil,
 +               libgtk2.0-cil,
                 libtaglib-cil-dev,
 -               libndesk-dbus-glib1.0-cil-dev,
 -               libndesk-dbus1.0-cil-dev,
 -               libmono-addins-cil-dev,
 -               libnotify-cil-dev,
 -               libappindicator0.1-cil-dev,
 -               libubuntuone1.0-cil-dev,
 -               libtaoframework-opengl-cil-dev (>= 2.1),
 -               libtaoframework-freeglut-cil-dev,
 -               libtaoframework-sdl-cil-dev (>= 1.2.13),
 +               libndesk-dbus-glib1.0-cil,
 +               libndesk-dbus1.0-cil,
 +               libmono-addins0.2-cil,
 +               libnotify0.4-cil,
 +               libtaoframework-opengl3.0-cil (>= 2.1),
 +               libtaoframework-freeglut2.4-cil,
 +               libtaoframework-sdl1.2-cil (>= 1.2.13),
                 mono-jay,
                 gnome-doc-utils (>= 0.17.3),
  Standards-Version: 3.9.1
@@@ -40,6 -42,7 +40,6 @@@ Homepage: http://gitorious.org/banshee-
  Package: banshee-community-extensions
  Architecture: all
  Recommends: banshee-extension-alarm (>= ${source:Version}),
 -         banshee-extension-appindicator (>= ${source:Version}),
           banshee-extension-awn (>= ${source:Version}),
           banshee-extension-coverwallpaper (>= ${source:Version}),
           banshee-extension-lcd (>= ${source:Version}),
@@@ -52,7 -55,8 +52,7 @@@
           banshee-extension-radiostationfetcher (>= ${source:Version}),
           banshee-extension-streamrecorder (>= ${source:Version}),
           banshee-extension-telepathy (>= ${source:Version}),
- Depends: banshee (>= ${banshee:Version}),
 -         banshee-extension-ubuntuonemusicstore (>= ${source:Version}),
+ Depends: banshee-extensions-common (= ${source:Version}),
           ${misc:Depends}
  Description: set of community contributed extensions for Banshee
   This package is a metapackage which depends on the current versions of all the
@@@ -61,7 -65,6 +61,6 @@@
  Package: banshee-extensions-common
  Architecture: all
  Depends: banshee (>= ${banshee:Version}),
-          banshee (<< ${banshee:Version}.),
           ${misc:Depends}
  Description: common files for banshee-community-extensions
   This package contains the common files for all the extensions in the Banshee
@@@ -82,6 -85,17 +81,6 @@@ Description: Alarm extension for Banshe
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
 -Package: banshee-extension-appindicator
 -Architecture: all
 -Depends: banshee-extensions-common (= ${source:Version}),
 -         ${cli:Depends}, ${misc:Depends}
 -Description: Application Indicator extension for Banshee
 - This package provides integration for Banshee with Application Indicators,
 - which is a replacement for the notification area in Ubuntu, as a way to add
 - menus in the panel.
 - .
 - Banshee is a media management and playback application for the GNOME desktop.
 -
  Package: banshee-extension-awn
  Architecture: all
  Depends: banshee-extensions-common (= ${source:Version}),
@@@ -248,3 -262,12 +247,3 @@@ Description: Telepathy extension for Ba
    * Stream your friends' music. This feature can be disabled.
   .
   Banshee is a media management and playback application for the GNOME desktop.
 -
 -Package: banshee-extension-ubuntuonemusicstore
 -Architecture: all
 -Depends: banshee-extensions-common (= ${source:Version}),
 -         ${cli:Depends}, ${misc:Depends}
 -Description: Ubuntu One Music Store extension for Banshee
 - This extension makes the Ubuntu One Music Store available in Banshee.
 - .
 - Banshee is a media management and playback application for the GNOME desktop.

-- 
banshee-community-extensions



More information about the Pkg-cli-apps-commits mailing list