[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/2.4.0-1ubuntu2

Chow Loong Jin hyperair at debian.org
Tue Jun 4 15:36:07 UTC 2013


The following commit has been merged in the ubuntu branch:
commit b0330a042427c8eae240f6eedacfd4c167baa81e
Merge: 975b37e3f3063f530f5ec418b7f2df1a71695112 38ded0c922be889bad30fcf6fc74f3adde3951b0
Author: Andreas Moog <amoog at ubuntu.com>
Date:   Sat Feb 11 19:30:25 2012 +0100

    Imported Debian patch 2.2.0-3ubuntu1

diff --combined debian/changelog
index 2637e62,eda4324..f32be10
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,37 @@@
++banshee-community-extensions (2.2.0-3ubuntu1) precise; urgency=low
++
++  * Merge from debian/unstable to drop clutterflow extension, 
++    remaining change:
++    - Enable Appindicator extension
++
++ -- Andreas Moog <amoog at ubuntu.com>  Sat, 11 Feb 2012 19:30:25 +0100
++
+ banshee-community-extensions (2.2.0-3) unstable; urgency=low
+ 
+   * [fb763e7] Cherry-pick LiveRadio crash-fix (LP: #881902)
+   * [004bc6f] Update email address
+   * [4a7215b] Drop clutterflow extension
+     clutter-gtk-sharp has been disabled due to the removal of
+     clutter-gtk-0.10/libchamplain-0.8. Clutterflow also does not work, causing a
+     huge memory leak that causes the system to thrash in about a minute or so.
+     Thanks to Michael Biebl (Closes: #648429) (LP: #738486)
+ 
+  -- Chow Loong Jin <hyperair at debian.org>  Fri, 27 Jan 2012 13:04:54 +0800
+ 
+ banshee-community-extensions (2.2.0-2) unstable; urgency=low
+ 
+   * Upload rebuild for CLR 4.0 transition
+   * [a57bfe0] Don't use deprecated cli.make, instead use the cli sequence
+ 
+  -- Iain Lane <laney at debian.org>  Tue, 24 Jan 2012 11:15:01 +0000
+ 
 +banshee-community-extensions (2.2.0-1ubuntu1) oneiric; urgency=low
 +
 +  * [c0b3875] Merge from Debian Unstable (LP: #856579), remaining changes:
 +    + Enable AppIndicator extension
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 22 Sep 2011 13:55:22 +0800
 +
  banshee-community-extensions (2.2.0-1) unstable; urgency=low
  
    * [4940fab] Imported Upstream version 2.2.0
@@@ -49,13 -61,6 +76,13 @@@ banshee-community-extensions (2.1.3-1) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 27 Aug 2011 22:45:56 +0800
  
 +banshee-community-extensions (2.1.1-2ubuntu1) oneiric; urgency=low
 +
 +  * [c0b3875] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Iain Lane <laney at ubuntu.com>  Sun, 26 Jun 2011 13:31:44 +0100
 +
  banshee-community-extensions (2.1.1-2) experimental; urgency=low
  
    * No-change rebuild vs. new zeitgeist-sharp ABI
@@@ -104,13 -109,6 +131,13 @@@ banshee-community-extensions (2.0.1-2) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 10 Jul 2011 10:08:08 +0100
  
 +banshee-community-extensions (2.0.1-1ubuntu1) oneiric; urgency=low
 +
 +  * [6a83a31] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 07 May 2011 17:12:01 +0800
 +
  banshee-community-extensions (2.0.1-1) unstable; urgency=low
  
    * [c02b8fd] Move over to bz2 in debian/watch
@@@ -133,28 -131,12 +160,28 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 05 May 2011 06:59:58 +0800
  
 +banshee-community-extensions (2.0.0-2ubuntu1) natty; urgency=low
 +
 +  * [4914145] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +  * [11e40ce] Drop explicit banshee depends from -lirc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:11:26 +0800
 +
  banshee-community-extensions (2.0.0-2) unstable; urgency=low
  
    * [44303f2] Add Enhances: banshee to b-c-e (LP: #758526)
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 27 Apr 2011 22:55:21 +0800
  
 +banshee-community-extensions (2.0.0-1ubuntu1) natty; urgency=low
 +
 +  * [36d8c92] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +  * [11e40ce] Drop explicit banshee depends from -lirc
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:11:26 +0800
 +
  banshee-community-extensions (2.0.0-1) unstable; urgency=low
  
    * [b1cf183] New upstream release
@@@ -164,13 -146,6 +191,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 07 Apr 2011 00:00:13 +0800
  
 +banshee-community-extensions (1.9.6-1ubuntu1) natty; urgency=low
 +
 +  * [ceb501c] Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 22:21:22 +0800
 +
  banshee-community-extensions (1.9.6-1) unstable; urgency=low
  
    * [9bb7ba5] New upstream release:
@@@ -187,13 -162,6 +214,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 27 Mar 2011 04:32:23 +0800
  
 +banshee-community-extensions (1.9.5-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian Unstable, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 22:21:22 +0800
 +
  banshee-community-extensions (1.9.5-1) unstable; urgency=low
  
    * [aea54e9] New upstream release:
@@@ -211,13 -179,6 +238,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 11 Mar 2011 21:50:31 +0800
  
 +banshee-community-extensions (1.9.3-1ubuntu1) natty; urgency=low
 +
 +  * [a5570d7] Merge from Debian Experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 01 Mar 2011 01:54:03 +0800
 +
  banshee-community-extensions (1.9.3-1) unstable; urgency=low
  
    * [2d6dcff] New upstream release:
@@@ -238,13 -199,6 +265,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 20 Feb 2011 16:48:42 +0800
  
 +banshee-community-extensions (1.9.2-1ubuntu1) UNRELEASED; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 14 Jan 2011 01:58:33 +0800
 +
  banshee-community-extensions (1.9.2-1) UNRELEASED; urgency=low
  
    * [280f6c6] Enable Clutterflow
@@@ -260,13 -214,6 +287,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 19 Jan 2011 22:03:57 +0800
  
 +banshee-community-extensions (1.9.1-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable LIRC and AppIndicator extensions
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 26 Dec 2010 17:09:32 +0800
 +
  banshee-community-extensions (1.9.1-1) experimental; urgency=low
  
    [ Chow Loong Jin ]
@@@ -312,22 -259,6 +339,22 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 26 Dec 2010 17:06:06 +0800
  
 +banshee-community-extensions (1.9.0-1ubuntu2) natty; urgency=low
 +
 +  * [5c94c08] Disable OpenVP extension temporarily.
 +  * [609c47e] Enable Ubuntu One Music Store by default
 +  * [6d26f8b] Fix build with new RandomBy APIs included in git snapshot
 +
 + -- Iain Lane <laney at ubuntu.com>  Wed, 24 Nov 2010 14:59:52 +0000
 +
 +banshee-community-extensions (1.9.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 18 Nov 2010 02:50:07 +0800
 +
  banshee-community-extensions (1.9.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -352,14 -283,6 +379,14 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 12 Nov 2010 14:19:02 +0800
  
 +banshee-community-extensions (1.8.0-1ubuntu1) natty; urgency=low
 +
 +  * Merge from Debian experimental, remaining changes:
 +    + Enable building of AppIndicator, Lirc, SoundMenu, and U1MS
 +    + Also enable SoundMenu extension by default
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 02 Oct 2010 16:40:06 +0800
 +
  banshee-community-extensions (1.8.0-1) experimental; urgency=low
  
    * New upstream release
@@@ -370,13 -293,7 +397,13 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 01 Oct 2010 12:34:03 +0800
  
 -banshee-community-extensions (1.7.6-1) UNRELEASED; urgency=low
 +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:
@@@ -396,19 -313,6 +423,19 @@@
  
   -- 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) maverick; urgency=low
 +
 +  * Merge from experimental, remaining changes:
 +    + Enable AppIndicator, Lirc, SoundMenu, and U1MS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 24 Aug 2010 22:02:51 +0800
 +
  banshee-community-extensions (1.7.4-1) experimental; urgency=low
  
    * New upstream release
@@@ -460,14 -364,6 +487,14 @@@ banshee-community-extensions (1.6.1-2) 
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Mon, 26 Jul 2010 01:12:38 +0800
  
 +banshee-community-extensions (1.6.1-1ubuntu1) maverick; urgency=low
 +
 +  * Merge from Debian unstable, remaining changes:
 +    + Enable appindicator, lirc, and ubuntuonemusicstore extensions
 +  * Also fixes LP: #597283, which just require a rebuild of appindicator
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 23 Jun 2010 01:14:29 +0800
 +
  banshee-community-extensions (1.6.1-1) unstable; urgency=low
  
    * New upstream bugfix release:
@@@ -496,52 -392,6 +523,52 @@@
  
   -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 08 Jun 2010 13:45:22 +0800
  
 +banshee-community-extensions (1.6.0-1ubuntu5) lucid; urgency=low
 +
 +  * Add 0001-AppIndicator-Stopping-the-notifications-from-lagging.patch to
 +    fix notification lag with Notify OSD (LP: #566112)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 23 Apr 2010 22:36:16 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu4) lucid; urgency=low
 +
 +  * debian/control:
 +    + Build-dep on libappindicator0.1-cil-dev instead, due to adding of
 +      the API version number into the name of the package (LP: #564506)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 17 Apr 2010 14:55:24 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu3) lucid; urgency=low
 +
 +  * debian/(control, rules):
 +    + Demote avant-window-navigator to suggests in banshee-extension-awn
 +    + Drop banshee-extension-telepathy; not installable due to dependency
 +      on telepathy-gabble >= 0.9 (LP: #559978)
 +    + Tighten build-dep on libappindicator-cil-dev due to missing clilibs
 +      in older versions (LP: #560095)
 +    + Drop indicator-applet and indicator-application from binary-deps of
 +      -appindicator
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 15 Apr 2010 00:26:37 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu2) lucid; urgency=low
 +
 +  * debian/(control, rules, patches):
 +    + Quiltify package again
 +    + Add 0001-Use-banshee-panel-icon.patch which makes AppIndicator use
 +      the correct icon
 +    + Add 99_ignore-quilt.patch to add .pc to POTFILES.skip to fix FTBFS
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 10 Apr 2010 02:05:28 +0800
 +
 +banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
 +
 +  * debian/(control, rules):
 +    + Enable AppIndicator, Lirc and U1MS extensions
 +  * Fixes needs-packaging bug (LP: #537691)
 +
 + -- Chow Loong Jin <hyperair at ubuntu.com>  Sun, 04 Apr 2010 18:17:28 +0800
 +
  banshee-community-extensions (1.6.0-1) unstable; urgency=low
  
    * New upstream release
diff --combined debian/control
index b07b938,0bb1ab9..c6ee8e2
--- a/debian/control
+++ b/debian/control
@@@ -1,9 -1,8 +1,9 @@@
  Source: banshee-community-extensions
  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>
+ Uploaders: Chow Loong Jin <hyperair at debian.org>
  Build-Depends: debhelper (>= 7.0.50),
                 dh-autoreconf,
                 libgconf2-dev,
@@@ -29,14 -28,11 +29,12 @@@
                 libdbus1.0-cil-dev,
                 libmono-addins-cil-dev,
                 libnotify-cil-dev,
 +               libappindicator0.1-cil-dev,
                 libtaoframework-opengl-cil-dev (>= 2.1),
                 libtaoframework-freeglut-cil-dev,
                 libtaoframework-sdl-cil-dev (>= 1.2.13),
                 mono-jay,
                 gnome-doc-utils (>= 0.17.3),
-                libclutter-cil-dev,
-                libclutter-gtk-cil-dev,
                 libzeitgeist-cil-dev
  Standards-Version: 3.9.2
  Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git
@@@ -49,10 -45,8 +47,8 @@@ Enhances: banshe
  Recommends: banshee-extension-alarm (>= ${source:Version}),
              banshee-extension-albumartwriter (>= ${source:Version}),
              banshee-extension-ampache (>= ${source:Version}),
-             banshee-extension-appindicator (>= ${source:Version}),
              banshee-extension-awn (>= ${source:Version}),
              banshee-extension-coverwallpaper (>= ${source:Version}),
-             banshee-extension-clutterflow (>= ${source:Version}),
              banshee-extension-duplicatesongdetector (>= ${source:Version}),
              banshee-extension-jamendo (>= ${source:Version}),
              banshee-extension-lastfmfingerprint (>= ${source:Version}),
@@@ -121,17 -115,6 +117,6 @@@ Description: Ampache extension for Bans
   .
   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
  Enhances: banshee
  Architecture: all
@@@ -144,16 -127,6 +129,6 @@@ Description: AWN integration extension 
   .
   Banshee is a media management and playback application for the GNOME desktop.
  
- Package: banshee-extension-clutterflow
- Architecture: all
- Depends: banshee-extensions-common (= ${source:Version}),
-          ${cli:Depends}, ${misc:Depends}
- Description: CoverFlow functionality for Banshee
-  This package provides a clone of the CoverFlow functionality for
-  Banshee using the Clutter toolkit.
-  .
-  Banshee is a media management and playback application for the GNOME desktop.
- 
  Package: banshee-extension-coverwallpaper
  Enhances: banshee
  Architecture: all
diff --combined debian/rules
index 37b9293,1e35163..166167f
--- a/debian/rules
+++ b/debian/rules
@@@ -1,11 -1,8 +1,8 @@@
  #!/usr/bin/make -f
  # -*- makefile -*-
  
- include /usr/share/cli-common/cli.make
- 
  BANSHEE_VERSION = $(shell pkg-config --modversion banshee-thickclient)
  
- # disable zeitgeistdataprovider and lirc due to dependencies missing
  override_dh_auto_configure:
  	dh_auto_configure -- \
  		--with-vendor-build-id="`lsb_release -ds`" \
@@@ -14,9 -11,9 +11,9 @@@
  		--enable-alarmclock \
  		--enable-albumartwriter \
  		--enable-ampache \
 -		--disable-appindicator \
 +		--enable-appindicator \
  		--enable-awn \
- 		--enable-clutterflow \
+ 		--disable-clutterflow \
  		--enable-coverwallpaper \
  		--enable-duplicatesongdetector \
  		--enable-jamendo \
@@@ -63,4 -60,4 +60,4 @@@ override_dh_clideps
  		--exclude-moduleref=glibsharpglue-2
  
  %:
- 	dh $@ --with=autoreconf
+ 	dh $@ --with cli,autoreconf

-- 
banshee-community-extensions



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