[DHG_packages] 02/02: Merge branch 'experimental' of moszumanska.debian.org:/git/pkg-haskell/DHG_packages into experimental Unfortunately I didn't do this soon enough and didn't include some changes in the last upload.

[Sven Bartscher]

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

kritzefitz pushed a commit to branch experimental
in repository DHG_packages.

commit e7d091a0222b0dbc897436def874f092d4874f47
Merge: c76d0fa 2112aa0
Author: Sven Bartscher <sven.bartscher at weltraumschlangen.de>
Date:   Tue Oct 11 21:46:54 2016 +0200

    Merge branch 'experimental' of
    moszumanska.debian.org:/git/pkg-haskell/DHG_packages into experimental
    Unfortunately I didn't do this soon enough and didn't include some
    changes in the last upload.

 p/ghc/debian/changelog |  8 ++++++++
 p/ghc/debian/rules     | 11 ++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --cc p/ghc/debian/changelog
index 7d36804,7486639..373dbab
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@@ -1,16 -1,6 +1,24 @@@
 -ghc (8.0.1-2) UNRELEASED; urgency=medium
++ghc (8.0.1-4) experimental; urgency=medium
+ 
 -  * Merge from unstable (up to 7.0.3-10)
++  [ Balint Reczey ]
++  * Disable PIE to fix build when PIE is the default in gcc
++    (change taken/revised from Ubuntu, Closes: #712228)
++
++ -- Sven Bartscher <kritzefitz at debian.org>  Tue, 11 Oct 2016 21:45:26 +0200
++
 +ghc (8.0.1-3) experimental; urgency=low
 +
 +  * Removed the empty ghc-dbgsym package.
 +
 + -- Sven Bartscher <kritzefitz at debian.org>  Tue, 11 Oct 2016 16:43:21 +0200
 +
 +ghc (8.0.1-2) experimental; urgency=medium
 +
 +  [ Joachim Breitner ]
 +  * Merge from unstable (up to 7.0.3-9)
 +
 +  [ Matthias Klose ]
 +  * Disable PIE on amd64 and ppc64el.
  
    [ Gianfranco Costamagna ]
    * Fix VCS fields

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