summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorohfp <1813007-ohfp@users.noreply.gitlab.com>2021-03-24 11:52:09 +0100
committerohfp <1813007-ohfp@users.noreply.gitlab.com>2021-03-24 11:52:09 +0100
commit9035b0e4683eb6027d0f61e253b273bd47a6d907 (patch)
tree63b0fccfa69b1735307528ee9c1c687ea2a47360
parentremember: you need to use a variable if you want to use a variable.. (diff)
downloadlibrewolf-debian-9035b0e4683eb6027d0f61e253b273bd47a6d907.tar.gz
librewolf-debian-9035b0e4683eb6027d0f61e253b273bd47a6d907.tar.bz2
librewolf-debian-9035b0e4683eb6027d0f61e253b273bd47a6d907.zip
prepare v87.0-1
-rw-r--r--scripts/prep-librewolf-dpkg.conf2
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh8
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf
index 318af35..36d8cc2 100644
--- a/scripts/prep-librewolf-dpkg.conf
+++ b/scripts/prep-librewolf-dpkg.conf
@@ -4,7 +4,7 @@
# Available options for DISTRO: ubuntu debian
DISTRO=${DISTRO:-'debian'}
# current version of Firefox package in target distro
-distro_firefox_version=${distro_firefox_version:-'86.0+build3-0ubuntu0.20.04.1'}
+distro_firefox_version=${distro_firefox_version:-'87.0+build3-0ubuntu0.20.04.2'}
# current version of Firefox, as defined by name of the orig tarball.
firefox_version=${pkgver:-'86.0+build3'}
settings_commit=${settings_commit:-'master'}
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index ca96def..5c09349 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -173,11 +173,14 @@ sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control.in
mkdir -p "${debian_dir}"/patches/librewolf
if [[ ${DISTRO} == 'ubuntu' ]]; then
- cp -pr "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch \
- "${debian_dir}"/patches/librewolf/
+ cp -pr "${git_source_dir}"/linux/megabar.patch \
+ "${git_source_dir}"/linux/remove_addons.patch \
+ "${git_source_dir}"/linux/mozilla-vpn-ad.path \
+ "${debian_dir}"/patches/librewolf/
cat <<EOF >> "${debian_dir}"/patches/series
librewolf/remove_addons.patch -p1
librewolf/megabar.patch -p1
+librewolf/mozilla-vpn-ad.patch -p1
EOF
else
cp -pr "${git_source_dir}"/linux/megabar.patch "${git_source_dir}"/linux/remove_addons.patch \
@@ -197,6 +200,7 @@ librewolf/sandbox-update-arm-syscall-numbers.patch -p1
librewolf/remove_addons.patch -p1
librewolf/megabar.patch -p1
librewolf/reduce-rust-debuginfo.patch -p1
+librewolf/mozilla-vpn-ad.patch -p1
EOF
fi
bgstack15