[DHG_packages] 03/08: ghc-mod: Upgrading from 5.2.1.2 to 5.3.0.0

[Sven Bartscher]

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

svenb-guest pushed a commit to branch master
in repository DHG_packages.

commit 92bc358507c578a170fa01182ebf1c08a485d53b
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Sun Aug 16 19:15:50 2015 +0200

    ghc-mod: Upgrading from 5.2.1.2 to 5.3.0.0
---
 p/ghc-mod/debian/changelog |  6 ++++++
 p/ghc-mod/debian/control   | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/p/ghc-mod/debian/changelog b/p/ghc-mod/debian/changelog
index a3a4f08..5d1ce92 100644
--- a/p/ghc-mod/debian/changelog
+++ b/p/ghc-mod/debian/changelog
@@ -1,3 +1,9 @@
+ghc-mod (5.3.0.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Sven Bartscher <sven.bartscher at weltraumschlangen.de>  Sun, 16 Aug 2015 19:15:50 +0200
+
 ghc-mod (5.2.1.2-1) unstable; urgency=medium
 
   * New upstream release (Closes: #785936)
diff --git a/p/ghc-mod/debian/control b/p/ghc-mod/debian/control
index e6fc38b..ff17700 100644
--- a/p/ghc-mod/debian/control
+++ b/p/ghc-mod/debian/control
@@ -6,24 +6,66 @@ Build-Depends: debhelper (>= 9),
  haskell-devscripts (>= 0.9),
  cdbs,
  ghc,
+<<<<<<< HEAD
  ghc-ghci,
  libghc-async-dev,
  libghc-convertible-dev,
  libghc-djinn-ghc-dev (>= 0.0.2.2),
  libghc-data-default-dev,
+=======
+ ghc-prof,
+ libghc-cabal-helper-dev (>= 0.5.1.0),
+ libghc-cabal-helper-dev (<< 0.6),
+ libghc-cabal-helper-prof,
+ libghc-cereal-dev (>= 0.4),
+ libghc-cereal-prof,
+ libghc-djinn-ghc-dev (>= 0.0.2.2),
+ libghc-djinn-ghc-prof,
+ libghc-fclabels-dev,
+ libghc-fclabels-prof,
+>>>>>>> 7234ba1... ghc-mod: Upgrading from 5.2.1.2 to 5.3.0.0
  libghc-ghc-paths-dev,
  libghc-ghc-syb-utils-dev,
  libghc-src-exts-dev,
  libghc-hlint-dev (>= 1.8.61),
+<<<<<<< HEAD
  libghc-io-choice-dev,
  libghc-monad-control-dev,
+=======
+ libghc-hlint-prof,
+ libghc-monad-control-dev (>= 1),
+ libghc-monad-control-prof,
+>>>>>>> 7234ba1... ghc-mod: Upgrading from 5.2.1.2 to 5.3.0.0
  libghc-monad-journal-dev (>= 0.4),
  libghc-mtl-dev (>= 2.0),
  libghc-split-dev,
  libghc-syb-dev,
  libghc-text-dev,
  libghc-transformers-base-dev,
+<<<<<<< HEAD
  libghc-temporary-dev,
+=======
+ libghc-transformers-base-prof,
+ libghc-async-dev,
+Build-Depends-Indep: ghc-doc,
+ libghc-cabal-helper-doc,
+ libghc-cereal-doc,
+ libghc-djinn-ghc-doc,
+ libghc-fclabels-doc,
+ libghc-ghc-paths-doc,
+ libghc-ghc-syb-utils-doc,
+ libghc-src-exts-doc,
+ libghc-hlint-doc,
+ libghc-monad-control-doc,
+ libghc-monad-journal-doc,
+ libghc-mtl-doc,
+ libghc-old-time-doc,
+ libghc-split-doc,
+ libghc-syb-doc,
+ libghc-temporary-doc,
+ libghc-text-doc,
+ libghc-transformers-base-doc,
+>>>>>>> 7234ba1... ghc-mod: Upgrading from 5.2.1.2 to 5.3.0.0
 Standards-Version: 3.9.5
 Homepage: http://www.mew.org/~kazu/proj/ghc-mod/
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/ghc-mod

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