[DHG_packages] 03/05: gitit: build with ghc 8 in experimental
Clint Adams
clint at moszumanska.debian.org
Tue Oct 18 00:18:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch experimental
in repository DHG_packages.
commit 83c532da53443b1ceb139bca9ddeca6bc115afe7
Author: Clint Adams <clint at debian.org>
Date: Mon Oct 17 20:15:38 2016 -0400
gitit: build with ghc 8 in experimental
---
p/gitit/debian/changelog | 6 ++
p/gitit/debian/control | 168 ++++++++++++++++++-------------
p/gitit/debian/gitit.manpages | 2 +-
p/gitit/debian/libghc-gitit-data.install | 6 +-
p/gitit/debian/libghc-gitit-data.links | 6 +-
5 files changed, 109 insertions(+), 79 deletions(-)
diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index fe7b4ff..8dd0ea8 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -1,3 +1,9 @@
+gitit (0.12.1.1+dfsg-3) experimental; urgency=medium
+
+ * Temporarily build-depend on ghc 8.
+
+ -- Clint Adams <clint at debian.org> Mon, 17 Oct 2016 20:15:03 -0400
+
gitit (0.12.1.1+dfsg-2) unstable; urgency=medium
* Use dh_link instead of dh_linktree
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index 717ae03..1b65e25 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -1,85 +1,83 @@
Source: gitit
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Giovanni Mascellani <gio at debian.org>, Clint Adams <clint at debian.org>, Louis Bettens <louis at bettens.info>, Anthony Towns <ajt at debian.org>, Dmitry Bogatov <KAction at gnu.org>
+Uploaders:
+ Giovanni Mascellani <gio at debian.org>,
+ Clint Adams <clint at debian.org>,
+ Louis Bettens <louis at bettens.info>,
+ Anthony Towns <ajt at debian.org>,
+ Dmitry Bogatov <KAction at gnu.org>,
Priority: extra
Section: haskell
-Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.10.2.3),
+Build-Depends:
cdbs,
- xsltproc,
- pandoc,
+ debhelper (>= 9),
docbook-xsl,
- libjs-jquery,
- libjs-jquery-ui,
- libjs-jquery-hotkeys,
- ghc,
+ ghc (>= 8),
ghc-prof,
- 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),
+ haskell-devscripts (>= 0.10.2.3),
libghc-aeson-dev (<< 0.12),
+ libghc-aeson-dev (>= 0.7),
libghc-aeson-prof,
- libghc-base64-bytestring-dev (>= 0.1),
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.9),
+ libghc-blaze-html-dev (>= 0.4),
libghc-blaze-html-prof,
- libghc-feed-dev (>= 0.3.6),
+ libghc-configfile-dev (<< 1.2),
+ libghc-configfile-dev (>= 1),
+ libghc-configfile-prof,
libghc-feed-dev (<< 0.4),
+ libghc-feed-dev (>= 0.3.6),
libghc-feed-prof,
- libghc-filestore-dev (>= 0.6),
libghc-filestore-dev (<< 0.7),
+ libghc-filestore-dev (>= 0.6),
libghc-filestore-prof,
libghc-ghc-paths-dev,
libghc-ghc-paths-prof,
- libghc-happstack-server-dev (>= 7.0),
libghc-happstack-server-dev (<< 7.5),
+ libghc-happstack-server-dev (>= 7.0),
libghc-happstack-server-prof,
- libghc-highlighting-kate-dev (>= 0.5.0.1),
libghc-highlighting-kate-dev (<< 0.7),
+ libghc-highlighting-kate-dev (>= 0.5.0.1),
libghc-highlighting-kate-prof,
- libghc-hoauth2-dev (>= 0.4.2),
libghc-hoauth2-dev (<< 0.6),
+ libghc-hoauth2-dev (>= 0.4.2),
libghc-hoauth2-prof,
- libghc-hslogger-dev (>= 1),
libghc-hslogger-dev (<< 1.3),
+ libghc-hslogger-dev (>= 1),
libghc-hslogger-prof,
- libghc-http-client-tls-dev (>= 0.2.2),
+ 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-prof,
- libghc-http-conduit-dev (>= 2.1.4),
libghc-http-conduit-dev (<< 2.2),
+ libghc-http-conduit-dev (>= 2.1.4),
libghc-http-conduit-prof,
- libghc-json-dev (>= 0.4),
+ 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-prof,
libghc-mtl-dev,
libghc-mtl-prof,
libghc-network-dev (>= 2.6),
libghc-network-prof,
- libghc-network-uri-dev (>= 2.6),
libghc-network-uri-dev (<< 2.7),
+ libghc-network-uri-dev (>= 2.6),
libghc-network-uri-prof,
libghc-old-locale-dev (>= 1),
libghc-old-locale-prof,
libghc-old-time-dev,
libghc-old-time-prof,
- libghc-pandoc-dev (>= 1.12.4),
libghc-pandoc-dev (<< 1.18),
+ libghc-pandoc-dev (>= 1.12.4),
libghc-pandoc-prof,
- libghc-pandoc-types-dev (>= 1.12.3),
libghc-pandoc-types-dev (<< 1.17),
+ libghc-pandoc-types-dev (>= 1.12.3),
libghc-pandoc-types-prof,
libghc-parsec3-dev,
libghc-parsec3-prof,
@@ -89,43 +87,49 @@ Build-Depends: debhelper (>= 9),
libghc-recaptcha-prof,
libghc-safe-dev,
libghc-safe-prof,
+ libghc-sha-dev (<< 1.7),
+ libghc-sha-dev (>> 1),
+ libghc-sha-prof,
libghc-split-dev,
libghc-split-prof,
libghc-syb-dev,
libghc-syb-prof,
- libghc-tagsoup-dev (>= 0.13),
libghc-tagsoup-dev (<< 0.14),
+ libghc-tagsoup-dev (>= 0.13),
libghc-tagsoup-prof,
libghc-text-dev,
libghc-text-prof,
- libghc-uri-dev (>= 0.1),
libghc-uri-dev (<< 0.2),
+ libghc-uri-dev (>= 0.1),
libghc-uri-prof,
- libghc-url-dev (>= 2.1),
libghc-url-dev (<< 2.2),
+ libghc-url-dev (>= 2.1),
libghc-url-prof,
- libghc-utf8-string-dev (>= 0.3),
libghc-utf8-string-dev (<< 1.1),
+ libghc-utf8-string-dev (>= 0.3),
libghc-utf8-string-prof,
- libghc-uuid-dev (>= 1.3),
libghc-uuid-dev (<< 1.4),
+ libghc-uuid-dev (>= 1.3),
libghc-uuid-prof,
libghc-xml-dev (>= 1.3.5),
libghc-xml-prof,
- libghc-xss-sanitize-dev (>= 0.3),
libghc-xss-sanitize-dev (<< 0.4),
+ libghc-xss-sanitize-dev (>= 0.3),
libghc-xss-sanitize-prof,
- libghc-zlib-dev (>= 0.5),
libghc-zlib-dev (<< 0.7),
+ libghc-zlib-dev (>= 0.5),
libghc-zlib-prof,
-Build-Depends-Indep: ghc-doc,
- libghc-configfile-doc,
- libghc-hstringtemplate-doc,
- libghc-http-doc,
- libghc-sha-doc,
+ libjs-jquery,
+ libjs-jquery-hotkeys,
+ libjs-jquery-ui,
+ pandoc,
+ xsltproc,
+Build-Depends-Indep:
+ ghc-doc,
libghc-aeson-doc,
libghc-base64-bytestring-doc,
libghc-blaze-html-doc,
+ libghc-configfile-doc,
libghc-feed-doc,
libghc-filestore-doc,
libghc-ghc-paths-doc,
@@ -133,8 +137,10 @@ Build-Depends-Indep: ghc-doc,
libghc-highlighting-kate-doc,
libghc-hoauth2-doc,
libghc-hslogger-doc,
+ libghc-hstringtemplate-doc,
libghc-http-client-tls-doc,
libghc-http-conduit-doc,
+ libghc-http-doc,
libghc-json-doc,
libghc-mtl-doc,
libghc-network-doc,
@@ -147,6 +153,7 @@ Build-Depends-Indep: ghc-doc,
libghc-random-doc,
libghc-recaptcha-doc,
libghc-safe-doc,
+ libghc-sha-doc,
libghc-split-doc,
libghc-syb-doc,
libghc-tagsoup-doc,
@@ -160,7 +167,7 @@ Build-Depends-Indep: ghc-doc,
libghc-zlib-doc,
Standards-Version: 3.9.8
Homepage: http://gitit.net
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-gitit
+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
X-Description: Wiki engine backed by a git or darcs filestore
Gitit is a wiki backed by a git or darcs filestore. Pages and uploaded files
@@ -188,11 +195,12 @@ Package: gitit
Architecture: any
Section: web
Depends:
+ git | darcs | mercurial,
+ libghc-gitit-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends},
- libghc-gitit-data (= ${source:Version}),
- git | darcs | mercurial,
-Recommends: mime-support,
+Recommends:
+ mime-support,
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -200,13 +208,17 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-gitit-dev
Architecture: any
-Depends: ${haskell:Depends},
+Depends:
+ libghc-gitit-data (= ${source:Version}),
+ ${haskell:Depends},
${misc:Depends},
${shlibs:Depends},
- libghc-gitit-data (= ${source:Version}),
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -214,12 +226,16 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-gitit-prof
Architecture: any
-Depends: ${haskell:Depends},
- ${shlibs:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Provides: ${haskell:Provides},
+ ${shlibs:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Provides:
+ ${haskell:Provides},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -228,10 +244,13 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-gitit-doc
Architecture: all
Section: doc
-Depends: ${haskell:Depends},
+Depends:
+ ${haskell:Depends},
${misc:Depends},
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
${haskell:LongDescription}
.
@@ -239,15 +258,20 @@ Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
Package: libghc-gitit-data
Architecture: all
-Depends: ${misc:Depends},
- ${haskell:Extra-Depends},
+Depends:
libjs-jquery,
- libjs-jquery-ui,
libjs-jquery-hotkeys,
-Recommends: ${haskell:Recommends},
-Suggests: ${haskell:Suggests},
-Breaks: gitit (<< 0.10.6.3+dfsg-1),
-Replaces: gitit (<< 0.10.6.3+dfsg-1),
+ libjs-jquery-ui,
+ ${haskell:Extra-Depends},
+ ${misc:Depends},
+Recommends:
+ ${haskell:Recommends},
+Suggests:
+ ${haskell:Suggests},
+Breaks:
+ gitit (<< 0.10.6.3+dfsg-1),
+Replaces:
+ gitit (<< 0.10.6.3+dfsg-1),
Description: ${haskell:ShortDescription} - Data files
${haskell:LongDescription}
.
diff --git a/p/gitit/debian/gitit.manpages b/p/gitit/debian/gitit.manpages
index 2423c32..6a2bc32 100644
--- a/p/gitit/debian/gitit.manpages
+++ b/p/gitit/debian/gitit.manpages
@@ -1,2 +1,2 @@
-gitit.1
expireGititCache.1
+gitit.1
diff --git a/p/gitit/debian/libghc-gitit-data.install b/p/gitit/debian/libghc-gitit-data.install
index f477501..1478423 100644
--- a/p/gitit/debian/libghc-gitit-data.install
+++ b/p/gitit/debian/libghc-gitit-data.install
@@ -1,10 +1,10 @@
/usr/share/gitit/CHANGES usr/share/gitit
/usr/share/gitit/TANGOICONS usr/share/gitit
-/usr/share/gitit/data/markup.* usr/share/gitit/data
/usr/share/gitit/data/*.page usr/share/gitit/data
+/usr/share/gitit/data/default.conf usr/share/gitit/data
+/usr/share/gitit/data/markup.* usr/share/gitit/data
/usr/share/gitit/data/markupHelp usr/share/gitit/data
+/usr/share/gitit/data/post-update usr/share/gitit/data
/usr/share/gitit/data/s5 usr/share/gitit/data
/usr/share/gitit/data/static usr/share/gitit/data
/usr/share/gitit/data/templates usr/share/gitit/data
-/usr/share/gitit/data/default.conf usr/share/gitit/data
-/usr/share/gitit/data/post-update usr/share/gitit/data
diff --git a/p/gitit/debian/libghc-gitit-data.links b/p/gitit/debian/libghc-gitit-data.links
index ba5b395..10fe29b 100644
--- a/p/gitit/debian/libghc-gitit-data.links
+++ b/p/gitit/debian/libghc-gitit-data.links
@@ -1,4 +1,4 @@
-/usr/share/javascript/jquery/jquery.min.js usr/share/gitit/data/static/js/jquery.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit/data/static/js/jquery-ui.min.js
-/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/gitit/data/static/css/jquery-ui.min.css
/usr/share/javascript/jquery-hotkeys/jquery.hotkeys.js usr/share/gitit/data/static/js/jquery.hotkeys.js
+/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/gitit/data/static/css/jquery-ui.min.css
+/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/gitit/data/static/js/jquery-ui.min.js
+/usr/share/javascript/jquery/jquery.min.js usr/share/gitit/data/static/js/jquery.min.js
--
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