From 4d70deefd82cb1d0c9e6369396dd07d613886014 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 23 Sep 2009 00:46:44 +0200 Subject: [PATCH] Refreshed debian/patches/sensible-editor.diff Changed debian/patches/sensible-editor.diff so that it applies again after commit e1a36263bf9aa2c0a2e518b52667fd0ef4c411de ("whitespace" from Sat, 19 Sep 2009 19:14:22 +0000) --- debian/changelog | 6 ++++-- debian/patches/sensible-editor.diff | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 16 deletions(-) rewrite debian/patches/sensible-editor.diff (61%) diff --git a/debian/changelog b/debian/changelog index 7ebf89e..39b75d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -conkeror (0.9~git090719-1) UNRELEASED; urgency=low +conkeror (0.9~git090923-1) UNRELEASED; urgency=low * New upstream snapshot * Added alternative dependency on xulrunner-1.9.1 @@ -6,8 +6,10 @@ conkeror (0.9~git090719-1) UNRELEASED; urgency=low symlinked xulrunner-stub (symlinking xulrunner-stub only works with Debian's xulrunner-stub), so that xulrunner can decide which version of xulrunner is actually used. + * Refreshed debian/patches/sensible-editor.diff after upstream + whitespace changes. - -- Axel Beckert Sun, 19 Jul 2009 02:31:28 +0200 + -- Axel Beckert Wed, 23 Sep 2009 00:42:23 +0200 conkeror (0.9~git090624-1) unstable; urgency=low diff --git a/debian/patches/sensible-editor.diff b/debian/patches/sensible-editor.diff dissimilarity index 61% index 8d92426..8e2e9c9 100644 --- a/debian/patches/sensible-editor.diff +++ b/debian/patches/sensible-editor.diff @@ -1,14 +1,14 @@ -Let Debian's sensible-editor guess the editor. -Index: conkeror-0.9~git080819/modules/external-editor.js -=================================================================== ---- conkeror-0.9~git080819.orig/modules/external-editor.js 2008-08-19 20:37:21.000000000 +0200 -+++ conkeror-0.9~git080819/modules/external-editor.js 2008-08-19 20:44:21.000000000 +0200 -@@ -5,7 +5,7 @@ - * COPYING file. - **/ - --define_variable("editor_shell_command", getenv("VISUAL") || getenv("EDITOR") || "emacs", -+define_variable("editor_shell_command", "/usr/bin/sensible-editor", - "Shell command used to invoke an external editor.\n" + - "This defaults to the value of the EDITOR environment variable. If " + - "`run_external_editor_function' is non-null, it is used instead to " + +Let Debian's sensible-editor guess the editor. +Index: conkeror-0.9~git090923/modules/external-editor.js +=================================================================== +--- conkeror-0.9~git090923.orig/modules/external-editor.js 2009-09-23 00:36:26.000000000 +0200 ++++ conkeror-0.9~git090923/modules/external-editor.js 2009-09-23 00:39:48.000000000 +0200 +@@ -5,7 +5,7 @@ + * COPYING file. + **/ + +-define_variable("editor_shell_command", getenv("VISUAL") || getenv("EDITOR") || "emacs", ++define_variable("editor_shell_command", "/usr/bin/sensible-editor", + "Shell command used to invoke an external editor.\n" + + "This defaults to the value of the EDITOR environment variable. If " + + "`run_external_editor_function' is non-null, it is used instead to " + -- 2.11.4.GIT