Package: gnome-do-plugins
Version: 0.4.0-1
Severity: normal
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi there,
the attached patch fixes several minor issues with the Gnome Do plugins:
+ Google calculator plugin broken:
The pattern used to find the calculator's answer in the
Google result seems to have changed. I've seen the additional
attribute dir=ltr in the response, which has been added to the
plugin, too. See patch 02_calculator_fix_match.dpatch.
+ SSH plugin:
The plugin reads the GConf key
/desktop/gnome/applications/terminal/exec
to determine the correct x-terminal to run.
But command-line switch '-e' is hard-coded, instead of using the
corresponding exec_arg GConf key.
The patch 03_ssh_respect_exec_arg.dpatch fixes that.
+ Locate Files Plugin
In the Locate Files plugin, the locate command is called with the
'-n' switch, which is not supported in Debian's locate.findutils.
04_locate_limit_switch.dpatch changes this to "--limit=".
Additionally, the debian/rules have been changed slightly to actually
apply the dpatches during the automatic build of the package.
You might consider to apply these changes. I've tested them
successfully on my machine. If you need the files/patches separately,
please drop me a note.
Kind regards,
Philipp
- -- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (100, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/2 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages gnome-do-plugins depends on:
ii gnome-do 0.4.2.0-1 Quickly perform actions on your de
ii libevolution3.0-cil 0.17.1-2 CLI bindings for Evolution
ii libgconf2.0-cil 2.20.1-1 CLI binding for GConf 2.20
ii libglib2.0-cil 2.12.1-1 CLI binding for the GLib utility l
ii libgtk2.0-cil 2.12.1-1 CLI binding for the GTK+ toolkit 2
ii libmono-corlib2.0-cil 1.9.1+dfsg-3 Mono core library (2.0)
ii libmono-system-web2.0-cil 1.9.1+dfsg-3 Mono System.Web Library
ii libmono-system2.0-cil 1.9.1+dfsg-3 Mono System libraries (2.0)
ii libmono2.0-cil 1.9.1+dfsg-3 Mono libraries (2.0)
ii libndesk-dbus1.0-cil 0.6.0-1 CLI implementation of D-Bus
Versions of packages gnome-do-plugins recommends:
ii locate 4.4.0-2 maintain and query an index of a d
Versions of packages gnome-do-plugins suggests:
pn amarok <none> (no description available)
pn epiphany-browser <none> (no description available)
ii evolution 2.22.3.1-1 groupware suite with mail client a
ii icedove 2.0.0.16-1 free/unbranded thunderbird mail/ne
ii iceweasel 3.0.1-1 lightweight web browser based on M
pn pidgin <none> (no description available)
pn rhythmbox <none> (no description available)
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAki/oTkACgkQ9b6cuoMzU12aPgCbBVuTQDgrov0Rx9UEQtLt/ueh
snIAnjvXL/Kzrs+GAQ9ow2ucZcV1iwu1
=4mVT
-----END PGP SIGNATURE-----
diff -u gnome-do-plugins-0.4.0/debian/rules gnome-do-plugins-0.4.0/debian/rules
--- gnome-do-plugins-0.4.0/debian/rules
+++ gnome-do-plugins-0.4.0/debian/rules
@@ -10,15 +10,16 @@
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh build --before configure
# disable some plugins as requested by upstream
dh_auto_configure -- --disable-banshee-plugin --disable-amarok-plugin
dh build --after configure
touch $@
-clean: unpatch
- dh $@
+clean: clean-patched unpatch
+clean-patched:
+ dh clean
install: build
dh $@
@@ -44,4 +44,0 @@
-
-%:
- dh $@
-
\ No newline at end of file
diff -u gnome-do-plugins-0.4.0/debian/changelog gnome-do-plugins-0.4.0/debian/changelog
--- gnome-do-plugins-0.4.0/debian/changelog
+++ gnome-do-plugins-0.4.0/debian/changelog
@@ -1,3 +1,18 @@
+gnome-do-plugins (0.4.0-1.pha1) unstable; urgency=low
+
+ * Local build.
+ * debian/rules:
+ + Actually apply patches during before building the package.
+ + Remove no longer needed 'match-all' target.
+ * debian/patches/02_google_calculator_match_reply.dpatch:
+ + Patch to fix Google Calculator result matching
+ * debian/patches/03_ssh_respect_exec_arg.dpatch:
+ + Patch to add GConf key '.../exec_arg' to terminal invocation
+ * debian/patches/04_locate_limit_switch.dpatch
+ + Patch to use '--limit' instead of '-n' in locate call
+
+ -- Philipp A. Hartmann <[EMAIL PROTECTED]> Thu, 04 Sep 2008 01:30:57 +0200
+
gnome-do-plugins (0.4.0-1) unstable; urgency=low
* Initial Debian package (closes: #480673)
diff -u gnome-do-plugins-0.4.0/debian/patches/00list gnome-do-plugins-0.4.0/debian/patches/00list
--- gnome-do-plugins-0.4.0/debian/patches/00list
+++ gnome-do-plugins-0.4.0/debian/patches/00list
@@ -1 +1,4 @@
-01_firefox_iceweasel_rename
\ No newline at end of file
+01_firefox_iceweasel_rename
+02_google_calculator_match_reply
+03_ssh_respect_exec_arg
+04_locate_limit_switch
only in patch2:
unchanged:
--- gnome-do-plugins-0.4.0.orig/debian/patches/04_locate_limit_switch.dpatch
+++ gnome-do-plugins-0.4.0/debian/patches/04_locate_limit_switch.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_locate_limit_switch.dpatch by <[EMAIL PROTECTED]>
+##
+## DP: Locate files plugin: use '--limit' instead of '-n' switch
+## DP:
+## DP: Debian's 'locate' command does not support the '-n' switch.
+## DP: Instead, the long option '--limit' can be used to limit
+## DP: the number of returned hits.
+
+
[EMAIL PROTECTED]@
+
+--- gnome-do-plugins-0.4.0/LocateFilesAction.cs 2008-09-04 09:57:21.000000000 +0200
++++ gnome-do-plugins-0.4.0.new/LocateFiles/LocateFilesAction.cs 2008-09-04 09:56:15.000000000 +0200
+@@ -65,7 +65,7 @@
+
+ locate = new System.Diagnostics.Process ();
+ locate.StartInfo.FileName = "locate";
+- locate.StartInfo.Arguments = string.Format ("-i -n {0} \"{1}\"", maxResults, query);
++ locate.StartInfo.Arguments = string.Format ("-i --limit={0} \"{1}\"", maxResults, query);
+ locate.StartInfo.RedirectStandardOutput = true;
+ locate.StartInfo.UseShellExecute = false;
+ try {
only in patch2:
unchanged:
--- gnome-do-plugins-0.4.0.orig/debian/patches/02_google_calculator_match_reply.dpatch
+++ gnome-do-plugins-0.4.0/debian/patches/02_google_calculator_match_reply.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_calculator_fix_match.dpatch by <[EMAIL PROTECTED]>
+##
+## DP: Fix Google Calculator result matching
+## DP:
+## DP: Added "dir=ltr" to begin of reply pattern, since this seems
+## DP: to be included in the Google's reply now.
+
[EMAIL PROTECTED]@
+
+diff -urNad gnome-do-plugins-0.4.0/GoogleCalculator/GoogleCalculatorAction.cs gnome-do-plugins-0.4.0.new/GoogleCalculator/GoogleCalculatorAction.cs
+--- gnome-do-plugins-0.4.0/GoogleCalculator/GoogleCalculatorAction.cs 2008-03-14 10:01:34.000000000 +0100
++++ gnome-do-plugins-0.4.0.new/GoogleCalculator/GoogleCalculatorAction.cs 2008-09-04 00:28:48.000000000 +0200
+@@ -31,7 +31,7 @@
+ {
+
+ const string BeginCalculator = "<img src=/images/calc_img.gif";
+- const string BeginReply = "<td nowrap><h2 class=r><font size=+1><b>";
++ const string BeginReply = "<td nowrap dir=ltr><h2 class=r><font size=+1><b>";
+ const string EndReply = "</b>";
+
+ public GoogleCalculatorAction ()
only in patch2:
unchanged:
--- gnome-do-plugins-0.4.0.orig/debian/patches/03_ssh_respect_exec_arg.dpatch
+++ gnome-do-plugins-0.4.0/debian/patches/03_ssh_respect_exec_arg.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_ssh_respect_exec_arg.dpatch by <[EMAIL PROTECTED]>
+##
+## DP: SSH plugin: respect exec_arg
+## DP:
+## DP: Previously, the SSH plugin did not pass the correct 'exec_arg'
+## DP: argument to the called x-terminal program. This patch retrieves
+## DP: the corresponding key from GConf and falls back to the '-e' default,
+## DP: only if the key could net be read.
+
[EMAIL PROTECTED]@
+
+diff -x debian -urNad gnome-do-plugins-0.4.0/SSH/SSHAction.cs gnome-do-plugins-0.4.0.new/SSH/SSHAction.cs
+--- gnome-do-plugins-0.4.0/SSH/SSHAction.cs 2008-03-14 10:01:34.000000000 +0100
++++ gnome-do-plugins-0.4.0.new/SSH/SSHAction.cs 2008-09-04 00:26:11.000000000 +0200
+@@ -68,7 +68,15 @@
+ catch {
+ exec = "gnome-terminal";
+ }
+-
++
++ string exec_arg;
++ try {
++ exec_arg = client.Get ("/desktop/gnome/applications/terminal/exec_arg") as string;
++ }
++ catch {
++ exec_arg = "-e";
++ }
++
+ string hostname;
+
+ if (items [0] is ITextItem) {
+@@ -82,7 +90,7 @@
+
+ Process term = new Process ();
+ term.StartInfo.FileName = exec;
+- term.StartInfo.Arguments = "-e 'ssh " + hostname + "'";
++ term.StartInfo.Arguments = exec_arg + " 'ssh " + hostname + "'";
+ term.Start ();
+ return null;
+ }
