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

[Kristoffer Rose]

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

krisrose pushed a commit to branch master
in repository DHG_packages.

commit ff06a8d6b7da833cbc4674b86ab841dfbd1f24b6
Merge: 8fae8af 45db01c
Author: Kristoffer Rose <krisrose at debian.org>
Date:   Wed Aug 12 14:33:31 2015 +0200

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

 p/cpphs/debian/changelog                       |   6 +
 p/cpphs/debian/control                         |  74 ++--
 p/haskell-aeson/debian/changelog               |   6 +
 p/haskell-aeson/debian/rules                   |   6 +-
 p/haskell-blaze-html/debian/changelog          |   6 +
 p/haskell-blaze-html/debian/control            |  98 +++--
 p/haskell-cmdargs/debian/changelog             |   7 +
 p/haskell-cmdargs/debian/rules                 |   2 +-
 p/haskell-contravariant/debian/changelog       |   6 +
 p/haskell-contravariant/debian/control         |  90 +++--
 p/haskell-contravariant/debian/copyright       |  19 +-
 p/haskell-contravariant/debian/rules           |   3 +
 p/haskell-contravariant/debian/watch           |   2 +-
 p/haskell-glib/debian/changelog                |   6 +
 p/haskell-glib/debian/control                  |  72 ++--
 p/haskell-glib/debian/copyright                | 533 ++++++++++++++++++++++++-
 p/haskell-hjsmin/debian/changelog              |   6 +
 p/haskell-hjsmin/debian/control                |  77 ++--
 p/haskell-http-conduit/debian/changelog        |   6 +
 p/haskell-http-conduit/debian/control          | 149 +++----
 p/haskell-language-javascript/debian/changelog |   6 +
 p/haskell-language-javascript/debian/control   |  80 ++--
 p/haskell-pipes/debian/changelog               |   6 +
 p/haskell-pipes/debian/control                 |  70 ++--
 p/haskell-postgresql-libpq/debian/changelog    |   6 +
 p/haskell-postgresql-libpq/debian/control      |  46 +--
 p/haskell-quickcheck1/debian/changelog         |  91 -----
 p/haskell-quickcheck1/debian/compat            |   1 -
 p/haskell-quickcheck1/debian/control           |  91 -----
 p/haskell-quickcheck1/debian/copyright         |  16 -
 p/haskell-quickcheck1/debian/rules             |   8 -
 p/haskell-quickcheck1/debian/source/format     |   1 -
 p/haskell-quickcheck1/debian/watch             |   2 -
 p/haskell-wai-extra/debian/changelog           |   6 +
 p/haskell-wai-extra/debian/control             | 201 +++++-----
 p/haskell-web-routes/debian/changelog          |   7 +
 p/haskell-web-routes/debian/rules              |   2 +-
 p/haskell-xss-sanitize/debian/changelog        |   6 +
 p/haskell-xss-sanitize/debian/control          |  99 +++--
 p/haskell-yaml/debian/changelog                |   6 +
 p/haskell-yaml/debian/control                  |   4 +-
 p/haskell-yaml/debian/rules                    |   2 +-
 p/haskell-yesod-bin/debian/changelog           |   6 +
 p/haskell-yesod-bin/debian/control             | 118 +++---
 upgrade.sh                                     |  10 +-
 what-to-upgrade.pl                             |  64 +++
 46 files changed, 1308 insertions(+), 821 deletions(-)

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