[Pkg-haskell-commits] darcs: darcs: Historic import 2.3.0-2.

[Trent W. Buck]

Mon Aug 17 04:20:36 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.3.0-2.
  Ignore-this: 41ad5983834a97822c50851884cefa39

    M ./changelog +6
    M ./patches/use-sensible-editor -7 +7

Mon Aug 17 04:20:36 UTC 2009  Trent W. Buck <trentbuck at gmail.com>
  * Historic import 2.3.0-2.
  Ignore-this: 41ad5983834a97822c50851884cefa39
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2010-03-06 11:45:33.262377649 +0000
+++ new-darcs/changelog	2010-03-06 11:45:33.282378710 +0000
@@ -1,3 +1,9 @@
+darcs (2.3.0-2) unstable; urgency=low
+
+  * Avoid gratuitous use of sensible-utils (Closes: #541843).
+
+ -- Trent W. Buck <trentbuck at gmail.com>  Mon, 17 Aug 2009 14:20:36 +1000
+
 darcs (2.3.0-1) unstable; urgency=low
 
   * New upstream release.
diff -rN -u old-darcs/patches/use-sensible-editor new-darcs/patches/use-sensible-editor
--- old-darcs/patches/use-sensible-editor	2010-03-06 11:45:33.262377649 +0000
+++ new-darcs/patches/use-sensible-editor	2010-03-06 11:45:33.262377649 +0000
@@ -1,9 +1,9 @@
-The required package "debianutils" provides sensible-editor and
-sensible-pager, which contain logic to pick the "right" fallback
-values for $EDITOR and $PAGER respectively.
+Follow Debian Policy §11.4 - honour VISUAL, EDITOR and PAGER, but fall
+back on editor and pager respectively.  This allows the sysadmin to
+define site-local editor/pager defaults.  It also means things work
+when less and vi/emacs/nano aren't installed -- which is the case on a
+new Debian installation if you uncheck the "standard" tasksel task.
 
-This patch makes Darcs use these binaries instead of its own
-app-specific fallback logic.
 Index: darcs-2.3.0~beta1/src/Darcs/Utils.hs
 ===================================================================
 --- darcs-2.3.0~beta1.orig/src/Darcs/Utils.hs	2009-06-24 17:13:28.000000000 +1000
@@ -26,7 +26,7 @@
               getEnv "DARCSEDITOR" `catchall`
               getEnv "VISUAL" `catchall`
 -             getEnv "EDITOR" `catchall` return "vi"
-+             getEnv "EDITOR" `catchall` return "sensible-editor"
++             getEnv "EDITOR" `catchall` return "editor"
  
  environmentHelpEditor :: ([String], [String])
  environmentHelpEditor = (["DARCS_EDITOR", "DARCSEDITOR", "VISUAL", "EDITOR"],[
@@ -35,7 +35,7 @@
  get_viewer :: IO String
  get_viewer = getEnv "DARCS_PAGER" `catchall`
 -             getEnv "PAGER" `catchall` return "less"
-+             getEnv "PAGER" `catchall` return "sensible-pager"
++             getEnv "PAGER" `catchall` return "pager"
  
  environmentHelpPager :: ([String], [String])
  environmentHelpPager = (["DARCS_PAGER", "PAGER"],[