[Git][haskell-team/DHG_packages][master] gitit: Upgrading from 0.15.1.2+dfsg to 0.16+dfsg
Scott Talbert (@swt2c)
gitlab at salsa.debian.org
Fri Jun 19 23:54:01 BST 2026
Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
13183ad8 by Scott Talbert at 2026-06-19T18:48:08-04:00
gitit: Upgrading from 0.15.1.2+dfsg to 0.16+dfsg
- - - - -
7 changed files:
- p/gitit/debian/changelog
- p/gitit/debian/control
- p/gitit/debian/patches/clean-cabal-file.patch
- p/gitit/debian/patches/jquery.patch
- − p/gitit/debian/patches/newer-deps
- − p/gitit/debian/patches/newer-pandoc
- p/gitit/debian/patches/series
Changes:
=====================================
p/gitit/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+gitit (0.16+dfsg-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Scott Talbert <swt at techie.net> Fri, 19 Jun 2026 18:34:37 -0400
+
gitit (0.15.1.2+dfsg-3) unstable; urgency=medium
* Patch for newer pandoc
=====================================
p/gitit/debian/control
=====================================
@@ -22,11 +22,11 @@ Build-Depends: debhelper-compat (= 13),
libghc-sha-dev (>> 1),
libghc-sha-prof,
libghc-aeson-dev (>= 0.7),
- libghc-aeson-dev (<< 2.3),
+ libghc-aeson-dev (<< 2.4),
libghc-aeson-prof,
libghc-base64-bytestring-dev (>= 0.1),
libghc-base64-bytestring-prof,
- libghc-blaze-html-dev (>= 0.4),
+ libghc-blaze-html-dev (>= 0.5),
libghc-blaze-html-dev (<< 0.10),
libghc-blaze-html-prof,
libghc-doctemplates-dev (>= 0.7.1),
@@ -34,7 +34,7 @@ Build-Depends: debhelper-compat (= 13),
libghc-feed-dev (>= 1.0),
libghc-feed-dev (<< 1.4),
libghc-feed-prof,
- libghc-filestore-dev (>= 0.6.5),
+ libghc-filestore-dev (>= 0.6.5.1),
libghc-filestore-dev (<< 0.7),
libghc-filestore-prof,
libghc-ghc-paths-dev,
@@ -43,12 +43,12 @@ Build-Depends: debhelper-compat (= 13),
libghc-happstack-server-dev (<< 7.10),
libghc-happstack-server-prof,
libghc-hoauth2-dev (>= 2.3.0),
- libghc-hoauth2-dev (<< 2.15),
+ libghc-hoauth2-dev (<< 2.16),
libghc-hoauth2-prof,
libghc-hslogger-dev (>= 1),
libghc-hslogger-prof,
libghc-http-client-tls-dev (>= 0.2.2),
- libghc-http-client-tls-dev (<< 0.4),
+ libghc-http-client-tls-dev (<< 0.5),
libghc-http-client-tls-prof,
libghc-http-conduit-dev (>= 2.1.6),
libghc-http-conduit-dev (<< 2.4),
@@ -68,7 +68,8 @@ Build-Depends: debhelper-compat (= 13),
libghc-old-locale-prof,
libghc-old-time-dev,
libghc-old-time-prof,
- libghc-pandoc-dev,
+ libghc-pandoc-dev (>= 3.0),
+ libghc-pandoc-dev (<< 3.11),
libghc-pandoc-prof,
libghc-pandoc-types-dev (>= 1.20),
libghc-pandoc-types-dev (<< 1.24),
@@ -164,7 +165,7 @@ Build-Depends-Indep: ghc-doc,
libghc-xml-types-doc,
libghc-xss-sanitize-doc,
libghc-zlib-doc,
-Standards-Version: 4.7.3
+Standards-Version: 4.7.4
Homepage: https://hackage.haskell.org/package/gitit
Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/gitit
Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/gitit]
=====================================
p/gitit/debian/patches/clean-cabal-file.patch
=====================================
@@ -29,5 +29,5 @@ Index: b/gitit.cabal
+ data/static/js/dragdiff.js,
+ data/static/js/uploadForm.js,
data/static/js/preview.js, data/static/js/search.js,
- data/static/js/MathMLinHTML.js, data/static/js/footnotes.js,
+ data/static/js/footnotes.js,
data/static/robots.txt,
=====================================
p/gitit/debian/patches/jquery.patch
=====================================
@@ -17,20 +17,20 @@ Index: b/src/Network/Gitit/Layout.hs
===================================================================
--- a/src/Network/Gitit/Layout.hs
+++ b/src/Network/Gitit/Layout.hs
-@@ -77,7 +77,7 @@ filledPageTemplate base' cfg layout html
+@@ -81,7 +81,7 @@ filledPageTemplate base' cfg layout html
'h':'t':'t':'p':_ -> x
_ -> base' ++ "/js/" ++ x
- scripts = ["jquery-1.2.6.min.js", "jquery-ui-combined-1.6rc2.min.js", "footnotes.js"] ++ pgScripts layout
+ scripts = ["jquery.min.js", "jquery-ui.min.js", "footnotes.js"] ++ pgScripts layout
- scriptLink x = script ! [src (prefixedScript x),
- thetype "text/javascript"] << noHtml
- javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
+ scriptLink x = script ! src (fromString $ prefixedScript x) !
+ type_ "text/javascript" $ mempty
+ javascriptlinks = renderHtml $ mconcat $ map scriptLink scripts
Index: b/data/templates/page.st
===================================================================
--- a/data/templates/page.st
+++ b/data/templates/page.st
-@@ -9,6 +9,7 @@
+@@ -8,6 +8,7 @@
<link href="$base$/_feed$pageUrl$" type="application/atom+xml" rel="alternate" title="$wikititle$ - $pagetitle$" />
$endif$
<title>$wikititle$ - $pagetitle$</title>
=====================================
p/gitit/debian/patches/newer-deps deleted
=====================================
@@ -1,38 +0,0 @@
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -127,7 +127,7 @@ Library
- mtl,
- old-time,
- temporary,
-- pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.2,
-+ pandoc >= 2.9 && < 2.20 || >= 3.0 && < 3.10,
- pandoc-types >= 1.20 && < 1.24,
- skylighting >= 0.8.2.3 && < 0.15,
- bytestring,
-@@ -141,7 +141,7 @@ Library
- time,
- recaptcha >= 0.1,
- filestore >= 0.6.5 && < 0.7,
-- zlib >= 0.5 && < 0.7,
-+ zlib >= 0.5 && < 0.8,
- url >= 2.1,
- happstack-server >= 7.5 && < 7.10,
- base64-bytestring >= 0.1,
-@@ -155,14 +155,14 @@ Library
- json >= 0.4 && < 0.12,
- uri-bytestring >= 0.2.3.3,
- split,
-- hoauth2 >= 2.3.0 && < 2.11,
-- xml-conduit >= 1.5 && < 1.10,
-+ hoauth2 >= 2.3.0 && < 2.15,
-+ xml-conduit >= 1.5 && < 1.11,
- http-conduit >= 2.1.6 && < 2.4,
- http-client-tls >= 0.2.2 && < 0.4,
- aeson >= 0.7 && < 2.3,
- uuid >= 1.3 && < 1.4,
- network-uri >= 2.6,
-- network >= 2.6 && < 3.2,
-+ network >= 2.6 && < 3.3,
- network-bsd >= 2.8.1 && < 2.9,
- doctemplates >= 0.7.1
- if flag(plugins)
=====================================
p/gitit/debian/patches/newer-pandoc deleted
=====================================
@@ -1,11 +0,0 @@
---- a/src/Network/Gitit/ContentTransformer.hs
-+++ b/src/Network/Gitit/ContentTransformer.hs
-@@ -520,7 +520,7 @@ pandocToHtml pandocContents = do
- MathJax u -> Pandoc.MathJax $ T.pack u
- RawTeX -> Pandoc.PlainMath
- , writerTableOfContents = toc
-- , writerHighlightStyle = Just pygments
-+ , writerHighlightMethod = Skylighting pygments
- , writerExtensions = if bird
- then enableExtension Ext_literate_haskell
- $ writerExtensions def
=====================================
p/gitit/debian/patches/series
=====================================
@@ -1,4 +1,2 @@
clean-cabal-file.patch
jquery.patch
-newer-deps
-newer-pandoc
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/13183ad851edb2eeae9de96a63c7c892df543042
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/13183ad851edb2eeae9de96a63c7c892df543042
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20260619/d2b330b7/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list