[Pkg-haskell-commits] darcs: ghc: Last update broke the calculation of the Provides fields, fixing. (Closes: #751051)

[Joachim Breitner]

Mon Jun  9 20:18:59 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Last update broke the calculation of the Provides fields, fixing. (Closes: #751051)

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

Mon Jun  9 20:18:59 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Last update broke the calculation of the Provides fields, fixing. (Closes: #751051)
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2014-06-09 21:45:33.427199923 +0000
+++ new-ghc/changelog	2014-06-09 21:45:33.451199855 +0000
@@ -1,3 +1,10 @@
+ghc (7.6.3-12) UNRELEASED; urgency=medium
+
+  * Last update broke the calculation of the Provides fields, fixing.
+    (Closes: #751051)
+
+ -- Joachim Breitner <nomeata at debian.org>  Mon, 09 Jun 2014 22:01:05 +0200
+
 ghc (7.6.3-11) unstable; urgency=medium
 
   * Do no conflict with libghc-cabal-dev. 
diff -rN -u old-ghc/provided_substvars new-ghc/provided_substvars
--- old-ghc/provided_substvars	2014-06-09 21:45:33.427199923 +0000
+++ new-ghc/provided_substvars	2014-06-09 21:45:33.447199866 +0000
@@ -19,7 +19,7 @@
     my $pkgstring = $_;
     LOOP: while ($pkgstring =~ m,([^ ]*?)-\d.*? ?,g) {
 	my $pkg = $1;
-	next if $ignored{$pkg};
+	next if exists $ignored{$pkg};
 	push @pkgs, $1;
     }
 }
@@ -27,18 +27,14 @@
 
 my $buf;
 open DEV, '>debian/ghc.substvars';
-print DEV 'provided-devs=';
-$buf = "";
-foreach (@pkgs) {$buf .= "libghc-$_-dev, ";}
+$buf = "provided-devs=";
+foreach (sort @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 = "conflicting-devs=";
+foreach (sort @pkgs) {
+	next if $no_conflict{$_};
 	$buf .= "libghc-$_-dev, ";
 }
 $buf =~ s#(.*), #$1#;