[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/precise, updated. debian/2.4.0-1ubuntu3-11-g30513a6
Chow Loong Jin
hyperair at debian.org
Fri Apr 20 16:16:00 UTC 2012
The following commit has been merged in the ubuntu/precise branch:
commit 57afffadb9933a8235e50cbf28e7891f3f9faaeb
Author: Chow Loong Jin <hyperair at debian.org>
Date: Fri Apr 20 22:56:12 2012 +0800
Reexport patches via gbp-pq
The numbering of the Ubuntu specific patches have been upset due to the new
patches imported into the previous Debian revision.
diff --git a/debian/patches/0012-Disable-Notification-area-extension-by-default.patch b/debian/patches/0014-Disable-Notification-area-extension-by-default.patch
similarity index 94%
rename from debian/patches/0012-Disable-Notification-area-extension-by-default.patch
rename to debian/patches/0014-Disable-Notification-area-extension-by-default.patch
index 3affcac..9d8dec4 100644
--- a/debian/patches/0012-Disable-Notification-area-extension-by-default.patch
+++ b/debian/patches/0014-Disable-Notification-area-extension-by-default.patch
@@ -4,7 +4,7 @@ Subject: Disable Notification area extension by default
---
.../Banshee.NotificationArea.addin.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.addin.xml
index 003afb0..abdcf48 100644
diff --git a/debian/patches/0013-Enable-sound-menu-extension-by-default.patch b/debian/patches/0015-Enable-sound-menu-extension-by-default.patch
similarity index 93%
rename from debian/patches/0013-Enable-sound-menu-extension-by-default.patch
rename to debian/patches/0015-Enable-sound-menu-extension-by-default.patch
index ea627db..ca390f1 100644
--- a/debian/patches/0013-Enable-sound-menu-extension-by-default.patch
+++ b/debian/patches/0015-Enable-sound-menu-extension-by-default.patch
@@ -4,7 +4,7 @@ Subject: Enable sound menu extension by default
---
.../Banshee.SoundMenu/Banshee.SoundMenu.addin.xml | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
index 0765109..a8f5e82 100644
diff --git a/debian/patches/0014-Change-Amazon-redirect-url.patch b/debian/patches/0016-Change-Amazon-redirect-url.patch
similarity index 95%
rename from debian/patches/0014-Change-Amazon-redirect-url.patch
rename to debian/patches/0016-Change-Amazon-redirect-url.patch
index aac0aef..e21e06b 100644
--- a/debian/patches/0014-Change-Amazon-redirect-url.patch
+++ b/debian/patches/0016-Change-Amazon-redirect-url.patch
@@ -4,7 +4,7 @@ Subject: Change Amazon redirect url
---
.../Banshee.AmazonMp3.Store/StoreView.cs | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
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
diff --git a/debian/patches/0015-Workaround-for-set_Height-exceptions.patch b/debian/patches/0017-Workaround-for-set_Height-exceptions.patch
similarity index 96%
rename from debian/patches/0015-Workaround-for-set_Height-exceptions.patch
rename to debian/patches/0017-Workaround-for-set_Height-exceptions.patch
index af1c703..7ae8098 100644
--- a/debian/patches/0015-Workaround-for-set_Height-exceptions.patch
+++ b/debian/patches/0017-Workaround-for-set_Height-exceptions.patch
@@ -7,7 +7,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=624976
Bug-Ubuntu: https://bugs.launchpad.net/bugs/873787
---
src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs b/src/Hyena/Hyena.Gui/Hyena.Gui.Canvas/Rect.cs
index 3dc568b..a03032f 100644
diff --git a/debian/patches/series b/debian/patches/series
index fd12b85..5c97a31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,7 @@
0011-Fix-FTBFS-involving-bad-cast-libgpod-forwardport.patch
0012-libossifer-Fix-certificate-validation-with-libsoup-2.patch
0013-UPnPServerSource-Fix-crash-when-getting-the-root-obj.patch
-0012-Disable-Notification-area-extension-by-default.patch
-0013-Enable-sound-menu-extension-by-default.patch
-0014-Change-Amazon-redirect-url.patch
-0015-Workaround-for-set_Height-exceptions.patch
+0014-Disable-Notification-area-extension-by-default.patch
+0015-Enable-sound-menu-extension-by-default.patch
+0016-Change-Amazon-redirect-url.patch
+0017-Workaround-for-set_Height-exceptions.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list