[DHG_packages] 01/02: Merge branch 'master' into experimental

[Joachim Breitner]

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

nomeata pushed a commit to branch experimental
in repository DHG_packages.

commit 0f852712a0a6be5fb1d83c61415a1203ce74a168
Merge: 7136d38 5d5cf8c
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Sep 1 18:54:23 2015 -0700

    Merge branch 'master' into experimental

 p/haskell-stack/debian/changelog | 14 ++++++++++++++
 p/haskell-stack/debian/control   |  3 +++
 2 files changed, 17 insertions(+)

diff --cc p/haskell-stack/debian/changelog
index dbc74ed,6256124..65c00dd
--- a/p/haskell-stack/debian/changelog
+++ b/p/haskell-stack/debian/changelog
@@@ -1,11 -1,11 +1,25 @@@
++haskell-stack (0.1.3.0-2) UNRELEASED; urgency=medium
++
++  * Merge 0.1.2.0-2 from unstable
++
++ -- Joachim Breitner <nomeata at debian.org>  Tue, 01 Sep 2015 18:54:57 -0700
++
 +haskell-stack (0.1.3.0-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * Depend on haskell-devscripts >= 0.10 to ensure that this package
 +    builds against GHC in experimental
 +
 + -- Joachim Breitner <nomeata at debian.org>  Thu, 20 Aug 2015 10:28:44 +0200
 +
+ haskell-stack (0.1.2.0-2) unstable; urgency=medium
+ 
+   * Add ${shlibs:Depends} substvar, to pull in dependency on libyaml.
+   * Add dependencies on make and libgmp-dev, so that stack setup works.
+     Thanks to Tom Fitzhenry for reporting these two issues. Closes: 797446
+ 
+  -- Joachim Breitner <nomeata at debian.org>  Tue, 01 Sep 2015 18:43:05 -0700
+ 
  haskell-stack (0.1.2.0-1) unstable; urgency=low
  
    * Initial release

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