[DHG_packages] 02/02: Merge branch 'master' of alioth.debian.org:/git/pkg-haskell/DHG_packages

[Joachim Breitner]

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

nomeata pushed a commit to annotated tag agda_v2.5.1-2
in repository DHG_packages.

commit 8e62913f4ce83a26f3392c4184e012973397f2df
Merge: 96d0173 fe200e6
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Jun 20 10:50:43 2016 +0200

    Merge branch 'master' of alioth.debian.org:/git/pkg-haskell/DHG_packages

 p/agda/debian/changelog           | 12 ++++++++++--
 p/agda/debian/control             |  3 ++-
 p/agda/debian/copyright           |  2 +-
 p/agda/debian/rules               |  3 +++
 p/xmonad-extras/debian/control    |  2 +-
 p/xmonad-wallpaper/debian/control |  2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --cc p/agda/debian/changelog
index 3e015a8,ec4dded..0c786de
--- a/p/agda/debian/changelog
+++ b/p/agda/debian/changelog
@@@ -1,8 -1,12 +1,16 @@@
- agda (2.5.1-2) UNRELEASED; urgency=medium
+ agda (2.5.1-2) unstable; urgency=low
  
++  [ Joachim Breitner ]
 +  * Fix Vcs-Browser field.
 +
-  -- Joachim Breitner <nomeata at debian.org>  Fri, 17 Jun 2016 09:34:27 +0200
++  [ Sean Whitton ]
+   * Add --ghc-options="-optc--param -optcggc-min-expand=10" to GHC
+     configure args in an attempt to fix FTBFS on arm buildds.
+     As suggested by Joachim Breitner.
+   * Set Priority: extra and Section: oldlibs on agda-mode transitional package.
+   * Add missing continuation marker in d/copyright.
+ 
+  -- Sean Whitton <spwhitton at spwhitton.name>  Mon, 20 Jun 2016 17:34:46 +0900
  
  agda (2.5.1-1) unstable; urgency=medium
  

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