[Pkg-cli-apps-commits] [gnome-do-plugins] 01/03: Reexport patches using gbp-pq
Chow Loong Jin
hyperair at debian.org
Tue Nov 18 03:34:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch master
in repository gnome-do-plugins.
commit d045ddba46f1befa4c1c7606cb328ce68ce9cf17
Author: Chow Loong Jin <hyperair at debian.org>
Date: Tue Nov 18 10:12:37 2014 +0800
Reexport patches using gbp-pq
---
debian/patches/00_debian_default_plugins.patch | 106 +++++++++++++----------
debian/patches/01_firefox_iceweasel_rename.patch | 50 +++++++----
debian/patches/use_dbussharp_2.patch | 19 ++--
3 files changed, 107 insertions(+), 68 deletions(-)
diff --git a/debian/patches/00_debian_default_plugins.patch b/debian/patches/00_debian_default_plugins.patch
index f21ddc6..0439410 100644
--- a/debian/patches/00_debian_default_plugins.patch
+++ b/debian/patches/00_debian_default_plugins.patch
@@ -1,3 +1,7 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 18 Nov 2014 10:07:49 +0800
+Subject: 00_debian_default_plugins
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## 00_debian_default_plugins.dpatch by Christopher James Halse Rogers <raof at ubuntu.com>
##
@@ -6,10 +10,24 @@
## DP: configuration by default, so gnome-do is more useful out of the box.
@DPATCH@
-Index: gnome-do-plugins/Firefox/Resources/Firefox.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/Firefox/Resources/Firefox.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/Firefox/Resources/Firefox.addin.xml.in 2011-02-20 16:59:44.905550591 +1100
+---
+ Firefox/Resources/Firefox.addin.xml.in | 2 +-
+ GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in | 2 +-
+ GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in | 2 +-
+ GNOME-Session/Resources/GNOME-Session.addin.xml.in | 2 +-
+ GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in | 2 +-
+ GoogleCalculator/Resources/GoogleCalculator.addin.xml.in | 2 +-
+ OpenSearch/Resources/OpenSearch.addin.xml.in | 2 +-
+ Pastebin/Resources/Pastebin.addin.xml.in | 2 +-
+ TinyUrl/Resources/TinyUrl.addin.xml.in | 2 +-
+ Tomboy/Resources/Tomboy.addin.xml.in | 2 +-
+ WindowManager/Resources/WindowManager.addin.xml.in | 2 +-
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/Firefox/Resources/Firefox.addin.xml.in b/Firefox/Resources/Firefox.addin.xml.in
+index 2de33c7..323dfdf 100644
+--- a/Firefox/Resources/Firefox.addin.xml.in
++++ b/Firefox/Resources/Firefox.addin.xml.in
@@ -6,7 +6,7 @@
description="Search Firefox 3 bookmarks, bookmark directories, and history."
author="David Siegel, Neal Stewart, Alex Launi"
@@ -19,10 +37,10 @@ Index: gnome-do-plugins/Firefox/Resources/Firefox.addin.xml.in
url="http://do.davebsd.com/wiki/Firefox_Plugin"
>
-Index: gnome-do-plugins/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in 2011-02-20 17:00:13.035591855 +1100
+diff --git a/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in b/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
+index 3d45f74..5148bae 100644
+--- a/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
++++ b/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
@@ -6,7 +6,7 @@
description="Look up word definitions in GNOME Dictionary."
author="David Siegel"
@@ -32,10 +50,10 @@ Index: gnome-do-plugins/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml.in
url="http://do.davebsd.com/wiki/GNOME_Dictionary_Plugin"
>
-Index: gnome-do-plugins/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in 2011-02-20 17:00:56.125655048 +1100
+diff --git a/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in b/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
+index b541d1a..57af5be 100644
+--- a/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
++++ b/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
@@ -6,7 +6,7 @@
description="Take screenshots with optional delay."
author="David Siegel"
@@ -45,10 +63,10 @@ Index: gnome-do-plugins/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml.in
url="http://do.davebsd.com/wiki/GNOME_Screenshot_Plugin"
>
-Index: gnome-do-plugins/GNOME-Session/Resources/GNOME-Session.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/GNOME-Session/Resources/GNOME-Session.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/GNOME-Session/Resources/GNOME-Session.addin.xml.in 2011-02-20 17:01:10.955676800 +1100
+diff --git a/GNOME-Session/Resources/GNOME-Session.addin.xml.in b/GNOME-Session/Resources/GNOME-Session.addin.xml.in
+index 925c6b3..28373aa 100644
+--- a/GNOME-Session/Resources/GNOME-Session.addin.xml.in
++++ b/GNOME-Session/Resources/GNOME-Session.addin.xml.in
@@ -6,7 +6,7 @@
description="Log out, lock your screen, shutdown, suspend, etc."
author="David Siegel"
@@ -58,10 +76,10 @@ Index: gnome-do-plugins/GNOME-Session/Resources/GNOME-Session.addin.xml.in
url="http://do.davebsd.com/wiki/GNOME_Session_Plugin"
>
-Index: gnome-do-plugins/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in 2011-02-20 17:01:24.175696196 +1100
+diff --git a/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in b/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
+index 349cba4..125d00f 100644
+--- a/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
++++ b/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
@@ -6,7 +6,7 @@
description="Run commands and open new terminals."
author="David Siegel, Tim McLaughlin"
@@ -71,10 +89,10 @@ Index: gnome-do-plugins/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml.in
url="http://do.davebsd.com/wiki/GNOME_Terminal_Plugin"
>
-Index: gnome-do-plugins/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in 2011-02-20 17:01:45.915728081 +1100
+diff --git a/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in b/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
+index 95584b0..ca28226 100644
+--- a/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
++++ b/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
@@ -6,7 +6,7 @@
description="Perform calculations, and currency/quantity conversions."
author="David Siegel"
@@ -84,10 +102,10 @@ Index: gnome-do-plugins/GoogleCalculator/Resources/GoogleCalculator.addin.xml.in
url="http://do.davebsd.com/wiki/Google_Calculator_Plugin"
>
-Index: gnome-do-plugins/OpenSearch/Resources/OpenSearch.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/OpenSearch/Resources/OpenSearch.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/OpenSearch/Resources/OpenSearch.addin.xml.in 2011-02-20 17:02:01.995751659 +1100
+diff --git a/OpenSearch/Resources/OpenSearch.addin.xml.in b/OpenSearch/Resources/OpenSearch.addin.xml.in
+index 5225ca8..cd9f8e7 100644
+--- a/OpenSearch/Resources/OpenSearch.addin.xml.in
++++ b/OpenSearch/Resources/OpenSearch.addin.xml.in
@@ -6,7 +6,7 @@
description="Search the web using your installed OpenSearch plugins."
author="Jason Jones"
@@ -97,10 +115,10 @@ Index: gnome-do-plugins/OpenSearch/Resources/OpenSearch.addin.xml.in
url="http://do.davebsd.com/wiki/OpenSearch_Plugin"
>
-Index: gnome-do-plugins/Pastebin/Resources/Pastebin.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/Pastebin/Resources/Pastebin.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/Pastebin/Resources/Pastebin.addin.xml.in 2011-02-20 17:02:22.345781507 +1100
+diff --git a/Pastebin/Resources/Pastebin.addin.xml.in b/Pastebin/Resources/Pastebin.addin.xml.in
+index 1d5142f..205f99b 100644
+--- a/Pastebin/Resources/Pastebin.addin.xml.in
++++ b/Pastebin/Resources/Pastebin.addin.xml.in
@@ -6,7 +6,7 @@
description="Paste text to an online pastebin."
author="Jason Jones"
@@ -110,10 +128,10 @@ Index: gnome-do-plugins/Pastebin/Resources/Pastebin.addin.xml.in
url="http://do.davebsd.com/wiki/Pastebin_Plugin"
>
-Index: gnome-do-plugins/TinyUrl/Resources/TinyUrl.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/TinyUrl/Resources/TinyUrl.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/TinyUrl/Resources/TinyUrl.addin.xml.in 2011-02-20 17:03:29.945880656 +1100
+diff --git a/TinyUrl/Resources/TinyUrl.addin.xml.in b/TinyUrl/Resources/TinyUrl.addin.xml.in
+index 7e862da..d67523d 100644
+--- a/TinyUrl/Resources/TinyUrl.addin.xml.in
++++ b/TinyUrl/Resources/TinyUrl.addin.xml.in
@@ -6,7 +6,7 @@
description="Make unwieldy urls tiny."
author="David Siegel"
@@ -123,10 +141,10 @@ Index: gnome-do-plugins/TinyUrl/Resources/TinyUrl.addin.xml.in
url="http://do.davebsd.com/wiki/TinyUrl_Plugin"
>
-Index: gnome-do-plugins/Tomboy/Resources/Tomboy.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/Tomboy/Resources/Tomboy.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/Tomboy/Resources/Tomboy.addin.xml.in 2011-02-20 17:03:49.285909021 +1100
+diff --git a/Tomboy/Resources/Tomboy.addin.xml.in b/Tomboy/Resources/Tomboy.addin.xml.in
+index e91ca71..98375f8 100644
+--- a/Tomboy/Resources/Tomboy.addin.xml.in
++++ b/Tomboy/Resources/Tomboy.addin.xml.in
@@ -6,7 +6,7 @@
description="Search and create new Tomboy notes."
author="Rick Harding, Chris Szikszoy"
@@ -136,10 +154,10 @@ Index: gnome-do-plugins/Tomboy/Resources/Tomboy.addin.xml.in
url="http://do.davebsd.com/wiki/Tomboy_Plugin"
>
-Index: gnome-do-plugins/WindowManager/Resources/WindowManager.addin.xml.in
-===================================================================
---- gnome-do-plugins.orig/WindowManager/Resources/WindowManager.addin.xml.in 2011-02-16 21:16:49.000000000 +1100
-+++ gnome-do-plugins/WindowManager/Resources/WindowManager.addin.xml.in 2011-02-20 17:04:03.105929297 +1100
+diff --git a/WindowManager/Resources/WindowManager.addin.xml.in b/WindowManager/Resources/WindowManager.addin.xml.in
+index 8823315..f3b18ef 100644
+--- a/WindowManager/Resources/WindowManager.addin.xml.in
++++ b/WindowManager/Resources/WindowManager.addin.xml.in
@@ -6,7 +6,7 @@
description="Control your windows or groups of windows with Do."
author="Jason Smith"
diff --git a/debian/patches/01_firefox_iceweasel_rename.patch b/debian/patches/01_firefox_iceweasel_rename.patch
index c277af3..d0e3d32 100644
--- a/debian/patches/01_firefox_iceweasel_rename.patch
+++ b/debian/patches/01_firefox_iceweasel_rename.patch
@@ -1,3 +1,7 @@
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 18 Nov 2014 10:07:49 +0800
+Subject: 01_firefox_iceweasel_rename
+
#! /bin/sh /usr/share/dpatch/dpatch-run
## firefox_iceweasel_rename.dpatch by <ct at piglets.com>
##
@@ -9,11 +13,18 @@
## DP: Iceweasel bookmarks.
@DPATCH@
-Index: gnome-do-plugins/Firefox/src/PlacesItemSource.cs
-===================================================================
---- gnome-do-plugins.orig/Firefox/src/PlacesItemSource.cs 2011-02-23 22:28:24.781232052 +1100
-+++ gnome-do-plugins/Firefox/src/PlacesItemSource.cs 2011-02-24 10:47:31.564914977 +1100
-@@ -161,8 +161,13 @@
+---
+ Firefox/src/PlacesItemSource.cs | 11 ++++++---
+ .../src/FirefoxOpenSearchDirectoryProvider.cs | 27 +++++++++++++++++++---
+ po/POTFILES.skip | 3 +++
+ 3 files changed, 35 insertions(+), 6 deletions(-)
+ create mode 100644 po/POTFILES.skip
+
+diff --git a/Firefox/src/PlacesItemSource.cs b/Firefox/src/PlacesItemSource.cs
+index 10a215a..a87a7d9 100644
+--- a/Firefox/src/PlacesItemSource.cs
++++ b/Firefox/src/PlacesItemSource.cs
+@@ -161,8 +161,13 @@ namespace Firefox
profile = null;
home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
@@ -29,7 +40,7 @@ Index: gnome-do-plugins/Firefox/src/PlacesItemSource.cs
while ((line = r.ReadLine ()) != null) {
if (line.StartsWith (BeginDefaultProfile)) {
break;
-@@ -173,7 +178,7 @@
+@@ -173,7 +178,7 @@ namespace Firefox
}
}
}
@@ -38,11 +49,11 @@ Index: gnome-do-plugins/Firefox/src/PlacesItemSource.cs
}
-Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
-===================================================================
---- gnome-do-plugins.orig/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2011-02-23 22:28:24.801232770 +1100
-+++ gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs 2011-02-24 10:47:31.594916063 +1100
-@@ -37,6 +37,9 @@
+diff --git a/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs b/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+index 3cf3643..ec4d4fa 100644
+--- a/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
++++ b/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
+@@ -37,6 +37,9 @@ namespace OpenSearch
/// </summary>
public class FirefoxOpenSearchDirectoryProvider
{
@@ -52,7 +63,7 @@ Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
private List<string> openSearchPluginDirectories;
/// <summary>
-@@ -88,11 +91,17 @@
+@@ -88,11 +91,17 @@ namespace OpenSearch
// for installing in different directories. We could certainly shell
// out and call which or something...
string beginLibDir = "LIBDIR=";
@@ -71,7 +82,7 @@ Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
using (StreamReader r = File.OpenText (binFile)) {
while (null != (line = r.ReadLine ())) {
if (line.StartsWith (beginLibDir)) {
-@@ -117,6 +126,18 @@
+@@ -117,6 +126,18 @@ namespace OpenSearch
return null;
}
@@ -90,7 +101,7 @@ Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
/// <summary>
/// Retrieves the profile plugin directory, which is where the
/// user installed OpenSearch plugins are located.
-@@ -134,7 +155,7 @@
+@@ -134,7 +155,7 @@ namespace OpenSearch
profile = null;
@@ -99,7 +110,7 @@ Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
using (StreamReader r = File.OpenText (profilePath)) {
while (null != (line = r.ReadLine ())) {
if (line.StartsWith (beginDefaultProfile)) break;
-@@ -147,7 +168,7 @@
+@@ -147,7 +168,7 @@ namespace OpenSearch
}
if(profile != null) {
@@ -108,10 +119,11 @@ Index: gnome-do-plugins/OpenSearch/src/FirefoxOpenSearchDirectoryProvider.cs
path = Path.Combine (path, profile);
path = Path.Combine (path, "searchplugins");
-Index: gnome-do-plugins/po/POTFILES.skip
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-do-plugins/po/POTFILES.skip 2011-02-24 10:48:49.917749384 +1100
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..2ed5d93
+--- /dev/null
++++ b/po/POTFILES.skip
@@ -0,0 +1,3 @@
+# dh_auto_test runs intltool-extract, which bombs because this isn't
+# in POTFILES.in. Bah!
diff --git a/debian/patches/use_dbussharp_2.patch b/debian/patches/use_dbussharp_2.patch
index a7c2bd4..0f22882 100644
--- a/debian/patches/use_dbussharp_2.patch
+++ b/debian/patches/use_dbussharp_2.patch
@@ -1,8 +1,17 @@
-Index: gnome-do-plugins/configure.ac
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Tue, 18 Nov 2014 10:07:49 +0800
+Subject: use_dbussharp_2
+
===================================================================
---- gnome-do-plugins.orig/configure.ac 2013-10-16 10:23:32.689392590 +0100
-+++ gnome-do-plugins/configure.ac 2013-10-30 17:15:01.713617613 +0000
-@@ -44,7 +44,7 @@
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 166dfd4..db2b685 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,7 +44,7 @@ fi
AC_MSG_RESULT([$BANSHEE_COLLECTION_INDEXER])
AC_MSG_CHECKING([which DBus implementation Banshee.CollectionIndexer requires])
@@ -11,7 +20,7 @@ Index: gnome-do-plugins/configure.ac
BANSHEE_USE_DBUS_SHARP=yes
AC_MSG_RESULT([dbus-sharp])
else
-@@ -53,8 +53,8 @@
+@@ -53,8 +53,8 @@ else
fi
dnl -- DBus# required for Banshee and Telepathy support
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do-plugins.git
More information about the Pkg-cli-apps-commits
mailing list