[Pkg-haskell-commits] darcs: darcs: New upstream release

Joachim Breitner mail at joachim-breitner.de
Mon May 25 10:21:10 UTC 2015 

Mon May 25 10:15:19 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release

    M ./changelog +6
    M ./control -23 +38
    M ./patches/relax-terminfo-dependency -14 +5
    M ./patches/series -1 +1
    M ./patches/use-sensible-editor -19 +25
    M ./rules -1 +1

Mon May 25 10:15:19 UTC 2015  Joachim Breitner <mail at joachim-breitner.de>
  * New upstream release
diff -rN -u old-darcs/changelog new-darcs/changelog
--- old-darcs/changelog	2015-05-25 10:21:10.091862924 +0000
+++ new-darcs/changelog	2015-05-25 10:21:10.107863325 +0000
@@ -1,3 +1,9 @@
+darcs (2.10.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 25 May 2015 11:50:11 +0200
+
 darcs (2.8.5-3) unstable; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
diff -rN -u old-darcs/control new-darcs/control
--- old-darcs/control	2015-05-25 10:21:10.091862924 +0000
+++ new-darcs/control	2015-05-25 10:21:10.099863125 +0000
@@ -8,34 +8,49 @@
  ghc (>= 7.4),
  bash-completion (>= 1:1.1),
  libcurl4-gnutls-dev (>= 7.19.1),
- libghc-hashed-storage-dev (>= 0.5.6),
- libghc-hashed-storage-dev (<< 0.6),
+ pkg-config,
+ libghc-regex-compat-tdfa-dev (>= 0.95.1),
+ libghc-regex-compat-tdfa-dev (<< 0.96),
+ libghc-regex-applicative-dev (>= 0.2),
+ libghc-regex-applicative-dev (<< 0.4),
+ libghc-mtl-dev (>= 2.1),
+ libghc-mtl-dev (<< 2.3),
+ libghc-transformers-compat-dev (>= 0.4),
+ libghc-transformers-compat-dev (<< 0.5),
+ libghc-parsec3-dev (>= 3.1),
+ libghc-parsec3-dev (<< 3.2),
  libghc-html-dev (>= 1.0),
  libghc-html-dev (<< 1.1),
- libghc-http-dev (>= 1:4000.0.8),
- libghc-http-dev (<< 1:4000.3),
+ libghc-cryptohash-dev (>= 0.4),
+ libghc-cryptohash-dev (<< 0.12),
+ libghc-base16-bytestring-dev (>= 0.1),
+ libghc-base16-bytestring-dev (<< 0.2),
+ libghc-utf8-string-dev (>= 0.3.6),
+ libghc-utf8-string-dev (<< 1.1),
+ libghc-vector-dev (>= 0.7),
+ libghc-vector-dev (<< 0.11),
+ libghc-tar-dev (>= 0.4),
+ libghc-tar-dev (<< 0.5),
+ libghc-data-ordlist-dev (>= 0.4),
+ libghc-data-ordlist-dev (<< 0.5),
+ libghc-attoparsec-dev (>= 0.11),
+ libghc-attoparsec-dev (<< 0.13),
+ libghc-zip-archive-dev (>= 0.2.3),
+ libghc-zip-archive-dev (<< 0.3),
+ libghc-text-dev (>= 0.11.2.0),
+ libghc-text-dev (<< 1.3),
+ libghc-random-dev (>= 1.0),
+ libghc-random-dev (<< 1.2),
+ libghc-hashable-dev (>= 1.0),
+ libghc-hashable-dev (<< 1.3),
  libghc-mmap-dev (>= 0.5),
  libghc-mmap-dev (<< 0.6),
- libghc-mtl-dev (>= 1.0),
- libghc-mtl-dev (<< 2.3),
- libghc-network-dev (>= 2.6),
- libghc-network-uri-dev (>= 2.6),
- libghc-parsec3-dev (>= 2.0),
- libghc-parsec3-dev (<< 3.2),
- libghc-random-dev (>= 1.0),
- libghc-random-dev (<< 1.1),
- libghc-regex-compat-dev (>= 0.95.1),
- libghc-tar-dev (>= 0.3),
- libghc-tar-dev (<< 0.5),
- libghc-text-dev (>= 0.11.0.6),
- libghc-text-dev (<< 1.2),
- libghc-vector-dev (>= 0.7),
- libghc-utf8-string-dev (>= 0.3.6),
- libghc-utf8-string-dev (<< 0.4),
- libghc-zlib-dev (>= 0.5.1.0),
+ libghc-zlib-dev (>= 0.5.3.0),
  libghc-zlib-dev (<< 0.6.0.0),
-Build-Conflicts:
- libghc-parsec2-dev,
+ libghc-dataenc-dev (>= 0.11),
+ libghc-dataenc-dev (<< 0.15),
+ libghc-unix-compat-dev (>= 0.1.2),
+ libghc-unix-compat-dev (<< 0.5),
 Homepage: http://darcs.net/
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/darcs
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/darcs
diff -rN -u old-darcs/patches/relax-terminfo-dependency new-darcs/patches/relax-terminfo-dependency
--- old-darcs/patches/relax-terminfo-dependency	2015-05-25 10:21:10.091862924 +0000
+++ new-darcs/patches/relax-terminfo-dependency	2015-05-25 10:21:10.099863125 +0000
@@ -1,8 +1,8 @@
-Index: darcs-2.8.5/darcs.cabal
+Index: darcs-2.10.0/darcs.cabal
 ===================================================================
---- darcs-2.8.5.orig/darcs.cabal	2015-05-07 10:43:00.655962113 +0200
-+++ darcs-2.8.5/darcs.cabal	2015-05-07 10:43:58.365565650 +0200
-@@ -453,7 +453,7 @@
+--- darcs-2.10.0.orig/darcs.cabal	2015-05-25 12:04:42.223855913 +0200
++++ darcs-2.10.0/darcs.cabal	2015-05-25 12:13:32.567727009 +0200
+@@ -501,7 +501,7 @@
  
      -- The terminfo package cannot be built on Windows.
      if flag(terminfo) && !os(windows)
@@ -10,13 +10,4 @@
 +      build-depends:    terminfo >= 0.3
        cpp-options:      -DHAVE_TERMINFO
  
-     if flag(color)
-@@ -616,7 +616,7 @@
- 
-   -- The terminfo package cannot be built on Windows.
-   if flag(terminfo) && !os(windows)
--    build-depends:    terminfo == 0.3.*
-+    build-depends:    terminfo >= 0.3
-     cpp-options:      -DHAVE_TERMINFO
- 
-   if flag(color)
+     -- if true to work around cabal bug with flag ordering
diff -rN -u old-darcs/patches/series new-darcs/patches/series
--- old-darcs/patches/series	2015-05-25 10:21:10.091862924 +0000
+++ new-darcs/patches/series	2015-05-25 10:21:10.099863125 +0000
@@ -1,2 +1,2 @@
-relax-terminfo-dependency
 use-sensible-editor
+relax-terminfo-dependency
diff -rN -u old-darcs/patches/use-sensible-editor new-darcs/patches/use-sensible-editor
--- old-darcs/patches/use-sensible-editor	2015-05-25 10:21:10.091862924 +0000
+++ new-darcs/patches/use-sensible-editor	2015-05-25 10:21:10.099863125 +0000
@@ -9,52 +9,58 @@
  uncheck the "standard" tasksel task.
  .
  Not forwarded because editor(1) and pager(1) are Debian-specific.
-Index: darcs-experimental/src/Darcs/Utils.hs
+Index: darcs-2.10.0/src/Darcs/UI/External.hs
 ===================================================================
---- darcs-experimental.orig/src/Darcs/Utils.hs	2012-04-01 10:29:45.000000000 +0100
-+++ darcs-experimental/src/Darcs/Utils.hs	2012-04-02 19:42:31.288740993 +0100
-@@ -319,19 +319,12 @@
+--- 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 @@
+                   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
++               `ortryrunning` pipeDocToPager  "pager" [] pr mode msg
+                `ortryrunning` pipeDocToPager  "less" ["-RK"] pr mode msg
+                `ortryrunning` pipeDocToPager  "more" [] pr mode msg
+ #ifdef WIN32
+@@ -518,19 +519,13 @@
  runEditor f = do
      ed <- getEditor
      execInteractive ed f
+-         `ortryrunning` execInteractive "vi" f
 -         `ortryrunning` execInteractive "emacs" f
 -         `ortryrunning` execInteractive "emacs -nw" f
--         `ortryrunning` execInteractive "nano" f
 -#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 "vi"
+-             getEnv "EDITOR" `catchall` return "nano"
 +             getEnv "EDITOR" `catchall` return "editor"
  
- 
- environmentHelpEditor :: ([String], [String])
-@@ -339,20 +332,17 @@
+ 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 @@
   "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.",
 - "If none of these are set, vi(1) is used.  If vi crashes or is not",
 - "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."])
  
- getViewer :: IO String
- getViewer = getEnv "DARCS_PAGER" `catchall`
--             getEnv "PAGER" `catchall` return "less"
-+             getEnv "PAGER" `catchall` return "pager"
- 
  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",
-- "or $PAGER.  If neither are set, `less' will be used."])
+- "or $PAGER.  If neither are set, `less` will be used."])
 + "or $PAGER.  If neither are set, pager(1) will be used."])
  
- data PromptConfig = PromptConfig { pPrompt :: String
-                                  , pBasicCharacters :: [Char]
+ environmentHelpTimeout :: ([String], [String])
+ environmentHelpTimeout = (["DARCS_CONNECTION_TIMEOUT"],[
diff -rN -u old-darcs/rules new-darcs/rules
--- old-darcs/rules	2015-05-25 10:21:10.087862824 +0000
+++ new-darcs/rules	2015-05-25 10:21:10.099863125 +0000
@@ -7,7 +7,7 @@
 
 DEB_INSTALL_CHANGELOGS_ALL=NEWS
 
-DEB_SETUP_GHC_CONFIGURE_ARGS=$(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) -flibrary -fforce-char8-encoding -fcurl -fterminfo -fmmap --ghc-options="+RTS -V0 -RTS"
+DEB_SETUP_GHC_CONFIGURE_ARGS=$(if $(wildcard /usr/lib/*/libHSrts_thr.a),,-f-threaded) -fpkgconfig -fcurl -f-http -fterminfo --ghc-options="+RTS -V0 -RTS"
 
 binary-post-install/darcs::
 	dh_bash-completion

More information about the Pkg-haskell-commits mailing list