[DHG_packages] 01/01: Merge branch 'master' into st3

[Joachim Breitner]

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

nomeata pushed a commit to branch tmp/st3-upload
in repository DHG_packages.

commit 02f7f5d61883fc8055c698a70cc0fa563f57dd0e
Merge: c33a53c d3b6185
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Aug 20 14:02:58 2015 +0200

    Merge branch 'master' into st3

 p/cabal-debian/debian/changelog       |  8 +++++++-
 p/haskell-web-routes/debian/changelog |  9 ++++++++-
 p/haskell-web-routes/debian/control   | 12 ++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --cc p/cabal-debian/debian/changelog
index 23c6c3d,2b7048e..3d56c01
--- a/p/cabal-debian/debian/changelog
+++ b/p/cabal-debian/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
- cabal-debian (4.30.2-2) experimental; urgency=medium
++cabal-debian (4.31-2) experimental; urgency=medium
 +
 +  * 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:26:51 +0200
 +
+ cabal-debian (4.31-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Joachim Breitner <nomeata at debian.org>  Wed, 19 Aug 2015 22:25:01 +0200
+ 
  cabal-debian (4.30.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc p/haskell-web-routes/debian/changelog
index 39356f1,c39cfbb..bf8a163
--- a/p/haskell-web-routes/debian/changelog
+++ b/p/haskell-web-routes/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
- haskell-web-routes (0.27.9-3) experimental; urgency=medium
++haskell-web-routes (0.27.9-4) experimental; urgency=medium
 +
 +  * 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:29:02 +0200
 +
+ haskell-web-routes (0.27.9-3) unstable; urgency=medium
+ 
+   * Build-depend on test-related packages on arm64, armel, armhf, ppc64el,
+     and s390x as well, since they now have TH.
+ 
+  -- Colin Watson <cjwatson at debian.org>  Tue, 18 Aug 2015 00:19:39 +0100
+ 
  haskell-web-routes (0.27.9-2) unstable; urgency=medium
  
    * Fix ghci path in debian/rules so that tests will run on some

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