Merging debian version 115.9.0esr-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 15 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index d93f729de6..c79c9c65c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+firefox-esr (115.9.0esr-2) unstable; urgency=medium
+
+  * debian/control*, debian/rules: Undo workaround for bug 1052002.
+
+ -- Mike Hommey <glandium@debian.org>  Thu, 21 Mar 2024 14:01:10 +0900
+
 firefox-esr (115.9.0esr-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 286443c498..a68d7cf47f 100644
--- a/debian/control
+++ b/debian/control
@@ -32,12 +32,12 @@ Build-Depends: autotools-dev,
                nasm (>= 2.14) [amd64 i386],
                rustc (>= 1.63),
                cargo (>= 0.66),
-               llvm-14-dev,
-               libclang-14-dev,
-               clang-14,
-               libc++-14-dev-wasm32,
-               libclang-rt-14-dev-wasm32,
-               lld-14,
+               llvm-dev,
+               libclang-dev,
+               clang,
+               libc++-dev-wasm32,
+               libclang-rt-dev-wasm32,
+               lld,
                cbindgen (>= 0.24.3),
                nodejs (>= 12.22.1),
                zip,
diff --git a/debian/control.in b/debian/control.in
index 8ef01ee7e3..ba6d25d0f7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -54,19 +54,13 @@ Build-Depends: autotools-dev,
 %else
                cargo (>= 0.66),
 %endif
-%if DIST == bullseye || DIST == buster
                llvm-dev,
                libclang-dev,
                clang,
-%else
-               llvm-14-dev,
-               libclang-14-dev,
-               clang-14,
-%endif
 %if DIST != bullseye && DIST != buster
-               libc++-14-dev-wasm32,
-               libclang-rt-14-dev-wasm32,
-               lld-14,
+               libc++-dev-wasm32,
+               libclang-rt-dev-wasm32,
+               lld,
 %endif
                cbindgen (>= 0.24.3),
                nodejs (>= 12.22.1),
diff --git a/debian/rules b/debian/rules
index 59cb2d4d43..07636e8b6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,10 +140,6 @@ ifeq (default,$(origin CXX))
 CXX := g++
 endif
 
-ifeq (,$(filter buster bullseye,$(DIST)))
-PATH := /usr/lib/llvm-14/bin:$(PATH)
-endif
-
 ifneq (,$(filter mips mipsel,$(DEB_HOST_ARCH)))
 CONFIGURE_FLAGS += --disable-jit
 endif