[Pkg-haskell-commits] darcs: haskell-pandoc-citeproc: Refresh patches

Joachim Breitner mail at joachim-breitner.de
Sat Apr 26 10:47:41 UTC 2014


Sat Apr 26 10:47:33 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches

    M ./patches/disable-no-author-test -5 +7
    M ./patches/tweak-biblio2yaml-test -6 +17

Sat Apr 26 10:47:33 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
diff -rN -u old-haskell-pandoc-citeproc/patches/disable-no-author-test new-haskell-pandoc-citeproc/patches/disable-no-author-test
--- old-haskell-pandoc-citeproc/patches/disable-no-author-test	2014-04-26 10:47:41.813306170 +0000
+++ new-haskell-pandoc-citeproc/patches/disable-no-author-test	2014-04-26 10:47:41.817306169 +0000
@@ -1,11 +1,13 @@
---- a/tests/test-pandoc-citeproc.hs
-+++ b/tests/test-pandoc-citeproc.hs
+Index: haskell-pandoc-citeproc-0.3.0.1/tests/test-pandoc-citeproc.hs
+===================================================================
+--- haskell-pandoc-citeproc-0.3.0.1.orig/tests/test-pandoc-citeproc.hs	2014-04-26 12:46:58.563769959 +0200
++++ haskell-pandoc-citeproc-0.3.0.1/tests/test-pandoc-citeproc.hs	2014-04-26 12:47:07.791769568 +0200
 @@ -24,7 +24,7 @@
  
  main = do
    citeprocTests <- mapM testCase ["chicago-author-date", "ieee", "mhra",
--                                  "number-of-volumes", "no-author"]
-+                                  "number-of-volumes" {-, "no-author"-}]
+-                                  "number-of-volumes", "no-author", "issue7",
++                                  "number-of-volumes", {- "no-author", -} "issue7",
+                                   "issue13", "issue14"]
    fs <- filter (\f -> takeExtension f `elem` [".bibtex",".biblatex"])
             `fmap` getDirectoryContents "tests/biblio2yaml"
-   biblio2yamlTests <- mapM biblio2yamlTest fs
diff -rN -u old-haskell-pandoc-citeproc/patches/tweak-biblio2yaml-test new-haskell-pandoc-citeproc/patches/tweak-biblio2yaml-test
--- old-haskell-pandoc-citeproc/patches/tweak-biblio2yaml-test	2014-04-26 10:47:41.813306170 +0000
+++ new-haskell-pandoc-citeproc/patches/tweak-biblio2yaml-test	2014-04-26 10:47:41.817306169 +0000
@@ -1,11 +1,22 @@
---- a/tests/test-pandoc-citeproc.hs
-+++ b/tests/test-pandoc-citeproc.hs
-@@ -89,7 +89,7 @@
+Index: haskell-pandoc-citeproc-0.3.0.1/tests/test-pandoc-citeproc.hs
+===================================================================
+--- haskell-pandoc-citeproc-0.3.0.1.orig/tests/test-pandoc-citeproc.hs	2014-04-26 12:46:09.519772037 +0200
++++ haskell-pandoc-citeproc-0.3.0.1/tests/test-pandoc-citeproc.hs	2014-04-26 12:46:20.627771567 +0200
+@@ -61,7 +61,7 @@
+ 
+   (ec, jsonOut, errout) <- pipeProcess
+                      (Just [("LANG","en_US.UTF-8"),("HOME",".")])
+-                     "dist/build/pandoc-citeproc/pandoc-citeproc"
++                     "dist-ghc/build/pandoc-citeproc/pandoc-citeproc"
+                      [] jsonIn
+   if ec == ExitSuccess
+      then do
+@@ -102,7 +102,7 @@
    let expected = BL.unlines yamllines
    (ec, result, errout) <- pipeProcess
                       (Just [("LANG","en_US.UTF-8"),("HOME",".")])
--                     "dist/build/biblio2yaml/biblio2yaml"
-+                     "dist-ghc/build/biblio2yaml/biblio2yaml"
-                      ["-f", drop 1 $ takeExtension fp] bib
+-                     "dist/build/pandoc-citeproc/pandoc-citeproc"
++                     "dist-ghc/build/pandoc-citeproc/pandoc-citeproc"
+                      ["bib2yaml", "-f", drop 1 $ takeExtension fp] bib
    if ec == ExitSuccess
       then do




More information about the Pkg-haskell-commits mailing list