[Pkg-haskell-commits] darcs: gitit: New upstream version 0.10.4.
Clint Adams
clint at debian.org
Tue Jul 1 00:39:53 UTC 2014
Tue Jul 1 00:39:24 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.10.4.
M ./changelog +6
M ./control -11 +18
R ./patches/newer-pandoc
M ./patches/series -1
Tue Jul 1 00:39:24 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.10.4.
diff -rN -u old-gitit/changelog new-gitit/changelog
--- old-gitit/changelog 2014-07-01 00:39:53.195297962 +0000
+++ new-gitit/changelog 2014-07-01 00:39:53.199297967 +0000
@@ -1,3 +1,9 @@
+gitit (0.10.4-1) UNRELEASED; urgency=medium
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Mon, 30 Jun 2014 20:08:58 -0400
+
gitit (0.10.3.1-6) unstable; urgency=medium
[ Joachim Breitner ]
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control 2014-07-01 00:39:53.195297962 +0000
+++ new-gitit/control 2014-07-01 00:39:53.199297967 +0000
@@ -9,16 +9,16 @@
haskell-devscripts (>= 0.8.19),
cdbs,
ghc,
- pandoc (>= 1.9.0.5),
+ pandoc (>= 1.12.4),
xsltproc,
docbook-xsl
# -dev dependencies
, libghc-parsec3-dev
, libghc-pretty-dev
, libghc-xhtml-dev
- , libghc-pandoc-dev (>= 1.12)
+ , libghc-pandoc-dev (>= 1.12.4)
, libghc-pandoc-dev (<< 1.13)
- , libghc-pandoc-types-dev (>= 1.12)
+ , libghc-pandoc-types-dev (>= 1.12.3)
, libghc-pandoc-types-dev (<< 1.13)
, libghc-mtl-dev
, libghc-cgi-dev
@@ -26,8 +26,8 @@
, libghc-highlighting-kate-dev (<< 0.6)
, libghc-text-dev
, libghc-random-dev
- , libghc-network-dev (>= 2.1.0.0)
- , libghc-network-dev (<< 2.5)
+ , libghc-network-dev (>= 2.3)
+ , libghc-network-dev (<< 2.6)
, libghc-utf8-string-dev (>= 0.3)
, libghc-utf8-string-dev (<< 0.4)
, libghc-sha-dev (>= 1)
@@ -37,14 +37,14 @@
, libghc-hstringtemplate-dev (>= 0.6)
, libghc-hstringtemplate-dev (<< 0.8)
, libghc-recaptcha-dev (>= 0.1)
- , libghc-filestore-dev (>> 0.5)
+ , libghc-filestore-dev (>= 0.6)
, libghc-filestore-dev (<< 0.7)
, libghc-zlib-dev (>= 0.5)
, libghc-zlib-dev (<< 0.6)
, libghc-url-dev (>= 2.1)
, libghc-url-dev (<< 2.2)
, libghc-happstack-server-dev (>= 7.0)
- , libghc-happstack-server-dev (<< 7.2)
+ , libghc-happstack-server-dev (<< 7.4)
, libghc-base64-bytestring-dev (>= 0.1)
, libghc-base64-bytestring-dev (<< 1.1)
, libghc-xml-dev (>= 1.3.5)
@@ -59,11 +59,14 @@
, libghc-tagsoup-dev (>= 0.13)
, libghc-tagsoup-dev (<< 0.14)
, libghc-blaze-html-dev (>= 0.4)
- , libghc-blaze-html-dev (<< 0.7)
+ , libghc-blaze-html-dev (<< 0.8)
, libghc-json-dev (>= 0.4)
, libghc-json-dev (<< 0.8)
, libghc-ghc-paths-dev
, libghc-safe-dev
+ , libghc-uri-dev (>= 0.1)
+ , libghc-uri-dev (<< 0.2)
+ , libghc-split-dev
# -prof dependencies
, libghc-parsec3-prof
, libghc-pretty-prof
@@ -77,8 +80,8 @@
, libghc-random-prof
, libghc-network-prof
, libghc-utf8-string-prof
- , libghc-sha-prof
- , libghc-http-prof
+ , libghc-sha-prof
+ , libghc-http-prof
, libghc-hstringtemplate-prof
, libghc-recaptcha-prof
, libghc-filestore-prof
@@ -96,6 +99,8 @@
, libghc-json-prof
, libghc-ghc-paths-prof
, libghc-safe-prof
+ , libghc-uri-prof
+ , libghc-split-prof
Build-Depends-Indep: ghc-doc
# -doc dependencies
, libghc-parsec3-doc
@@ -129,7 +134,9 @@
, libghc-json-doc
, libghc-ghc-paths-doc
, libghc-safe-doc
-Standards-Version: 3.9.4
+ , libghc-uri-doc
+ , libghc-split-doc
+Standards-Version: 3.9.5
Homepage: http://hackage.haskell.org/package/gitit
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/gitit
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/gitit
diff -rN -u old-gitit/patches/newer-pandoc new-gitit/patches/newer-pandoc
--- old-gitit/patches/newer-pandoc 2014-07-01 00:39:53.195297962 +0000
+++ new-gitit/patches/newer-pandoc 1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-From 48155008397bdaed4f97c5678d83c70d4bc3f0ff Mon Sep 17 00:00:00 2001
-From: John MacFarlane <fiddlosopher at gmail.com>
-Date: Sat, 14 Sep 2013 19:24:01 -0700
-Subject: [PATCH 2/3] Changes to allow compilation with pandoc 1.12.
-
-TODO: Better handling of images and other resources in
-Docx, ODT, PDF exports.
----
- Network/Gitit/ContentTransformer.hs | 8 +++++---
- Network/Gitit/Export.hs | 4 ++--
- Network/Gitit/Types.hs | 2 +-
- data/default.conf | 4 ++--
- gitit.cabal | 10 +++++-----
- 5 files changed, 15 insertions(+), 13 deletions(-)
-
---- a/Network/Gitit/ContentTransformer.hs
-+++ b/Network/Gitit/ContentTransformer.hs
-@@ -85,6 +85,7 @@
- import Network.URL (encString)
- import Prelude hiding (catch)
- import System.FilePath
-+import qualified Text.Pandoc.Builder as B
- import Text.HTML.SanitizeXSS (sanitizeBalance)
- import Text.Highlighting.Kate
- import Text.Pandoc hiding (MathML, WebTeX, MathJax)
-@@ -452,8 +453,8 @@
- addPageTitleToPandoc title' (Pandoc _ blocks) = do
- updateLayout $ \layout -> layout{ pgTitle = title' }
- return $ if null title'
-- then Pandoc (Meta [] [] []) blocks
-- else Pandoc (Meta [Str title'] [] []) blocks
-+ then Pandoc nullMeta blocks
-+ else Pandoc (B.setMeta "title" (B.str title') nullMeta) blocks
-
- -- | Adds javascript links for math support.
- addMathSupport :: a -> ContentTransformer a
-@@ -553,9 +554,10 @@
- LineBreak -> " "
- Math DisplayMath s -> "$$" ++ s ++ "$$"
- Math InlineMath s -> "$" ++ s ++ "$"
-- RawInline "tex" s -> s
-+ RawInline (Format "tex") s -> s
- RawInline _ _ -> ""
- Link xs _ -> concatMap go xs
- Image xs _ -> concatMap go xs
- Note _ -> ""
-+ Span _ xs -> concatMap go xs
-
---- a/Network/Gitit/Export.hs
-+++ b/Network/Gitit/Export.hs
-@@ -78,7 +78,7 @@
- then fixURLs page doc
- else return doc
- respond mimetype ext (fn opts{writerTemplate = template
-- ,writerSourceDirectory = repositoryPath cfg
-+ ,writerSourceURL = Just $ baseUrl cfg
- ,writerUserDataDir = pandocUserData cfg})
- page doc'
-
-@@ -134,7 +134,7 @@
- writerVariables =
- ("body",body''):("dzslides-core",dzcore):variables'
- ,writerTemplate = template
-- ,writerSourceDirectory = repositoryPath cfg
-+ ,writerSourceURL = Just $ baseUrl cfg
- ,writerUserDataDir = pandocUserData cfg
- } (Pandoc meta [])
- h' <- liftIO $ makeSelfContained (pandocUserData cfg) h
---- a/Network/Gitit/Types.hs
-+++ b/Network/Gitit/Types.hs
-@@ -400,7 +400,7 @@
- fromEntities :: String -> String
- fromEntities ('&':xs) =
- case lookupEntity ent of
-- Just c -> c : fromEntities rest
-+ Just c -> c ++ fromEntities rest
- Nothing -> '&' : fromEntities xs
- where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of
- (zs,';':ys) -> (zs,ys)
---- a/data/default.conf
-+++ b/data/default.conf
-@@ -238,8 +238,8 @@
-
- base-url:
- # the base URL of the wiki, to be used in constructing feed IDs
--# and RPX token_urls. Set this if use-feed is 'yes' or
--# authentication-method is 'rpx'.
-+# and RPX token_urls, and in exporting docx and pdf.
-+# Set this if use-feed is 'yes' or authentication-method is 'rpx'.
-
- absolute-urls: no
- # make wikilinks absolute with respect to the base-url.
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -117,8 +117,8 @@
- exposed-modules: Network.Gitit.Interface
- build-depends: ghc, ghc-paths
- cpp-options: -D_PLUGINS
-- build-depends: base >= 3, pandoc >= 1.10.0.5 && < 1.12,
-- pandoc-types >= 1.10 && < 1.11, filepath, safe
-+ build-depends: base >= 3, pandoc >= 1.12 && < 1.13,
-+ pandoc-types >= 1.12 && < 1.13, filepath, safe
- extensions: CPP
- if impl(ghc >= 6.12)
- ghc-options: -Wall -fno-warn-unused-do-bind
-@@ -134,8 +134,8 @@
- pretty,
- xhtml,
- containers,
-- pandoc >= 1.10.0.5 && < 1.12,
-- pandoc-types >= 1.10 && < 1.11,
-+ pandoc >= 1.12 && < 1.13,
-+ pandoc-types >= 1.12 && < 1.13,
- process,
- filepath,
- directory,
-@@ -164,7 +164,7 @@
- ConfigFile >= 1 && < 1.2,
- feed >= 0.3.6 && < 0.4,
- xss-sanitize >= 0.3 && < 0.4,
-- tagsoup >= 0.12 && < 0.13,
-+ tagsoup >= 0.13 && < 0.14,
- blaze-html >= 0.4 && < 0.7,
- json >= 0.4 && < 0.8
- if impl(ghc >= 6.10)
diff -rN -u old-gitit/patches/series new-gitit/patches/series
--- old-gitit/patches/series 2014-07-01 00:39:53.195297962 +0000
+++ new-gitit/patches/series 2014-07-01 00:39:53.203297972 +0000
@@ -1,2 +1 @@
comment-type-signature
-newer-pandoc
More information about the Pkg-haskell-commits
mailing list