summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:54:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:54:09 +0000
commit48d2b0440ea3c7e1996b721870c73377dc5f28da (patch)
tree35d48e3c2433865eeb2f5b8607d4c39f10a231c2
parentMerging upstream version 125.0.3. (diff)
downloadfirefox-48d2b0440ea3c7e1996b721870c73377dc5f28da.tar.xz
firefox-48d2b0440ea3c7e1996b721870c73377dc5f28da.zip
Merging debian version 125.0.3-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules4
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8cbc22d08e..651e5bab1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+firefox (125.0.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ * debian/rules: Avoid conflicting initializations of the mozbuild state
+ directory.
+
+ -- Mike Hommey <glandium@debian.org> Wed, 01 May 2024 11:43:16 +0900
+
firefox (125.0.2-1~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/rules b/debian/rules
index b5514f5484..11957f9f66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -177,6 +177,10 @@ debian/l10n/$(PRODUCT)-l10n.control: %: %.in
$(call lazy,LIBAVCODEC,$$(shell awk -F\" '/libavcodec\.so\./ { sub(/libavcodec\.so\./,"", $$$$2); p = "libavcodec" $$$$2 " | libavcodec-extra" $$$$2; if (d) { d = d " | " p } else { d = p } } END { print d }' dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp))
+$(PREPROCESSED_FILES): stamps/mozbuild-state
+stamps/mozbuild-state::
+ MOZ_OBJDIR=debian/objdir MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none $(PYTHON) ./mach python -c ""
+
$(PREPROCESSED_FILES): VARS = GRE_VERSION PRODUCT_DOWNLOAD_NAME $(PRODUCT) $(call uc,$(PRODUCT)) $(Product) MOZ_APP_REMOTINGNAME $(SYSTEM_LIBS_VARS) SHORT_SOURCE_CHANNEL DIST TRANSITION MOZ_ENABLE_V4L2 CRASH_REPORTER DEB_HOST_ARCH
debian/control: VARS += L10N_PACKAGES_DEPS PRODUCT LIBAVCODEC
$(PREPROCESSED_FILES):