[DHG_packages] 03/05: hledger-web: Upgrading from 0.27 to 1.0

[Clint Adams]

This is an automated email from the git hooks/post-receive script.

clint pushed a commit to branch experimental
in repository DHG_packages.

commit 7e1e421807d4e9f654c28715dc91333cb7f6af07
Author: Clint Adams <clint at debian.org>
Date:   Wed Oct 26 22:02:00 2016 -0400

    hledger-web: Upgrading from 0.27 to 1.0
---
 p/haskell-hledger-web/debian/changelog             |  6 +++
 p/haskell-hledger-web/debian/control               | 51 +++++++++++++++++++---
 p/haskell-hledger-web/debian/patches/newer-hledger | 35 ---------------
 p/haskell-hledger-web/debian/patches/series        |  1 -
 4 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/p/haskell-hledger-web/debian/changelog b/p/haskell-hledger-web/debian/changelog
index 02973db..497fdff 100644
--- a/p/haskell-hledger-web/debian/changelog
+++ b/p/haskell-hledger-web/debian/changelog
@@ -1,3 +1,9 @@
+haskell-hledger-web (1.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Clint Adams <clint at debian.org>  Wed, 26 Oct 2016 22:01:59 -0400
+
 haskell-hledger-web (0.27-3) experimental; urgency=medium
 
   * Patch for newer hledger and hledger-lib in the
diff --git a/p/haskell-hledger-web/debian/control b/p/haskell-hledger-web/debian/control
index 0bc5d53..f3f5aa1 100644
--- a/p/haskell-hledger-web/debian/control
+++ b/p/haskell-hledger-web/debian/control
@@ -20,20 +20,29 @@ Build-Depends:
  libghc-data-default-dev,
  libghc-hjsmin-dev,
  libghc-hjsmin-prof,
- libghc-hledger-dev (<< 0.28),
- libghc-hledger-dev (>= 0.27),
- libghc-hledger-lib-dev (<< 0.28),
- libghc-hledger-lib-dev (>= 0.27),
+ libghc-hledger-dev (>= 1.0),
+ libghc-hledger-dev (<< 1.1),
+ libghc-hledger-prof,
+ libghc-hledger-lib-dev (>= 1.0),
+ libghc-hledger-lib-dev (<< 1.1),
  libghc-hledger-lib-prof,
  libghc-hledger-prof,
  libghc-http-client-dev,
  libghc-http-conduit-dev,
  libghc-hunit-dev,
  libghc-json-dev,
- libghc-parsec3-dev (>= 3),
+ libghc-json-prof,
+ libghc-megaparsec-dev (>= 5),
+ libghc-megaparsec-dev (<< 5.1),
+ libghc-megaparsec-prof,
+ libghc-mtl-dev,
+ libghc-mtl-prof,
  libghc-safe-dev (>= 0.2),
  libghc-shakespeare-dev (>= 2.0),
- libghc-text-dev,
+ libghc-shakespeare-prof,
+ libghc-text-dev (>= 1.2),
+ libghc-text-dev (<< 1.3),
+ libghc-text-prof,
  libghc-wai-dev,
  libghc-wai-extra-dev,
  libghc-wai-handler-launch-dev (>= 1.3),
@@ -46,6 +55,36 @@ Build-Depends:
  libghc-yesod-static-dev,
  libghc-yesod-static-prof,
  libjs-jquery,
+Build-Depends-Indep: ghc-doc,
+ libghc-hunit-doc,
+ libghc-base-compat-doc,
+ libghc-blaze-html-doc,
+ libghc-blaze-markup-doc,
+ libghc-clientsession-doc,
+ libghc-cmdargs-doc,
+ libghc-conduit-extra-doc,
+ libghc-data-default-doc,
+ libghc-hjsmin-doc,
+ libghc-hledger-doc,
+ libghc-hledger-lib-doc,
+ libghc-http-client-doc,
+ libghc-http-conduit-doc,
+ libghc-json-doc,
+ libghc-megaparsec-doc,
+ libghc-mtl-doc,
+ libghc-safe-doc,
+ libghc-shakespeare-doc,
+ libghc-text-doc,
+ libghc-wai-doc,
+ libghc-wai-extra-doc,
+ libghc-wai-handler-launch-doc,
+ libghc-warp-doc,
+ libghc-yaml-doc,
+ libghc-yesod-doc,
+ libghc-yesod-core-doc,
+ libghc-yesod-form-doc,
+ libghc-yesod-static-doc,
+>>>>>>> 0a08443... hledger-web: Upgrading from 0.27 to 1.0
 Standards-Version: 3.9.8
 Homepage: http://hledger.org
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-haskell/DHG_packages.git/tree/p/haskell-hledger-web
diff --git a/p/haskell-hledger-web/debian/patches/newer-hledger b/p/haskell-hledger-web/debian/patches/newer-hledger
deleted file mode 100644
index de95c98..0000000
--- a/p/haskell-hledger-web/debian/patches/newer-hledger
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/hledger-web.cabal
-+++ b/hledger-web.cabal
-@@ -129,8 +129,8 @@ library
-     if flag(dev) || flag(library-only)
-         cpp-options: -DDEVELOPMENT
-     build-depends:
--          hledger-lib == 0.27
--        , hledger == 0.27
-+          hledger-lib == 0.27.1
-+        , hledger == 0.27.1
-         , base               >= 4 && < 5
-         , base-compat        >= 0.8.1
-         , blaze-html
-@@ -202,8 +202,8 @@ executable hledger-web
-     if flag(dev)
-       cpp-options: -DDEVELOPMENT
-     build-depends:
--          hledger-lib == 0.27
--        , hledger == 0.27
-+          hledger-lib == 0.27.1
-+        , hledger == 0.27.1
-         , base               >= 4 && < 5
-         , base-compat        >= 0.8.1
-         , blaze-html
-@@ -255,8 +255,8 @@ test-suite test
-     ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
-     cpp-options: -DVERSION="0.27"
-     build-depends:
--          hledger-lib == 0.27
--        , hledger == 0.27
-+          hledger-lib == 0.27.1
-+        , hledger == 0.27.1
-         , base               >= 4 && < 5
-         , base-compat        >= 0.8.1
-         , blaze-html
diff --git a/p/haskell-hledger-web/debian/patches/series b/p/haskell-hledger-web/debian/patches/series
deleted file mode 100644
index c9ff34b..0000000
--- a/p/haskell-hledger-web/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-newer-hledger

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git