[DHG_packages] 01/01: gitit: Upgrading from 0.12.1.1+dfsg to 0.12.2.1
Clint Adams
clint at moszumanska.debian.org
Wed Jul 19 03:11:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch master
in repository DHG_packages.
commit 9f50d163cf95743a2b6a3a1c5bffe85d8afac9ad
Author: Clint Adams <clint at debian.org>
Date: Tue Jul 18 23:06:03 2017 -0400
gitit: Upgrading from 0.12.1.1+dfsg to 0.12.2.1
---
p/gitit/debian/changelog | 6 ++++++
p/gitit/debian/control | 31 +++++++++++++++++----------
p/gitit/debian/patches/clean-cabal-file.patch | 2 +-
p/gitit/debian/patches/jquery.patch | 20 ++++++-----------
p/gitit/debian/patches/newer-tagsoup | 11 ----------
p/gitit/debian/patches/series | 1 -
6 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index 4e98ff4..bf63fac 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -1,3 +1,9 @@
+gitit (0.12.2.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Clint Adams <clint at debian.org> Tue, 18 Jul 2017 23:06:03 -0400
+
gitit (0.12.1.1+dfsg-6) unstable; urgency=medium
* Upload to unstable as part of GHC 8 transition.
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index b3d4e03..88143de 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -15,14 +15,26 @@ Build-Depends:
ghc (>= 8),
ghc-prof,
haskell-devscripts (>= 0.10.2.3),
- libghc-aeson-dev (<< 0.12),
+ 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.2),
libghc-aeson-prof,
libghc-base64-bytestring-dev (<< 1.1),
libghc-base64-bytestring-dev (>= 0.1),
libghc-base64-bytestring-prof,
- libghc-blaze-html-dev (<< 0.9),
libghc-blaze-html-dev (>= 0.4),
+ libghc-blaze-html-dev (<< 0.10),
libghc-blaze-html-prof,
libghc-configfile-dev (<< 1.2),
libghc-configfile-dev (>= 1),
@@ -47,14 +59,11 @@ Build-Depends:
libghc-hslogger-dev (<< 1.3),
libghc-hslogger-dev (>= 1),
libghc-hslogger-prof,
- libghc-hstringtemplate-dev (<< 0.9),
- libghc-hstringtemplate-dev (>= 0.6),
- libghc-hstringtemplate-prof,
- libghc-http-client-tls-dev (<< 0.3),
libghc-http-client-tls-dev (>= 0.2.2),
+ libghc-http-client-tls-dev (<< 0.4),
libghc-http-client-tls-prof,
- libghc-http-conduit-dev (<< 2.2),
libghc-http-conduit-dev (>= 2.1.4),
+ libghc-http-conduit-dev (<< 2.3),
libghc-http-conduit-prof,
libghc-http-dev (<< 1:4000.4),
libghc-http-dev (>= 1:4000.0),
@@ -73,11 +82,11 @@ Build-Depends:
libghc-old-locale-prof,
libghc-old-time-dev,
libghc-old-time-prof,
- libghc-pandoc-dev (<< 1.18),
libghc-pandoc-dev (>= 1.12.4),
+ libghc-pandoc-dev (<< 1.20),
libghc-pandoc-prof,
- libghc-pandoc-types-dev (<< 1.17),
libghc-pandoc-types-dev (>= 1.12.3),
+ libghc-pandoc-types-dev (<< 1.18),
libghc-pandoc-types-prof,
libghc-parsec3-dev,
libghc-parsec3-prof,
@@ -94,8 +103,8 @@ Build-Depends:
libghc-split-prof,
libghc-syb-dev,
libghc-syb-prof,
- libghc-tagsoup-dev (<< 0.15),
libghc-tagsoup-dev (>= 0.13),
+ libghc-tagsoup-dev (<< 0.15),
libghc-tagsoup-prof,
libghc-text-dev,
libghc-text-prof,
@@ -165,7 +174,7 @@ Build-Depends-Indep:
libghc-xml-doc,
libghc-xss-sanitize-doc,
libghc-zlib-doc,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Homepage: http://gitit.net
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/gitit
Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
diff --git a/p/gitit/debian/patches/clean-cabal-file.patch b/p/gitit/debian/patches/clean-cabal-file.patch
index ab69d17..564bf69 100644
--- a/p/gitit/debian/patches/clean-cabal-file.patch
+++ b/p/gitit/debian/patches/clean-cabal-file.patch
@@ -4,7 +4,7 @@ Author: Dmitry Bogatov
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/gitit.cabal
+++ b/gitit.cabal
-@@ -42,21 +42,14 @@ maintainer: jgm at berkeley.edu
+@@ -42,21 +42,14 @@
bug-reports: http://github.com/jgm/gitit/issues
homepage: http://gitit.net
stability: experimental
diff --git a/p/gitit/debian/patches/jquery.patch b/p/gitit/debian/patches/jquery.patch
index 0e07302..5d8d9b5 100644
--- a/p/gitit/debian/patches/jquery.patch
+++ b/p/gitit/debian/patches/jquery.patch
@@ -2,10 +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: gitit/data/templates/expire.st
-===================================================================
---- gitit.orig/data/templates/expire.st
-+++ gitit/data/templates/expire.st
+--- a/data/templates/expire.st
++++ b/data/templates/expire.st
@@ -1,5 +1,5 @@
$if(usecache)$
-<script type="text/javascript" src="$base$/js/jquery.hotkeys-0.7.9.min.js"></script>
@@ -13,11 +11,9 @@ Index: gitit/data/templates/expire.st
<script type="text/javascript">
/* <![CDATA[ */
\$(document).bind("keydown", "ctrl+r", function() {
-Index: gitit/src/Network/Gitit/Layout.hs
-===================================================================
---- gitit.orig/src/Network/Gitit/Layout.hs
-+++ gitit/src/Network/Gitit/Layout.hs
-@@ -78,7 +78,7 @@ filledPageTemplate base' cfg layout html
+--- a/src/Network/Gitit/Layout.hs
++++ b/src/Network/Gitit/Layout.hs
+@@ -78,7 +78,7 @@
'h':'t':'t':'p':_ -> x
_ -> base' ++ "/js/" ++ x
@@ -26,10 +22,8 @@ Index: gitit/src/Network/Gitit/Layout.hs
scriptLink x = script ! [src (prefixedScript x),
thetype "text/javascript"] << noHtml
javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts
-Index: gitit/data/templates/page.st
-===================================================================
---- gitit.orig/data/templates/page.st
-+++ gitit/data/templates/page.st
+--- a/data/templates/page.st
++++ b/data/templates/page.st
@@ -9,6 +9,7 @@
<link href="$base$/_feed$pageUrl$" type="application/atom+xml" rel="alternate" title="$wikititle$ - $pagetitle$" />
$endif$
diff --git a/p/gitit/debian/patches/newer-tagsoup b/p/gitit/debian/patches/newer-tagsoup
deleted file mode 100644
index cada05a..0000000
--- a/p/gitit/debian/patches/newer-tagsoup
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -155,7 +155,7 @@ Library
- ConfigFile >= 1 && < 1.2,
- feed >= 0.3.6 && < 0.4,
- xss-sanitize >= 0.3 && < 0.4,
-- tagsoup >= 0.13 && < 0.14,
-+ tagsoup >= 0.13 && < 0.15,
- blaze-html >= 0.4 && < 0.9,
- json >= 0.4 && < 0.10,
- uri >= 0.1 && < 0.2,
diff --git a/p/gitit/debian/patches/series b/p/gitit/debian/patches/series
index b17c3ac..cbc1544 100644
--- a/p/gitit/debian/patches/series
+++ b/p/gitit/debian/patches/series
@@ -1,3 +1,2 @@
clean-cabal-file.patch
jquery.patch
-newer-tagsoup
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list