Bug#979643: llvm-defaults: diff for NMU version 0.51+nmu2

[Jonas Smedegaard]

Package: llvm-defaults
Version: 0.51+nmu1
Severity: normal
Tags: patch  pending


Dear maintainer,

I've released an NMU for llvm-defaults (versioned as 0.51+nmu2). The diff
is attached to this message.

Regards.

diff -Nru llvm-defaults-0.51+nmu1/debian/changelog 
llvm-defaults-0.51+nmu2/debian/changelog
--- llvm-defaults-0.51+nmu1/debian/changelog    2020-12-19 17:10:28.000000000 
+0100
+++ llvm-defaults-0.51+nmu2/debian/changelog    2021-01-09 18:25:49.000000000 
+0100
@@ -1,3 +1,14 @@
+llvm-defaults (0.51+nmu2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  * fix provide unversioned wasm-ld in lld
+    (not broken symlink in llvm),
+    and replace + break broken package;
+    thanks to Paul Wise and Sylvestre Ledru
+
+ -- Jonas Smedegaard <d...@jones.dk>  Sat, 09 Jan 2021 18:25:49 +0100
+
 llvm-defaults (0.51+nmu1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru llvm-defaults-0.51+nmu1/debian/control 
llvm-defaults-0.51+nmu2/debian/control
--- llvm-defaults-0.51+nmu1/debian/control      2020-12-19 17:02:22.000000000 
+0100
+++ llvm-defaults-0.51+nmu2/debian/control      2021-01-09 18:22:52.000000000 
+0100
@@ -212,6 +212,8 @@
 Architecture: any
 Depends: lld-${pv:llvm} ${reqv:llvm}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Replaces: llvm (= 0.51+nmu1)
+Breaks: llvm (= 0.51+nmu1)
 Description: LLVM-based linker
  LLD is a new, high-performance linker. It is built as a set of reusable
  components which highly leverage existing libraries in the larger LLVM
diff -Nru llvm-defaults-0.51+nmu1/debian/rules 
llvm-defaults-0.51+nmu2/debian/rules
--- llvm-defaults-0.51+nmu1/debian/rules        2020-12-19 17:04:48.000000000 
+0100
+++ llvm-defaults-0.51+nmu2/debian/rules        2021-01-09 18:16:50.000000000 
+0100
@@ -178,7 +178,7 @@
                llvm-dwp llvm-exegesis llvm-lib llvm-lto llvm-lto2 llvm-mca 
llvm-modextract \
                llvm-mt llvm-objcopy llvm-opt-report llvm-pdbutil llvm-rc 
llvm-readelf \
                llvm-readobj llvm-split llvm-stress llvm-strings llvm-strip 
llvm-undname \
-               llvm-xray sanstats opt wasm-ld \
+               llvm-xray sanstats opt \
                ; do \
                dh_link -pllvm \
                        /usr/lib/llvm-$(PV_LLVM)/bin/$$bin \
@@ -394,6 +394,9 @@
        dh_link -plld \
                        /usr/bin/ld.lld-$(PV_LLVM) \
                        /usr/bin/ld.lld
+       dh_link -plld \
+                       /usr/bin/wasm-ld-$(PV_LLVM) \
+                       /usr/bin/wasm-ld
 
 
 nopkgs := $(foreach p, $(no_packages),-N$(p))