[DHG_packages] 01/03: Merge branch 'master' into jessie-backports

[Joachim Breitner]

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

nomeata pushed a commit to branch jessie-backports
in repository DHG_packages.

commit 89c57b19a2718f5e1775dabc280418ec53c9af0d
Merge: da207fa 50700b8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jan 12 10:36:15 2016 +0100

    Merge branch 'master' into jessie-backports
    
    Without adding new changelog entries yet; I will defer the upload of GHC to
    jessie-backports until the currently unreleased change is also in
    testing.

 p/ghc/debian/changelog                             | 24 ++++++
 p/ghc/debian/control                               |  5 +-
 p/ghc/debian/patches/armel-revert-ghci-fixes.patch | 86 ++++++++++++++++++++++
 p/ghc/debian/rules                                 |  3 +
 p/haskell-cabal/debian/changelog                   |  6 ++
 p/haskell-http/debian/changelog                    |  6 ++
 p/haskell-stm/debian/changelog                     |  6 ++
 p/haskell-text/debian/changelog                    |  6 ++
 p/haskell-zlib/debian/changelog                    |  6 ++
 9 files changed, 146 insertions(+), 2 deletions(-)

diff --cc p/ghc/debian/changelog
index 991692c,816d0be..a50c0c9
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@@ -1,11 -1,27 +1,35 @@@
+ ghc (7.10.3-6) UNRELEASED; urgency=medium
+ 
+   * Let GHC break cabal-install (<< 1.22), due to
+     "ghc no longer supports single-file style package databases"
+ 
+  -- Joachim Breitner <nomeata at debian.org>  Mon, 11 Jan 2016 09:55:37 +0100
+ 
+ ghc (7.10.3-5) unstable; urgency=medium
+ 
+   * ghc-doc Breaks/Replaces libghc-terminfo-doc (<< 0.3.2.5-4),
+     libghc-transformers-doc (<< 0.3.0.0-6), libghc-xhtml-doc (<<
+     3000.2.1-5), now that these are all shipped with ghc (closes: #800423).
+ 
+  -- Colin Watson <cjwatson at debian.org>  Tue, 05 Jan 2016 10:22:34 +0000
+ 
+ ghc (7.10.3-4.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Add debian/patches/armel-revert-ghci-fixes.patch which reverts
+     the ARM ghci fixes, but apply the patch on armel only with
+     the help of the debian/rules file (Closes: #807020).
+ 
+  -- John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>  Sun, 20 Dec 2015 17:01:39 +0100
+ 
 +ghc (7.10.3-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Tighten build-depends on ghc; this does not build against 7.6 any more, so
 +    lets use the 7.8 already in backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:15 +0100
 +
  ghc (7.10.3-4) unstable; urgency=medium
  
    [ Colin Watson ]
diff --cc p/haskell-cabal/debian/changelog
index 37111d1,a4d4042..caf2b7a
--- a/p/haskell-cabal/debian/changelog
+++ b/p/haskell-cabal/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ haskell-cabal (1.22.5.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Dmitry Bogatov <KAction at gnu.org>  Sat, 26 Dec 2015 16:18:17 +0300
+ 
 +haskell-cabal (1.22.4.0-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:15 +0100
 +
  haskell-cabal (1.22.4.0-2) unstable; urgency=medium
  
    * Switch Vcs-Git/Vcs-Browser headers to new location.
diff --cc p/haskell-http/debian/changelog
index 76b4adc,405b2a9..74f9c5a
--- a/p/haskell-http/debian/changelog
+++ b/p/haskell-http/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ haskell-http (1:4000.2.23-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Clint Adams <clint at debian.org>  Mon, 11 Jan 2016 01:09:16 -0500
+ 
 +haskell-http (1:4000.2.20-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:15 +0100
 +
  haskell-http (1:4000.2.20-3) unstable; urgency=medium
  
    * Switch Vcs-Git/Vcs-Browser headers to new location.
diff --cc p/haskell-stm/debian/changelog
index a338704,b684d3e..f141e0a
--- a/p/haskell-stm/debian/changelog
+++ b/p/haskell-stm/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ haskell-stm (2.4.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Clint Adams <clint at debian.org>  Sun, 10 Jan 2016 21:25:36 -0500
+ 
 +haskell-stm (2.4.4-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:16 +0100
 +
  haskell-stm (2.4.4-4) unstable; urgency=medium
  
    * Switch Vcs-Git/Vcs-Browser headers to new location.
diff --cc p/haskell-text/debian/changelog
index 23d0d72,a9702f5..4bc120b
--- a/p/haskell-text/debian/changelog
+++ b/p/haskell-text/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ haskell-text (1.2.2.0-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Clint Adams <clint at debian.org>  Sun, 10 Jan 2016 21:41:12 -0500
+ 
 +haskell-text (1.2.1.3-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:16 +0100
 +
  haskell-text (1.2.1.3-2) unstable; urgency=medium
  
    * Switch Vcs-Git/Vcs-Browser headers to new location.
diff --cc p/haskell-zlib/debian/changelog
index 893ed1f,60e4d46..1f8b90f
--- a/p/haskell-zlib/debian/changelog
+++ b/p/haskell-zlib/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
+ haskell-zlib (0.6.1.1-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Clint Adams <clint at debian.org>  Sun, 10 Jan 2016 21:24:35 -0500
+ 
 +haskell-zlib (0.5.4.2-4~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Joachim Breitner <nomeata at debian.org>  Tue, 22 Dec 2015 10:36:16 +0100
 +
  haskell-zlib (0.5.4.2-4) unstable; urgency=medium
  
    [ Joachim Breitner ]

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