[Git][haskell-team/DHG_packages][master] 2 commits: ghc: Fix Conflicts+Replaces+Provides

[Ilias Tsitsimpis]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
45b9a98a by Ilias Tsitsimpis at 2018-10-19T11:17:39Z
ghc: Fix Conflicts+Replaces+Provides

- - - - -
d10ca165 by Ilias Tsitsimpis at 2018-10-19T13:25:46Z
ghc: Use versioned Breaks instead of Conflicts

- - - - -


3 changed files:

- p/ghc/debian/changelog
- p/ghc/debian/control
- p/ghc/debian/provided_substvars


Changes:

=====================================
p/ghc/debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ghc (8.4.3+dfsg1-4) unstable; urgency=medium
+
+  * Add missing Breaks+Replaces+Provides (Closes: #910480).
+    Break+Replace+Provide all bundled libraries, including libghc-parsec3-dev.
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Fri, 19 Oct 2018 13:09:22 +0300
+
 ghc (8.4.3+dfsg1-3) unstable; urgency=medium
 
   * Conflict with mtl and stm.  closes: #910008.


=====================================
p/ghc/debian/control
=====================================
@@ -48,9 +48,10 @@ Provides:
   haddock,
   ghc-haddock,
   ${haddock:Provides}
-Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10)
-Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8), libghc-cabal-dev (<< 1.24.2.1), ${conflicting-devs}
-Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13), ghc-doc (<< 7.10), ghc-haddock (<< 7.10)
+Replaces: ghc6 (<< 7), ghc-dynamic (<< 7.8), ghc-haddock (<< 7.10), ${conflicting-devs}
+Conflicts: ghc6 (<< 7), ghc-dynamic (<< 7.8)
+Breaks: cabal-install (<< 1.22), haskell-devscripts (<< 0.8.13),
+ ghc-doc (<< 7.10), ghc-haddock (<< 7.10), ${conflicting-devs}
 Suggests: perl, ghc-prof, ghc-doc, haskell-doc, llvm-6.0
 Description: The Glasgow Haskell Compilation system
  The Glorious Glasgow Haskell Compilation system (GHC) is a compiler for


=====================================
p/ghc/debian/provided_substvars
=====================================
@@ -5,22 +5,23 @@
 open PKG, 'inplace/bin/ghc-pkg list --simple-output |'
     or die "ghc-pkg list failed: $!";
 
-my @ignored = ('ghc', 'utf8-string', 'rts', 'parallel');
+my @ignored = ('ghc', 'rts');
 my %ignored;
 $ignored{$_}++ for @ignored;
-
-my @no_conflict = ('cabal');
-my %no_conflict;
-$no_conflict{$_}++ for @no_conflict;
+my %pkgver;
+my %renamed;
+$renamed{"parsec"} = "parsec3";
 
 my @pkgs;
 while (<PKG>) {
     y/A-Z/a-z/;
     my $pkgstring = $_;
-    LOOP: while ($pkgstring =~ m,([^ ]*?)-\d.*? ?,g) {
+    LOOP: while ($pkgstring =~ m,([^ ]*?)-(\d[\d.]*) ?,g) {
 	my $pkg = $1;
 	next if exists $ignored{$pkg};
-	push @pkgs, $1;
+	$pkg = $renamed{$pkg} if exists $renamed{$pkg};
+	$pkgver{$pkg} = $2;
+	push @pkgs, $pkg;
     }
 }
 close PKG;
@@ -28,14 +29,13 @@ close PKG;
 my $buf;
 open DEV, '>debian/ghc.substvars';
 $buf = "provided-devs=";
-foreach (sort @pkgs) {$buf .= "libghc-$_-dev, ";}
+foreach (sort @pkgs) {$buf .= "libghc-$_-dev (= $pkgver{$_}), ";}
 $buf =~ s#(.*), #$1#;
 print DEV $buf."\n";
 
 $buf = "conflicting-devs=";
 foreach (sort @pkgs) {
-	next if $no_conflict{$_};
-	$buf .= "libghc-$_-dev, ";
+	$buf .= "libghc-$_-dev (<< $pkgver{$_}+), ";
 }
 $buf =~ s#(.*), #$1#;
 print DEV $buf."\n";
@@ -44,7 +44,7 @@ close DEV;
 open PROF, '>debian/ghc-prof.substvars';
 print PROF 'provided-profs=';
 $buf = "";
-foreach (@pkgs) {$buf .= "libghc-$_-prof, ";}
+foreach (@pkgs) {$buf .= "libghc-$_-prof (= $pkgver{$_}), ";}
 $buf =~ s#(.*), #$1#;
 print PROF $buf."\n";
 close PROF;
@@ -52,7 +52,7 @@ close PROF;
 open DOC, '>debian/ghc-doc.substvars';
 print DOC 'provided-docs=';
 $buf = "";
-foreach (@pkgs) {$buf .= "libghc-$_-doc, ";}
+foreach (@pkgs) {$buf .= "libghc-$_-doc (= $pkgver{$_}), ";}
 $buf =~ s#(.*), #$1#;
 print DOC $buf."\n";
 close DOC;



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ba6193352d47a46e130836e46b82d547b1a2f37a...d10ca165a091717047a37ccca080868000104dde

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/compare/ba6193352d47a46e130836e46b82d547b1a2f37a...d10ca165a091717047a37ccca080868000104dde
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20181019/220b353e/attachment-0001.html>