From 24dea1d1ff45c4d55de637ef16feaad25a8a7bd9 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sun, 14 Aug 2016 21:52:58 -0400
Subject: [PATCH] make-firefox: preserve branding-common.mozbuild
---
helpers/make-firefox | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/helpers/make-firefox b/helpers/make-firefox
index f670e638..ea68e483 100644
--- a/helpers/make-firefox
+++ b/helpers/make-firefox
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=46
+VERSION=47
. ./config
@@ -153,7 +153,7 @@ sed '/Package: @MOZ_PKG_NAME@-dev/,/Description:/ s/Provides:/Provides: firefox-
sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides: firefox, /' debian/control.in -i
# Branding files
-rm browser/branding/* -rf
+rm browser/branding/{official,aurora,nightly,unofficial} -rf
cp -a $DATA/branding/ browser/branding/official
cat << EOF > debian/config/branch.mk
CHANNEL = release
--
GitLab