[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/precise, updated. debian/2.3.3-1ubuntu1-13-g77d6e36
Chow Loong Jin
hyperair at debian.org
Mon Jan 23 16:07:12 UTC 2012
The following commit has been merged in the ubuntu/precise branch:
commit b617fe016766fbc8e9f54662acafe2d8e6b0a023
Author: Chow Loong Jin <hyperair at debian.org>
Date: Mon Jan 23 23:16:20 2012 +0800
Convert Ubuntu-specific patches to gbp-pq patches
diff --git a/debian/patches/0012-Disable-Notification-area-extension-by-default.patch b/debian/patches/0012-Disable-Notification-area-extension-by-default.patch
new file mode 100644
index 0000000..3affcac
--- /dev/null
+++ b/debian/patches/0012-Disable-Notification-area-extension-by-default.patch
@@ -0,0 +1,22 @@
+From: Iain Lane <laney at ubuntu.com>
+Date: Mon, 23 Jan 2012 23:05:20 +0800
+Subject: Disable Notification area extension by default
+
+---
+ .../Banshee.NotificationArea.addin.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+index 003afb0..abdcf48 100644
+--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
++++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
+@@ -9,7 +9,7 @@
+ description="Display an icon in the notification area for controlling Banshee."
+ author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
+ url="http://banshee.fm/"
+- defaultEnabled="true">
++ defaultEnabled="false">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0"/>
+--
diff --git a/debian/patches/0013-Enable-sound-menu-extension-by-default.patch b/debian/patches/0013-Enable-sound-menu-extension-by-default.patch
new file mode 100644
index 0000000..ea627db
--- /dev/null
+++ b/debian/patches/0013-Enable-sound-menu-extension-by-default.patch
@@ -0,0 +1,22 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Date: Mon, 23 Jan 2012 23:05:20 +0800
+Subject: Enable sound menu extension by default
+
+---
+ .../Banshee.SoundMenu/Banshee.SoundMenu.addin.xml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+index 0765109..a8f5e82 100644
+--- a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
++++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+@@ -9,7 +9,7 @@
+ description="Control Banshee from the Sound Menu."
+ author="Bertrand Lorentz"
+ url="http://banshee-project.org/"
+- defaultEnabled="false">
++ defaultEnabled="true">
+
+ <Dependencies>
+ <Addin id="Banshee.Services" version="1.0"/>
+--
diff --git a/debian/patches/0014-Change-Amazon-redirect-url.patch b/debian/patches/0014-Change-Amazon-redirect-url.patch
new file mode 100644
index 0000000..aac0aef
--- /dev/null
+++ b/debian/patches/0014-Change-Amazon-redirect-url.patch
@@ -0,0 +1,22 @@
+From: Rodney Dawes <rodney.dawes at canonical.com>
+Date: Mon, 23 Jan 2012 23:05:21 +0800
+Subject: Change Amazon redirect url
+
+---
+ .../Banshee.AmazonMp3.Store/StoreView.cs | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
+index d2ee92c..2f009af 100644
+--- a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
++++ b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
+@@ -45,7 +45,7 @@ namespace Banshee.AmazonMp3.Store
+ // We ask that no one change this redirect URL. ALL (100%) revenue
+ // generated by this Banshee Amazon integration is sent directly to the
+ // non-profit GNOME Foundation.
+- public const string REDIRECT_URL = "http://integrated-services.banshee.fm/amz/redirect.do/";
++ public const string REDIRECT_URL = "https://one.ubuntu.com/music/store/amz/";
+
+ private static string [] domains = new [] {
+ "com",
+--
diff --git a/debian/patches/07_disable-notification-area-by-default.patch b/debian/patches/07_disable-notification-area-by-default.patch
deleted file mode 100644
index 3d274fe..0000000
--- a/debian/patches/07_disable-notification-area-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee.git/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
-===================================================================
---- banshee.git.orig/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml 2010-11-25 10:59:38.898399669 +0000
-+++ banshee.git/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml 2010-11-25 10:59:13.296414590 +0000
-@@ -9,7 +9,7 @@
- description="Display an icon in the notification area for controlling Banshee."
- author="Aaron Bockover, Sebastian Dröge, Alexander Hixon, Gabriel Burt, Ruben Vermeersch"
- url="http://banshee.fm/"
-- defaultEnabled="true">
-+ defaultEnabled="false">
-
- <Dependencies>
- <Addin id="Banshee.Services" version="1.0"/>
diff --git a/debian/patches/07_enable-soundmenu-by-default.patch b/debian/patches/07_enable-soundmenu-by-default.patch
deleted file mode 100644
index 983eb4a..0000000
--- a/debian/patches/07_enable-soundmenu-by-default.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
-===================================================================
---- banshee.orig/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml 2010-12-27 10:53:58.801759598 +0800
-+++ banshee/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml 2010-12-27 10:54:07.155167954 +0800
-@@ -9,7 +9,7 @@
- description="Control Banshee from the Sound Menu."
- author="Bertrand Lorentz"
- url="http://banshee-project.org/"
-- defaultEnabled="false">
-+ defaultEnabled="true">
-
- <Dependencies>
- <Addin id="Banshee.Services" version="1.0"/>
diff --git a/debian/patches/90_amazon_url.patch b/debian/patches/90_amazon_url.patch
deleted file mode 100644
index ca43388..0000000
--- a/debian/patches/90_amazon_url.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs'
-Index: banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
-===================================================================
---- banshee.orig/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs 2011-05-03 21:42:47.000000000 +0800
-+++ banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs 2011-05-03 21:45:40.707409583 +0800
-@@ -45,7 +45,7 @@
- // We ask that no one change this redirect URL. ALL (100%) revenue
- // generated by this Banshee Amazon integration is sent directly to the
- // non-profit GNOME Foundation.
-- public const string REDIRECT_URL = "http://integrated-services.banshee.fm/amz/redirect.do/";
-+ public const string REDIRECT_URL = "https://one.ubuntu.com/music/store/amz/";
-
- private static string [] domains = new [] {
- "com",
diff --git a/debian/patches/series b/debian/patches/series
index b214ae1..be8dbb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,6 @@
0009-Drop-unnecessary-winmm-moduleref.patch
0010-Drop-unnecessary-libmeego-panel-moduleref.patch
0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
-07_disable-notification-area-by-default.patch
-07_enable-soundmenu-by-default.patch
-90_amazon_url.patch
+0012-Disable-Notification-area-extension-by-default.patch
+0013-Enable-sound-menu-extension-by-default.patch
+0014-Change-Amazon-redirect-url.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list