make-firefox: preserve branding-common.mozbuild

This commit is contained in:
Ruben Rodriguez 2016-08-14 21:52:58 -04:00
parent 43619be469
commit 24dea1d1ff

View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=46 VERSION=47
. ./config . ./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 sed '/Package: @MOZ_PKG_NAME@$/,/Description:/ s/Provides:/Provides: firefox, /' debian/control.in -i
# Branding files # Branding files
rm browser/branding/* -rf rm browser/branding/{official,aurora,nightly,unofficial} -rf
cp -a $DATA/branding/ browser/branding/official cp -a $DATA/branding/ browser/branding/official
cat << EOF > debian/config/branch.mk cat << EOF > debian/config/branch.mk
CHANNEL = release CHANNEL = release