[Pkg-haskell-commits] [package-plan] 01/01: Merge branch 'master' into yesod-scaffold

[Joachim Breitner]

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

nomeata pushed a commit to branch yesod-scaffold
in repository package-plan.

commit ef2810bde87bd152da0167d1b4a089984399281c
Merge: efcabdb f25a792
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Sep 7 19:31:15 2014 +0200

    Merge branch 'master' into yesod-scaffold
    
    Conflicts:
    	test-packages.pl

 additional-cabals/Agda-2.4.2.cabal                 | 432 +++++++++++++++++++++
 additional-cabals/setlocale-1.0.0.cabal            |  25 --
 packages.txt                                       | 106 ++---
 patches/Agda/2.4.2/allow-transformers-0.4          |  16 +
 patches/Agda/2.4.2/series                          |   1 +
 patches/data-lens/2.10.5/new-semigroupoids         |  13 +
 patches/data-lens/2.10.5/series                    |   1 +
 patches/hledger-lib/0.23.2/new-mtl                 |  13 +
 patches/hledger-lib/0.23.2/series                  |   1 +
 patches/snap-loader-dynamic/0.10.0.2/new-mtl       |  13 +
 patches/snap-loader-dynamic/0.10.0.2/series        |   1 +
 patches/tabular/0.2.2.5/new-mtl                    |  13 +
 patches/tabular/0.2.2.5/series                     |   1 +
 patches/template/0.2.0.9/new-mtl                   |  13 +
 patches/template/0.2.0.9/series                    |   1 +
 .../{3.0.0 => 3.0.1}/no-attoparsec-conduit.diff    |   0
 patches/wai-app-file-cgi/{3.0.0 => 3.0.1}/series   |   0
 patches/wizards/1.0.1/new-mtl                      |  13 +
 patches/wizards/1.0.1/series                       |   1 +
 test-packages.pl                                   |  16 +-
 20 files changed, 599 insertions(+), 81 deletions(-)

diff --cc test-packages.pl
index 3ff38b4,0e63544..83b69fd
--- a/test-packages.pl
+++ b/test-packages.pl
@@@ -19,8 -19,8 +19,9 @@@ my %available
  my %ignored;
  my %notest;
  my %binary;
 +my %meta;
  my %obsolete;
+ my %ghcpkg;
  my @flags;
  my %group;
  
@@@ -54,7 -54,7 +55,8 @@@ while (<PACKAGES>) 
  	$binary{$pkg} = $1 if $attribs =~ s/binary=([a-z0-9-]+)\s*//;
  	$group{$pkg} = $1 if $attribs =~ s/group=([a-z0-9-]+)\s*//;
  	$binary{$pkg} = $pkg if $attribs =~ s/binary\s*//;
 +	$meta{$pkg}++ if $attribs =~ s/meta\s*//;
+ 	$ghcpkg{$pkg}++ if $attribs =~ s/ghcpkg\s*//;
  	push @flags, $1 while $attribs =~ s/(-f[^ ]+)\s*//;
  
  	if ($attribs) {

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