From c11e36b4f491c0d15e5b8d3f83a2bf549904a2b4 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sat, 6 Feb 2021 11:42:59 +0100
Subject: v85.0.1-1

---
 scripts/build-librewolf-dpkg.conf | 6 +++---
 scripts/prep-librewolf-dpkg.conf  | 4 ++--
 scripts/prep-librewolf-dpkg.sh    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build-librewolf-dpkg.conf b/scripts/build-librewolf-dpkg.conf
index feb58da..f628ce1 100644
--- a/scripts/build-librewolf-dpkg.conf
+++ b/scripts/build-librewolf-dpkg.conf
@@ -1,10 +1,10 @@
 # Config file for prep-librewolf-dpkg.sh
 # Configure these settings before running that script.
 
-debian_firefox_version=${debian_firefox_version:-'85.0-1'}       # current version of Firefox package in Debian sid
-pkgver=${pkgver:-'85.0'}
+debian_firefox_version=${debian_firefox_version:-'85.0.1-1'}       # current version of Firefox package in Debian sid
+pkgver=${pkgver:-'85.0.1'}
 pkgrel=${pkgrel:-'1'}
-firefox_version=${pkgver:-'85.0'}                # current version of Firefox
+firefox_version=${pkgver:-'85.0.1'}                # current version of Firefox
 settings_commit=${settings_commit:-'master'}
 CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
 output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index d813c15..cdbeeb3 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -1,8 +1,8 @@
 # Config file for prep-librewolf-dpkg.sh
 # Configure these settings before running that script.
 
-debian_firefox_version=${debian_firefox_version:-'85.0-1'}       # current version of Firefox package in Debian sid
-firefox_version=${pkgver:-'85.0'}                # current version of Firefox
+debian_firefox_version=${debian_firefox_version:-'85.0.1-1'}       # current version of Firefox package in Debian sid
+firefox_version=${pkgver:-'85.0.1'}                # current version of Firefox
 settings_commit=${settings_commit:-'master'}
 CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
 output_dir=${CI_PROJECT_DIR}/out
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index e72410f..478ded2 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -148,8 +148,8 @@ ac_add_options --enable-optimize
 EOF
 
 # workaround to allow an older cargo version until 0.48 is available in SID
-sed -i 's/cargo (>= 0.48),/cargo (>= 0.46),/g' "${debian_dir}"/control.in
-sed -i 's/cargo (>= 0.48),/cargo (>= 0.46),/g' "${debian_dir}"/control
+sed -i 's/cargo (>= 0.47),/cargo (>= 0.46),/g' "${debian_dir}"/control.in
+sed -i 's/cargo (>= 0.47),/cargo (>= 0.46),/g' "${debian_dir}"/control
 sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control
 sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control.in
 
@@ -287,7 +287,7 @@ sed -r \
    -e '/libasound2-dev/s/libasound2-dev,/libasound2-dev, libjack-dev,/;' \
    -e '/^Vcs-/d' \
    -e '/^ firefox/s/firefox/librewolf/g' \
-   -e 's/cargo \(>= 0\.48\),/cargo \(>= 0\.46\),/' \
+   -e 's/cargo \(>= 0\.47\),/cargo \(>= 0\.46\),/' \
    -e 's/rustc \(>= 1\.47\),/rustc \(>= 1\.41\),/' \
    firefox_"${debian_firefox_version}".dsc > librewolf_"${debian_firefox_version}".dsc
 {
-- 
cgit