CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Download KDE patches in make-firefox helper

Browse source
This commit is contained in:
Legimet 2016-02-14 15:25:08 -05:00 • committed by Ruben Rodriguez
parent 2f1b546862
commit 0b5864cbda
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
helpers/config
View file

@ -21,6 +21,7 @@
set -e set -e
export LANG=C LC_TIME=C export LANG=C LC_TIME=C
PACKAGE=$(echo $0 |/bin/sed s/make-//g) PACKAGE=$(echo $0 |/bin/sed s/make-//g)
PKGVERSION=$(dpkg-parsechangelog --show-field Version)
export DATE=$(date +'%a, %d %b %Y %T %z') export DATE=$(date +'%a, %d %b %Y %T %z')
@ -53,7 +54,7 @@ find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execd
} }
changelog(){ changelog(){
head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
echo | dch -D $REPO -v $(/bin/sed -n '1s/^.*(\(.*\)).*/\1'+${REVISION}trisquel${VERSION}'/p' debian/changelog) "$1" echo | dch -D $REPO -v ${PKGVERSION}+${REVISION}trisquel${VERSION} "$1"
# Make sure the changelog file is identical between archs # Make sure the changelog file is identical between archs
/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog

12
helpers/make-firefox
View file

@ -29,10 +29,14 @@ patch -p1 < $DATA/enable-js-options.patch
cp ./browser/components/preferences/advanced-scripts.xul ./browser/components/preferences/in-content/ cp ./browser/components/preferences/advanced-scripts.xul ./browser/components/preferences/in-content/
# KDE integration patches from https://www.rosenauer.org/hg/mozilla # KDE integration patches from https://www.rosenauer.org/hg/mozilla
# These should be taken from the hg branch corresponding to the right version # Use firefox$MAJORVERSION branch if available, otherwise use default
# (or default) and placed in the DATA directory in unmodified form MAJORVERSION=echo "$PKGVERSION" | sed 's/\([0-9]\+\).*/\1/'
cp $DATA/mozilla-kde.patch debian/patches/ BRANCH=firefox$MAJORVERSION
cp $DATA/firefox-kde.patch debian/patches/abrowser-kde.patch if ! wget --spider https://rosenauer.org/hg/mozilla/log/$BRANCH; then
BRANCH=default
fi
wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/mozilla-kde.patch -O debian/patches/mozilla-kde.patch
wget https://rosenauer.org/hg/mozilla/raw-file/$BRANCH/firefox-kde.patch -O debian/patches/abrowser-kde.patch
# Add to series # Add to series
cat << EOF >> debian/patches/series cat << EOF >> debian/patches/series