summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-23 04:30:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-23 04:30:03 +0000
commit9ec8593d73a21c9191a1d873a9ea4a365d9c6bd6 (patch)
treef013c831db6fd672aa093b404deb5460fd389d03
parentMerging upstream version 125.0.2. (diff)
downloadfirefox-9ec8593d73a21c9191a1d873a9ea4a365d9c6bd6.tar.xz
firefox-9ec8593d73a21c9191a1d873a9ea4a365d9c6bd6.zip
Merging debian version 125.0.2-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index a5eee6c88d..62d295e6cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+firefox (125.0.2-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Mike Hommey <glandium@debian.org> Tue, 23 Apr 2024 05:42:33 +0900
+
firefox (125.0.1-2~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch b/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch
index c50a192e44..a0da2fb09c 100644
--- a/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch
+++ b/debian/patches/debian-hacks/Don-t-auto-disable-extensions-in-system-directories.patch
@@ -7,7 +7,7 @@ Subject: Don't auto-disable extensions in system directories
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 1ef5a05..4c36df2 100644
+index 32cd57b..aaad3b3 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -58,7 +58,7 @@ pref("extensions.systemAddon.update.enabled", true);