[Git][haskell-team/DHG_packages][master] gitit: Upgrading from 0.12.3.2+dfsg to 0.13.0.0+dfsg
Ilias Tsitsimpis
gitlab at salsa.debian.org
Mon Jun 29 15:35:37 BST 2020
Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
1c41d696 by Ilias Tsitsimpis at 2020-06-29T17:33:22+03:00
gitit: Upgrading from 0.12.3.2+dfsg to 0.13.0.0+dfsg
- - - - -
4 changed files:
- p/gitit/debian/changelog
- p/gitit/debian/control
- p/gitit/debian/patches/clean-cabal-file.patch
- p/gitit/debian/patches/jquery.patch
Changes:
=====================================
p/gitit/debian/changelog
=====================================
@@ -1,13 +1,10 @@
-gitit (0.12.3.2+dfsg-1) unstable; urgency=medium
+gitit (0.13.0.0+dfsg-1) unstable; urgency=medium
- [ Ilias Tsitsimpis ]
+ * New upstream release
* Remove Dmitry Bogatov from Uploaders per his request. Thank you
Dmitry for your previous maintainership.
- [ Sean Whitton ]
- * New upstream release
-
- -- Sean Whitton <spwhitton at spwhitton.name> Tue, 26 May 2020 09:26:05 -0700
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Mon, 29 Jun 2020 17:29:03 +0300
gitit (0.12.3.1+dfsg-1) unstable; urgency=medium
=====================================
p/gitit/debian/control
=====================================
@@ -17,39 +17,37 @@ Build-Depends:
ghc-prof,
haskell-devscripts (>= 0.10.2.3),
libghc-configfile-dev (>= 1),
- libghc-configfile-dev (<< 1.2),
libghc-configfile-prof,
libghc-hstringtemplate-dev (>= 0.6),
libghc-hstringtemplate-dev (<< 0.9),
libghc-hstringtemplate-prof,
libghc-http-dev (>= 1:4000.0),
- libghc-http-dev (<< 1:4000.4),
libghc-http-prof,
libghc-sha-dev (>> 1),
- libghc-sha-dev (<< 1.7),
libghc-sha-prof,
libghc-aeson-dev (>= 0.7),
libghc-aeson-dev (<< 1.5),
libghc-aeson-prof,
- libghc-base64-bytestring-dev (<< 1.1),
libghc-base64-bytestring-dev (>= 0.1),
libghc-base64-bytestring-prof,
libghc-blaze-html-dev (>= 0.4),
libghc-blaze-html-dev (<< 0.10),
libghc-blaze-html-prof,
+ libghc-doctemplates-dev (>= 0.7.1),
+ libghc-doctemplates-prof,
libghc-feed-dev (>= 1.0),
- libghc-feed-dev (<< 1.1),
+ libghc-feed-dev (<< 1.4),
libghc-feed-prof,
+ libghc-filestore-dev (>= 0.6.4),
libghc-filestore-dev (<< 0.7),
libghc-filestore-dev (>= 0.6),
libghc-filestore-prof,
- libghc-happstack-server-dev (>= 7.0),
- libghc-happstack-server-dev (<< 7.6),
+ libghc-happstack-server-dev (>= 7.5),
+ libghc-happstack-server-dev (<< 7.7),
libghc-happstack-server-prof,
libghc-hoauth2-dev (>= 1.3.0),
- libghc-hoauth2-dev (<< 1.9),
+ libghc-hoauth2-dev (<< 1.12),
libghc-hoauth2-prof,
- libghc-hslogger-dev (<< 1.3),
libghc-hslogger-dev (>= 1),
libghc-hslogger-prof,
libghc-http-client-tls-dev (>= 0.2.2),
@@ -58,25 +56,26 @@ Build-Depends:
libghc-http-conduit-dev (>= 2.1.6),
libghc-http-conduit-dev (<< 2.4),
libghc-http-conduit-prof,
- libghc-http-dev (<< 1:4000.4),
- libghc-http-dev (>= 1:4000.0),
- libghc-http-prof,
- libghc-json-dev (<< 0.10),
libghc-json-dev (>= 0.4),
+ libghc-json-dev (<< 0.11),
libghc-json-prof,
libghc-network-dev (>= 2.6),
+ libghc-network-dev (<< 3.2),
libghc-network-prof,
- libghc-network-uri-dev (<< 2.7),
+ libghc-network-bsd-dev (>= 2.8.1),
+ libghc-network-bsd-dev (<< 2.9),
+ libghc-network-bsd-prof,
libghc-network-uri-dev (>= 2.6),
libghc-network-uri-prof,
- libghc-old-locale-dev (>= 1),
+ libghc-old-locale-dev,
libghc-old-locale-prof,
libghc-old-time-dev,
libghc-old-time-prof,
- libghc-pandoc-dev (>= 2.2),
+ libghc-pandoc-dev (>= 2.9),
+ libghc-pandoc-dev (<< 2.10),
libghc-pandoc-prof,
- libghc-pandoc-types-dev (>= 1.17.4.2),
- libghc-pandoc-types-dev (<< 1.18),
+ libghc-pandoc-types-dev (>= 1.20),
+ libghc-pandoc-types-dev (<< 1.21),
libghc-pandoc-types-prof,
libghc-random-dev,
libghc-random-prof,
@@ -84,8 +83,8 @@ Build-Depends:
libghc-recaptcha-prof,
libghc-safe-dev,
libghc-safe-prof,
- libghc-skylighting-dev (>= 0.7.4),
- libghc-skylighting-dev (<< 0.8),
+ libghc-skylighting-dev (>= 0.8.2.3),
+ libghc-skylighting-dev (<< 0.9),
libghc-skylighting-prof,
libghc-split-dev,
libghc-split-prof,
@@ -95,10 +94,8 @@ Build-Depends:
libghc-tagsoup-dev (<< 0.15),
libghc-tagsoup-prof,
libghc-uri-bytestring-dev (>= 0.2.3.3),
- libghc-uri-bytestring-dev (<= 0.4),
libghc-uri-bytestring-prof,
libghc-url-dev (>= 2.1),
- libghc-url-dev (<< 2.2),
libghc-url-prof,
libghc-utf8-string-dev (<< 1.1),
libghc-utf8-string-dev (>= 0.3),
@@ -109,8 +106,10 @@ Build-Depends:
libghc-xml-dev (>= 1.3.5),
libghc-xml-prof,
libghc-xml-conduit-dev (>= 1.5),
- libghc-xml-conduit-dev (<< 1.9),
+ libghc-xml-conduit-dev (<< 1.10),
libghc-xml-conduit-prof,
+ libghc-xml-types-dev (>= 0.3),
+ libghc-xml-types-prof,
libghc-xss-sanitize-dev (>= 0.3),
libghc-xss-sanitize-dev (<< 0.4),
libghc-xss-sanitize-prof,
@@ -127,7 +126,7 @@ Build-Depends-Indep:
libghc-aeson-doc,
libghc-base64-bytestring-doc,
libghc-blaze-html-doc,
- libghc-configfile-doc,
+ libghc-doctemplates-doc,
libghc-feed-doc,
libghc-filestore-doc,
libghc-ghc-paths-doc,
@@ -140,6 +139,7 @@ Build-Depends-Indep:
libghc-http-doc,
libghc-json-doc,
libghc-network-doc,
+ libghc-network-bsd-doc,
libghc-network-uri-doc,
libghc-old-locale-doc,
libghc-old-time-doc,
@@ -158,9 +158,10 @@ Build-Depends-Indep:
libghc-uuid-doc,
libghc-xml-doc,
libghc-xml-conduit-doc,
+ libghc-xml-types-doc,
libghc-xss-sanitize-doc,
libghc-zlib-doc,
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
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
=====================================
@@ -2,11 +2,13 @@ Description: Remove from .cabal data files, missing in tarball
Author: Dmitry Bogatov
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/gitit.cabal
+===================================================================
--- a/gitit.cabal
+++ b/gitit.cabal
-@@ -42,21 +42,14 @@
+@@ -39,21 +39,14 @@ author: John MacFarlane
+ maintainer: jgm at berkeley.edu
bug-reports: http://github.com/jgm/gitit/issues
- homepage: http://gitit.net
stability: experimental
-extra-source-files: data/static/js/jquery-1.2.6.js
- data/static/js/jquery.hotkeys-0.7.9.js
=====================================
p/gitit/debian/patches/jquery.patch
=====================================
@@ -2,6 +2,8 @@ Description: Use libjs-jquery instead of embedded code
Patch gitit to use the javascript linked from the libjs-jquery package,
instead of the embedded one.
Author: Giovanni Mascellani <gio at debian.org>
+Index: b/data/templates/expire.st
+===================================================================
--- a/data/templates/expire.st
+++ b/data/templates/expire.st
@@ -1,5 +1,5 @@
@@ -11,9 +13,11 @@ Author: Giovanni Mascellani <gio at debian.org>
<script type="text/javascript">
/* <![CDATA[ */
\$(document).bind("keydown", "ctrl+r", function() {
+Index: b/src/Network/Gitit/Layout.hs
+===================================================================
--- a/src/Network/Gitit/Layout.hs
+++ b/src/Network/Gitit/Layout.hs
-@@ -78,7 +78,7 @@
+@@ -78,7 +78,7 @@ filledPageTemplate base' cfg layout html
'h':'t':'t':'p':_ -> x
_ -> base' ++ "/js/" ++ x
@@ -22,6 +26,8 @@ Author: Giovanni Mascellani <gio at debian.org>
scriptLink x = script ! [src (prefixedScript x),
thetype "text/javascript"] << noHtml
javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
+Index: b/data/templates/page.st
+===================================================================
--- a/data/templates/page.st
+++ b/data/templates/page.st
@@ -9,6 +9,7 @@
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/1c41d6966b9018a278298037bd5e2590b8bd50c8
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/1c41d6966b9018a278298037bd5e2590b8bd50c8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200629/b8bd5de9/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list