[Pkg-haskell-commits] darcs: ghc: Do no conflict with libghc-cabal-dev.

[Joachim Breitner]

Sun Jun  8 11:56:47 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Do no conflict with libghc-cabal-dev. 

    M ./changelog +6
    M ./provided_substvars -7 +25

Sun Jun  8 11:56:47 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Do no conflict with libghc-cabal-dev. 
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-06-09 10:30:42.129408713 +0000
+++ new-ghc/changelog	2014-06-09 10:30:42.161408704 +0000
@@ -1,3 +1,9 @@
+ghc (7.6.3-11) UNRELEASED; urgency=medium
+
+  * Do no conflict with libghc-cabal-dev. 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 08 Jun 2014 13:56:08 +0200
+
 ghc (7.6.3-10) unstable; urgency=medium
 
   * Team upload.
diff -rN -u old-ghc/provided_substvars new-ghc/provided_substvars
--- old-ghc/provided_substvars	2014-06-09 10:30:42.129408713 +0000
+++ new-ghc/provided_substvars	2014-06-09 10:30:42.153408706 +0000
@@ -4,32 +4,50 @@
 
 open PKG, 'inplace/bin/ghc-pkg list --simple-output |'
     or die "ghc-pkg list failed: $!";
-my @pkgs;
+
 my @ignored = ('ghc', 'mtl', 'transformers', 'terminfo', 'haskeline', 'utf8-string', 'xhtml', 'rts');
+my %ignored;
+$ignored{$_}++ for @ignored;
+
+my @no_conflict = ('cabal');
+my %no_conflict;
+$no_conflict{$_}++ for @no_conflict;
+
+my @pkgs;
 while (<PKG>) {
     y/A-Z/a-z/;
     my $pkgstring = $_;
     LOOP: while ($pkgstring =~ m,([^ ]*?)-\d.*? ?,g) {
 	my $pkg = $1;
-	foreach (@ignored, @pkgs) {
-	    next LOOP if $_ eq $pkg;
-	}
+	next if $ignored{$pkg};
 	push @pkgs, $1;
     }
 }
 close PKG;
 
+my $buf;
 open DEV, '>debian/ghc.substvars';
 print DEV 'provided-devs=';
-my $buf = "";
+$buf = "";
 foreach (@pkgs) {$buf .= "libghc-$_-dev, ";}
 $buf =~ s#(.*), #$1#;
 print DEV $buf."\n";
 close DEV;
 
+open DEV, '>debian/ghc.substvars';
+print DEV 'conflicting-devs=';
+$buf = "";
+foreach (@pkgs) {
+	next if $no_conflict{$pkg};
+	$buf .= "libghc-$_-dev, ";
+}
+$buf =~ s#(.*), #$1#;
+print DEV $buf."\n";
+close DEV;
+
 open PROF, '>debian/ghc-prof.substvars';
 print PROF 'provided-profs=';
-my $buf = "";
+$buf = "";
 foreach (@pkgs) {$buf .= "libghc-$_-prof, ";}
 $buf =~ s#(.*), #$1#;
 print PROF $buf."\n";
@@ -37,7 +55,7 @@
 
 open DOC, '>debian/ghc-doc.substvars';
 print DOC 'provided-docs=';
-my $buf = "";
+$buf = "";
 foreach (@pkgs) {$buf .= "libghc-$_-doc, ";}
 $buf =~ s#(.*), #$1#;
 print DOC $buf."\n";