gitit: new version

5 files changed, 13 insertions, 35 deletions

diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index c941741bd..776fd538b 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -1,3 +1,9 @@
+gitit (0.12.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata@debian.org>  Mon, 22 Feb 2016 23:48:23 +0100
+
 gitit (0.12.0.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/p/gitit/debian/control b/p/gitit/debian/control
index 16b3a7d9e..7e000e1dd 100644
--- a/p/gitit/debian/control
+++ b/p/gitit/debian/control
@@ -4,7 +4,7 @@ Uploaders: Giovanni Mascellani <gio@debian.org>, Clint Adams <clint@debian.org>,
 Priority: extra
 Section: haskell
 Build-Depends: debhelper (>= 9),
- haskell-devscripts (>= 0.9),
+ haskell-devscripts (>= 0.10.2.3),
  cdbs,
  xsltproc,
  pandoc,
@@ -24,6 +24,7 @@ Build-Depends: debhelper (>= 9),
  libghc-sha-dev (<< 1.7),
  libghc-sha-prof,
  libghc-aeson-dev (>= 0.7),
+ libghc-aeson-dev (<< 0.11),
  libghc-aeson-dev,
  libghc-aeson-prof,
  libghc-base64-bytestring-dev (>= 0.1),
@@ -47,6 +48,7 @@ Build-Depends: debhelper (>= 9),
  libghc-highlighting-kate-dev (<< 0.7),
  libghc-highlighting-kate-prof,
  libghc-hoauth2-dev (>= 0.4.2),
+ libghc-hoauth2-dev (<< 0.6),
  libghc-hoauth2-dev,
  libghc-hoauth2-prof,
  libghc-hslogger-dev (>= 1),
@@ -73,10 +75,10 @@ Build-Depends: debhelper (>= 9),
  libghc-old-time-dev,
  libghc-old-time-prof,
  libghc-pandoc-dev (>= 1.12.4),
- libghc-pandoc-dev (<< 1.16),
+ libghc-pandoc-dev (<< 1.17),
  libghc-pandoc-prof,
  libghc-pandoc-types-dev (>= 1.12.3),
- libghc-pandoc-types-dev (<< 1.13),
+ libghc-pandoc-types-dev (<< 1.17),
  libghc-pandoc-types-prof,
  libghc-parsec3-dev,
  libghc-parsec3-prof,
@@ -115,6 +117,8 @@ Build-Depends: debhelper (>= 9),
  libghc-zlib-dev (>= 0.5),
  libghc-zlib-dev (<< 0.7),
  libghc-zlib-prof,
+ libghc-http-dev (>= 1:4000.0),
+ libghc-http-dev (<< 1:4000.4),
  libghc-http-dev,
  libghc-hslogger-dev,
  libghc-url-dev,
diff --git a/p/gitit/debian/patches/relax-aeson-0.10.patch b/p/gitit/debian/patches/relax-aeson-0.10.patch
deleted file mode 100644
index cec90aed0..000000000
--- a/p/gitit/debian/patches/relax-aeson-0.10.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Relax dependency on aeson
- Attempt to solve tricky situation with LTS-4.0 transition. LTS-4.0 contains
- aeson-0.10, so we need to build gitit with it. This patch is imported into
- additional-patches, but it is not clear whether gitit is actually user-ready.
-Author: Dmitry Bogatov <KAction@gnu.org>
-Last-Update: 2015-01-09
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -170,7 +170,7 @@ Library
-                      hoauth2 >= 0.4.2 && < 0.5,
-                      http-conduit >= 2.1.4 && < 2.2,
-                      http-client-tls >= 0.2.2 && < 0.3,
--                     aeson >= 0.7 && < 0.10,
-+                     aeson >= 0.7 && < 0.12,
-                      uuid >= 1.3 && < 1.4
-   if impl(ghc >= 6.10)
-     build-depends:   base >= 4, syb
diff --git a/p/gitit/debian/patches/relax-hoauth2.patch b/p/gitit/debian/patches/relax-hoauth2.patch
deleted file mode 100644
index aa0a2cbf2..000000000
--- a/p/gitit/debian/patches/relax-hoauth2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gitit.cabal
-+++ b/gitit.cabal
-@@ -167,7 +167,7 @@ Library
-                      json >= 0.4 && < 0.10,
-                      uri >= 0.1 && < 0.2,
-                      split,
--                     hoauth2 >= 0.4.2 && < 0.5,
-+                     hoauth2 >= 0.4.2 && < 0.6,
-                      http-conduit >= 2.1.4 && < 2.2,
-                      http-client-tls >= 0.2.2 && < 0.3,
-                      aeson >= 0.7 && < 0.12,
diff --git a/p/gitit/debian/patches/series b/p/gitit/debian/patches/series
index 9c7badcb5..d2ec8f300 100644
--- a/p/gitit/debian/patches/series
+++ b/p/gitit/debian/patches/series
@@ -1,3 +1 @@
 clean-cabal-file.patch
-relax-aeson-0.10.patch
-relax-hoauth2.patch