[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.6.0-1-15-g527207b

[Chow Loong Jin]

The following commit has been merged in the ubuntu branch:
commit 856492bf902f3d435336baff16b95d83e91916d8
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Apr 10 00:02:00 2010 +0800

    Add 0001-Use-banshee-panel-icon.patch
    
    * debian/(control, rules, patches):
      + Quiltify package again
      + Add 0001-Use-banshee-panel-icon.patch which makes AppIndicator use
        the correct icon

diff --git a/debian/changelog b/debian/changelog
index b4e41f1..e689207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 10 Apr 2010 00:01:23 +0800
+
 banshee-community-extensions (1.6.0-1ubuntu1) lucid; urgency=low
 
   * debian/(control, rules):
diff --git a/debian/control b/debian/control
index 91c871d..b8bd890 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 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),
+               quilt (>= 0.46-7~),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.2.3),
                autotools-dev,
diff --git a/debian/patches/0001-Use-banshee-panel-icon.patch b/debian/patches/0001-Use-banshee-panel-icon.patch
new file mode 100644
index 0000000..111ba0f
--- /dev/null
+++ b/debian/patches/0001-Use-banshee-panel-icon.patch
@@ -0,0 +1,32 @@
+From ce4560d4b41bdc8cea5a749620d421c165682a12 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Fri, 9 Apr 2010 00:39:33 +0800
+Subject: [PATCH] Use banshee-panel icon
+
+If "banshee-panel" exists, use it instead of "banshee", but fallback
+onto "banshee" if it does not exist, similar to the current behaviour of
+Banshee.NotificationArea
+---
+ .../Banshee.AppIndicator/AppIndicatorService.cs    |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs b/src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs
+index 71bb66d..4bba19c 100644
+--- a/src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs
++++ b/src/AppIndicator/Banshee.AppIndicator/AppIndicatorService.cs
+@@ -206,8 +206,10 @@ namespace Banshee.AppIndicator
+         {
+             try {
+                 indicator = new ApplicationIndicator ("banshee",
+-                                                    Banshee.ServiceStack.Application.IconName,
+-                                                    Category.ApplicationStatus);
++                                                      (IconThemeUtils.HasIcon ("banshee-panel")) ?
++                                                      "banshee-panel" :
++                                                      Banshee.ServiceStack.Application.IconName,
++                                                      Category.ApplicationStatus);
+     
+                 // Load the menu
+                 Menu menu = (Menu) interface_action_service.UIManager.GetWidget("/AppIndicatorTrayMenu");
+-- 
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a3c334c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-banshee-panel-icon.patch
diff --git a/debian/rules b/debian/rules
index 69fd269..6e43a65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,4 @@ override_dh_gencontrol:
 	dh_gencontrol
 
 %:
-	dh $@
+	dh --with=quilt $@

-- 
banshee-community-extensions