[DHG_packages] 01/04: refresh darcs patches

[Sean Whitton]

This is an automated email from the git hooks/post-receive script.

spw-guest pushed a commit to branch LTS-6
in repository DHG_packages.

commit d251f448c7ba1c1573648a0d287f3b9a883435e4
Author: Sean Whitton <spwhitton at spwhitton.name>
Date:   Tue May 31 17:37:01 2016 +0900

    refresh darcs patches
---
 p/darcs/debian/changelog                   |  6 +++++-
 p/darcs/debian/patches/allow-vector-0.11   | 13 ------------
 p/darcs/debian/patches/series              |  1 -
 p/darcs/debian/patches/use-sensible-editor | 32 +++++++++++++-----------------
 4 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/p/darcs/debian/changelog b/p/darcs/debian/changelog
index 12a4ac0..1cfcd64 100644
--- a/p/darcs/debian/changelog
+++ b/p/darcs/debian/changelog
@@ -8,7 +8,11 @@ darcs (2.12.0-1) unstable; urgency=medium
   [ Joachim Breitner ]
   * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 28 May 2016 13:26:54 +0200
+  [ Sean Whitton ]
+  * Refresh patches.
+  * Drop obsolete allow-vector-0.11 patch.
+
+ -- Sean Whitton <spwhitton at spwhitton.name>  Tue, 31 May 2016 17:46:51 +0900
 
 darcs (2.10.2-1) unstable; urgency=medium
 
diff --git a/p/darcs/debian/patches/allow-vector-0.11 b/p/darcs/debian/patches/allow-vector-0.11
deleted file mode 100644
index 89a45cf..0000000
--- a/p/darcs/debian/patches/allow-vector-0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: darcs/darcs.cabal
-===================================================================
---- darcs.orig/darcs.cabal	2016-01-15 14:58:02.313330633 +0100
-+++ darcs/darcs.cabal	2016-01-15 14:58:02.313330633 +0100
-@@ -438,7 +438,7 @@
-                      cryptohash   >= 0.4 && < 0.12,
-                      base16-bytestring >= 0.1 && < 0.2,
-                      utf8-string >= 0.3.6 && < 1.1,
--                     vector       >= 0.7 && < 0.11,
-+                     vector       >= 0.7 && < 0.12,
-                      tar          == 0.4.*,
-                      data-ordlist == 0.4.*,
-                      attoparsec   >= 0.11 && < 0.14,
diff --git a/p/darcs/debian/patches/series b/p/darcs/debian/patches/series
index b099de7..ead731b 100644
--- a/p/darcs/debian/patches/series
+++ b/p/darcs/debian/patches/series
@@ -1,3 +1,2 @@
 use-sensible-editor
 avoid-TH-in-Setup
-allow-vector-0.11
diff --git a/p/darcs/debian/patches/use-sensible-editor b/p/darcs/debian/patches/use-sensible-editor
index e69415e..e4274ae 100644
--- a/p/darcs/debian/patches/use-sensible-editor
+++ b/p/darcs/debian/patches/use-sensible-editor
@@ -9,11 +9,9 @@ Description:    use editor(1) and pager(1) instead of specific editors/pagers.
  uncheck the "standard" tasksel task.
  .
  Not forwarded because editor(1) and pager(1) are Debian-specific.
-Index: darcs-2.10.0/src/Darcs/UI/External.hs
-===================================================================
---- darcs-2.10.0.orig/src/Darcs/UI/External.hs	2015-05-25 12:04:33.571791462 +0200
-+++ darcs-2.10.0/src/Darcs/UI/External.hs	2015-05-25 12:07:46.117213727 +0200
-@@ -438,6 +438,7 @@
+--- a/src/Darcs/UI/External.hs
++++ b/src/Darcs/UI/External.hs
+@@ -432,6 +432,7 @@ viewDocWith pr mode msg = do
                    Nothing -> return $ ExitFailure 127 -- No such command
                 -- TEMPORARY passing the -K option should be removed as soon as
                 -- we can use the delegate_ctrl_c feature in process
@@ -21,7 +19,7 @@ Index: darcs-2.10.0/src/Darcs/UI/External.hs
                 `ortryrunning` pipeDocToPager  "less" ["-RK"] pr mode msg
                 `ortryrunning` pipeDocToPager  "more" [] pr mode msg
  #ifdef WIN32
-@@ -518,19 +519,13 @@
+@@ -512,19 +513,13 @@ runEditor :: FilePath
  runEditor f = do
      ed <- getEditor
      execInteractive ed f
@@ -31,22 +29,20 @@ Index: darcs-2.10.0/src/Darcs/UI/External.hs
 -#ifdef WIN32
 -         `ortryrunning` execInteractive "edit" f
 -#endif
-
-
+ 
+ 
  getEditor :: IO String
  getEditor = getEnv "DARCS_EDITOR" `catchall`
               getEnv "DARCSEDITOR" `catchall`
               getEnv "VISUAL" `catchall`
 -             getEnv "EDITOR" `catchall` return "nano"
 +             getEnv "EDITOR" `catchall` return "editor"
-
+ 
  catchall :: IO a
           -> IO a
-Index: darcs-2.10.0/src/Darcs/UI/Commands/Help.hs
-===================================================================
---- darcs-2.10.0.orig/src/Darcs/UI/Commands/Help.hs	2015-05-25 12:04:33.575791492 +0200
-+++ darcs-2.10.0/src/Darcs/UI/Commands/Help.hs	2015-05-25 12:09:14.421858922 +0200
-@@ -399,15 +399,13 @@
+--- a/src/Darcs/UI/Commands/Help.hs
++++ b/src/Darcs/UI/Commands/Help.hs
+@@ -400,15 +400,13 @@ environmentHelpEditor = (["DARCS_EDITOR"
   "To edit a patch description of email comment, Darcs will invoke an",
   "external editor.  Your preferred editor can be set as any of the",
   "environment variables $DARCS_EDITOR, $DARCSEDITOR, $VISUAL or $EDITOR.",
@@ -54,13 +50,13 @@ Index: darcs-2.10.0/src/Darcs/UI/Commands/Help.hs
 - "found in your PATH, emacs, emacs -nw, nano and (on Windows) edit are",
 - "each tried in turn."])
 + "If none of these are set, editor(1) is used."])
-
+ 
  environmentHelpPager :: ([String], [String])
  environmentHelpPager = (["DARCS_PAGER", "PAGER"],[
-  "Darcs will sometimes invoke a pager if it deems output to be too long",
-  "to fit onscreen.  Darcs will use the pager specified by $DARCS_PAGER",
+  "Darcs will invoke a pager if the output of some command is longer",
+  "than 20 lines. Darcs will use the pager specified by $DARCS_PAGER",
 - "or $PAGER.  If neither are set, `less` will be used."])
 + "or $PAGER.  If neither are set, pager(1) will be used."])
-
+ 
  environmentHelpTimeout :: ([String], [String])
  environmentHelpTimeout = (["DARCS_CONNECTION_TIMEOUT"],[

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git