[Pkg-cli-apps-commits] r4186 - in /packages/gnome-do-plugins/trunk/debian: changelog control patches/02_ssh_respect_exec_arg.dpatch

[raof-guest at users.alioth.debian.org]

Author: raof-guest
Date: Wed Nov  5 20:46:03 2008
New Revision: 4186

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4186
Log:
Address the two bugs waiting on the BTS

Added:
    packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/control

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=4186&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Wed Nov  5 20:46:03 2008
@@ -5,6 +5,8 @@
     + Refresh build-depends
     + Don't Suggest amarok, the plugin is no longer built
     + Bump standards-version, adding a README.Source
+    + Add conflicts for old Ubuntu packages.  Makes my Ubuntu job easier,
+      and apparently some Debian users care too (closes: #486609)
   * debian/rules
     + Remove --disable-banshee and --disable-amarok from the configure flags.
       These plugins are no longer built upstream.
@@ -19,6 +21,10 @@
     + Remove the plugins that depend on the shipped binaries from the build
   * debian/patches/01_firefox_iceweasel_rename
     + Refresh for new version
+  * debian/patches/02_ssh_respect_exec_arg
+    + Respect the terminal's "exec" arg set in gconf.  Patch by
+      Philipp A. Hartmann.  The rest of the patch is superseded by the new
+      upstream version.  (closes: 49777)
   * debian/watch
     + Update for new upstream location, add version mangle for dfsg
   * debian/copyright

Modified: packages/gnome-do-plugins/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/control?rev=4186&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/control (original)
+++ packages/gnome-do-plugins/trunk/debian/control Wed Nov  5 20:46:03 2008
@@ -45,6 +45,8 @@
 Depends: ${cli:Depends}, 
          gnome-do (>= 0.6)
 Recommends: mlocate | slocate | locate
+Conflicts: gnome-do-plugin-amarok, gnome-do-plugin-rhythmbox
+Replaces: gnome-do-plugin-amarok, gnome-do-plugin-rhythmbox
 Suggests: epiphany-browser,
   evolution,
   iceweasel | firefox,

Added: packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch?rev=4186&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/02_ssh_respect_exec_arg.dpatch Wed Nov  5 20:46:03 2008
@@ -1,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_ssh_respect_exec_arg.dpatch by  <ph at sorgh.de>
+##
+## 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.
+
+ at DPATCH@
+
+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;
+ 		}