[DHG_packages] 02/02: Merge branch 'st3' of ssh://git.debian.org/git/pkg-haskell/DHG_packages into st3

[Kristoffer Rose]

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

krisrose pushed a commit to branch st3
in repository DHG_packages.

commit aa064350ec5a91191524df29f381964c0f5da841
Merge: 8d41904 f572eb7
Author: Kristoffer Rose <krisrose at debian.org>
Date:   Wed Aug 19 23:50:40 2015 +0200

    Merge branch 'st3' of ssh://git.debian.org/git/pkg-haskell/DHG_packages into st3

 p/gitit/debian/changelog                           |   6 +
 p/gitit/debian/control                             | 342 ++++++++++-----------
 p/haskell-cabal-helper/debian/control              |  13 +-
 p/haskell-cabal-helper/debian/copyright            |  47 ++-
 p/haskell-graphviz/debian/changelog                |   6 +
 p/haskell-graphviz/debian/patches/ghc-7.10-compat  |  13 +
 .../debian/patches/series                          |   0
 p/haskell-happstack-hsp/debian/changelog           |   6 +-
 .../debian/patches/ghc-7.10-compat                 |  11 -
 p/haskelldb-hdbc/debian/changelog                  |   6 +-
 p/haskelldb-hdbc/debian/patches/ghc-7.10-compat    |   9 -
 p/haskelldb-hdbc/debian/patches/series             |   1 -
 p/hoauth/debian/changelog                          |   4 +-
 p/hoauth/debian/control                            |   5 +-
 p/hoauth/debian/patches/ghc-7.10                   |  42 +++
 p/hoauth/debian/patches/series                     |   1 +
 p/xmonad-contrib/debian/changelog                  |   6 +
 p/xmonad-contrib/debian/control                    |   4 +
 p/xmonad/debian/patches/fix-GenerateManpage        |  23 +-
 19 files changed, 318 insertions(+), 227 deletions(-)

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