diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 12 | ||||
| -rw-r--r-- | debian/control.in | 12 | ||||
| -rwxr-xr-x | debian/rules | 4 |
4 files changed, 15 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index df4adcbc08..8c4851cf63 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) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 071b381a00..7345ce0230 100644 --- a/debian/control +++ b/debian/control @@ -29,12 +29,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 59273b0ce5..a869fab061 100644 --- a/debian/control.in +++ b/debian/control.in @@ -51,19 +51,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 8c91e06567..0b48b60b65 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 |