Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • trisquel/package-helpers
  • aklis/package-helpers
  • leny2010/package-helpers
  • fr33domlover/package-helpers
  • Legimet/package-helpers
  • ralphtheninja/package-helpers
  • damo22/package-helpers
  • wherrfrye/package-helpers
  • habs/package-helpers
  • pehjota/package-helpers
  • kpengboy/package-helpers
  • alvaro/package-helpers
  • salman/package-helpers
  • pabloyoyoista/package-helpers
  • mixalis/package-helpers
  • jorgesumle/package-helpers
  • a_slacker_here/package-helpers
  • chaosmonk/package-helpers
  • Beformed/package-helpers
  • dknight/package-helpers
  • proninyaroslav/package-helpers
  • adfeno/package-helpers
  • snd/package-helpers
  • davidpgil/package-helpers
  • diopon/package-helpers
  • ruben/package-helpers
  • bandali/package-helpers
  • joshaspinall/package-helpers
  • GNUtoo/package-helpers
  • Ark74/package-helpers
  • dragestil/package-helpers
  • bill-auger/package-helpers
  • andi89gi/package-helpers
  • Fikar/package-helpers
  • davidl/package-helpers
  • jas/package-helpers
  • parodper/package-helpers
  • David_Hedlund/package-helpers
  • dinomug/package-helpers
  • bf/package-helpers
  • hartkemd/package-helpers
  • del111/package-helpers
  • jxself/package-helpers
  • JacobK/package-helpers
44 results
Show changes
Showing
with 305 additions and 101 deletions
...@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info ...@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info
export UPSTREAM=focal export UPSTREAM=focal
export UPSTREAMRELEASE=20.04 export UPSTREAMRELEASE=20.04
MIRROR=http://archive.ubuntu.com/ubuntu MIRROR=http://archive.ubuntu.com/ubuntu
LOCALMIRROR=https://archive.trisquel.org/trisquel LOCALMIRROR=http://archive.trisquel.org/trisquel
LOCAL_APT=`mktemp -d` LOCAL_APT=`mktemp -d`
if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
...@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e ...@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e
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
[ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports [ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports
#Name convention issue "+" breaking packages build like console-setup, using "-" instead.
if [ "$NAME_CI" = true ];then
echo | dch -D $REPO -v `pkgversion`-${REVISION}trisquel${VERSION} "$1"
else
echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1" echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
fi
# 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
...@@ -189,10 +194,8 @@ cd source ...@@ -189,10 +194,8 @@ cd source
[ -f debian/source/format ] && rm debian/source/format [ -f debian/source/format ] && rm debian/source/format
[ -f debian/source/options ] && rm debian/source/options [ -f debian/source/options ] && rm debian/source/options
#for i in debian.master/control.stub.in debian.master/control.stub debian.master/control debian/control.stub.in debian/control.stub debian/control grep -lr 'Maintainer:' debian*/control* | \
#do xargs sed -i "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g"
# [ -f $i ] && /bin/sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i $i
#done
compile(){ compile(){
......
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
# 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=4 VERSION=5
. ./config . ./config
sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in
sed 's/GSettings.*/GSettings org.mate.interface accessibility/' -i a11y-profile-manager-indicator-autostart.desktop.in
cat << EOF >> profiles/blindness/profile.gsettings cat << EOF >> profiles/blindness/profile.gsettings
......
#!/bin/sh
#
# Copyright (C) 2022 Luis Guzman <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
#Remove unwanted plugin
sed -i 's|google ||' debian/rules
#Replace non-free fonts references
replace 'Arial Unicode MS' 'Liberation Sans' .
replace 'Times New Roman' 'Liberation Serif' .
replace 'Arial' 'Liberation Sans' .
changelog "Remove google-search plugin and non-free fonts references."
compile
#!/bin/sh
#
# Copyright (C) 2022 Alexandre Oliva <oliva@gnu.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
. ./config
#Patch to enable users with low uid to be configured as non-systemusers.
patch -p1 < $DATA/daemon_Allow_SystemAccount-false_to_be_set_in_cache_file.patch
changelog "Enable users with low uid to be configured as non-systemusers."
compile
...@@ -18,13 +18,12 @@ ...@@ -18,13 +18,12 @@
# 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=2 VERSION=3
. ./config . ./config
cp $DATA/Trisquel-mirror.list debian/ cp $DATA/Trisquel-mirror.list debian/
changelog "Added config for Trisquel GNU/Linux"
sed 's/Debian or Ubuntu/Trisquel/' -i apt-mirror sed 's/Debian or Ubuntu/Trisquel/' -i apt-mirror
sed 's/Debian/Trisquel/g' -i apt-mirror sed 's/Debian/Trisquel/g' -i apt-mirror
...@@ -33,7 +32,7 @@ sed "s/stable/$CODENAME/g" -i apt-mirror ...@@ -33,7 +32,7 @@ sed "s/stable/$CODENAME/g" -i apt-mirror
sed 's/ contrib//g' -i apt-mirror sed 's/ contrib//g' -i apt-mirror
sed 's/ non-free//g' -i apt-mirror sed 's/ non-free//g' -i apt-mirror
changelog "Update manpage for Trisquel" changelog "Added config and update manpage for Trisquel."
compile compile
...@@ -17,11 +17,12 @@ ...@@ -17,11 +17,12 @@
# 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=4 VERSION=5
. ./config . ./config
CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g") CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g")
POINT_RELEASE=".1"
# Disable dynamic motd # Disable dynamic motd
find -name *motd-news* -delete find -name *motd-news* -delete
...@@ -85,28 +86,28 @@ fi ...@@ -85,28 +86,28 @@ fi
EOF EOF
cat > etc/issue <<EOF cat > etc/issue <<EOF
Trisquel GNU/Linux $REVISION \n \l Trisquel GNU/Linux $REVISION$POINT_RELEASE \n \l
EOF EOF
cat > etc/issue.net <<EOF cat > etc/issue.net <<EOF
Trisquel GNU/Linux $REVISION Trisquel GNU/Linux $REVISION$POINT_RELEASE
EOF EOF
cat > etc/lsb-release <<EOF cat > etc/lsb-release <<EOF
DISTRIB_ID=Trisquel DISTRIB_ID=Trisquel
DISTRIB_RELEASE=$REVISION DISTRIB_RELEASE=$REVISION$POINT_RELEASE
DISTRIB_CODENAME=$CODENAME DISTRIB_CODENAME=$CODENAME
DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS" DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION$POINT_RELEASE, $CODENAMECAPS"
EOF EOF
cat > etc/os-release <<EOF cat > etc/os-release <<EOF
NAME="Trisquel GNU/Linux" NAME="Trisquel GNU/Linux"
VERSION="$REVISION, $CODENAMECAPS" VERSION="$REVISION$POINT_RELEASE, $CODENAMECAPS"
ID=trisquel ID=trisquel
ID_LIKE=debian ID_LIKE=debian
PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION)" PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION$POINT_RELEASE)"
VERSION_ID="$REVISION" VERSION_ID="$REVISION$POINT_RELEASE"
VERSION_CODENAME="$CODENAME" VERSION_CODENAME="$CODENAME"
UBUNTU_CODENAME="$UPSTREAM" UBUNTU_CODENAME="$UPSTREAM"
HOME_URL="https://trisquel.info/" HOME_URL="https://trisquel.info/"
......
...@@ -18,7 +18,7 @@ ...@@ -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=2 VERSION=3
. ./config . ./config
...@@ -38,10 +38,6 @@ replace firefox abrowser . ...@@ -38,10 +38,6 @@ replace firefox abrowser .
cp $DATA/icecat.xml cleaners/icecat.xml cp $DATA/icecat.xml cleaners/icecat.xml
changelog "Rename firefox to abrowser" changelog "Rename firefox to abrowser, add icecat cleaner and remove cleaners for non-free programs and stop advertising them"
changelog "Add icecat cleaner"
changelog "Remove cleaners for non-free programs and stop advertising them"
compile compile
#!/bin/sh
#
# Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
REPOKEY="871920D1991BC93C"
COMPONENT=main
NAME_CI=true
BUILD_UNTIL=10.0
. ./config
changelog "Backported from Impish"
compile
...@@ -18,7 +18,7 @@ ...@@ -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=9 VERSION=10
NETINST=true NETINST=true
. ./config . ./config
...@@ -63,7 +63,7 @@ open-ath9k-htc-firmware-udeb ...@@ -63,7 +63,7 @@ open-ath9k-htc-firmware-udeb
openfwwf-udeb openfwwf-udeb
EOF EOF
replace "2004-20.." "2004-20$(date +'%y')" . -R replace "2004-20.." "2004-20$(date +'%y')" .
rpl www.ubuntu.com trisquel.info . -R rpl www.ubuntu.com trisquel.info . -R
rpl ubuntu.com trisquel.info build/boot/ -R rpl ubuntu.com trisquel.info build/boot/ -R
rpl www.ubuntu trisquel build/boot/ -R rpl www.ubuntu trisquel build/boot/ -R
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,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=5 VERSION=6
NETINST=true NETINST=true
. ./config . ./config
...@@ -25,9 +25,7 @@ NETINST=true ...@@ -25,9 +25,7 @@ NETINST=true
rm scripts/* rm scripts/*
cp -a $DATA/* scripts/ cp -a $DATA/* scripts/
replace ports.trisquel.org archive.trisquel.org changelog "Only include trisquel origins"
changelog "Only include trisquel origins + armfh ports to archive"
compile compile
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2021 Luis Guzman <ark@switnet.org> # Copyright (C) 2022 Luis Guzman <ark@switnet.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,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=2 VERSION=3
. ./config . ./config
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# #
# Copyright (C) 2008-2021 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2021 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info> # Copyright (C) 2015 Santiago Rodriguez <santi@trisquel.info>
# Copyright (C) 2022 Luis Guzman <ark@switnet.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -18,7 +19,7 @@ ...@@ -18,7 +19,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=86 VERSION=91
. ./config . ./config
...@@ -50,14 +51,15 @@ sed -i '/activity-stream.showSponsored/s|true|false|g' browser/app/profile/firef ...@@ -50,14 +51,15 @@ sed -i '/activity-stream.showSponsored/s|true|false|g' browser/app/profile/firef
sed '/"browser.privatebrowsing.vpnpromourl"/s/https.*"/"/' -i browser/app/profile/firefox.js sed '/"browser.privatebrowsing.vpnpromourl"/s/https.*"/"/' -i browser/app/profile/firefox.js
sed '/network.connectivity-service.IPv/s/http.*success.txt?ipv[46]//' -i modules/libpref/init/all.js sed '/network.connectivity-service.IPv/s/http.*success.txt?ipv[46]//' -i modules/libpref/init/all.js
sed 's/accounts-static.cdn.mozilla.net.*sync.services.mozilla.com//' -i modules/libpref/init/all.js
# do not alter useragent/platform/oscpu/etc with fingerprinting countermeasure, it makes things worse
sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
sed '/If fingerprinting resistance is on/,/}/s/^/\/\//' -i ./dom/base/Navigator.cpp
# Replace ubufox recommendation # Replace ubufox recommendation
sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in
#Remove exceptions on warnings when installing addons.
sed -i '/addons.mozilla.org/d' browser/app/permissions
sed -i '/fpn.firefox.com/d' browser/app/permissions
# Disable healtreport # Disable healtreport
cat << EOF > toolkit/components/telemetry/healthreport-prefs.js cat << EOF > toolkit/components/telemetry/healthreport-prefs.js
pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.healthreport.uploadEnabled", false);
...@@ -76,11 +78,19 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in ...@@ -76,11 +78,19 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
# Disable DRM support, armhf has no such option. # Disable DRM support, armhf has no such option.
## Add other archs that might present the same lack of disable-eme option ## Add other archs that might present the same lack of disable-eme option
cat << ARCH >> debian/config/mozconfig.in cat << ARCH >> debian/config/mozconfig.in
%%if DEB_HOST_ARCH != ppc64el
%%if DEB_HOST_ARCH != arm64
%%if DEB_HOST_ARCH != armhf %%if DEB_HOST_ARCH != armhf
ac_add_options --disable-eme ac_add_options --disable-eme
%%endif %%endif
%%endif
%%endif
ARCH ARCH
cat << SIGN >> debian/config/mozconfig.in
export MOZ_REQUIRE_SIGNING=
SIGN
sed '/gmp-clearkey/d' -i ./debian/firefox.install.in sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
# Locale packages should provide firefox-locale-$LANG # Locale packages should provide firefox-locale-$LANG
...@@ -134,13 +144,14 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json ...@@ -134,13 +144,14 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
"favicon_url": "favicons/wikipedia.ico" "favicon_url": "favicons/wikipedia.ico"
}, },
{ {
"domains": ["wikinews.org"], "domains": ["h-node.org"],
"image_url": "images/wikinews.png", "image_url": "images/hnode.png",
"favicon_url": "favicons/wikinews.ico" "favicon_url": "favicons/hnode.ico"
} }
] ]
EOF EOF
#uuidgen --sha1 --namespace @dns --name "trisquel.info"
cat << TOP_JSON > services/settings/dumps/main/top-sites.json cat << TOP_JSON > services/settings/dumps/main/top-sites.json
{ {
"data": [ "data": [
...@@ -148,52 +159,53 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json ...@@ -148,52 +159,53 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json
"url": "https://trisquel.info/", "url": "https://trisquel.info/",
"order": 0, "order": 0,
"title": "Trisquel", "title": "Trisquel",
"id": "17aeb24c-da88-53bc-8915-c3e3d458070d", "id": "ec7f4843-6be5-5e86-870a-1c8383500a4b",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://www.gnu.org/", "url": "https://www.gnu.org/",
"order": 1, "order": 1,
"title": "GNU", "title": "GNU",
"id": "2a833806-e5c1-58e9-8b7c-69d9417a1253", "id": "1baee931-751c-5993-b6fe-d86fbf78f9b0",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://www.fsf.org/", "url": "https://www.fsf.org/",
"order": 2, "order": 2,
"title": "FSF", "title": "FSF",
"id": "d4e3e7e2-64d3-5bac-9c59-3c5c8e1efd8c", "id": "fcc60dd8-4d97-5aca-8e5d-784652c75818",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://directory.fsf.org/", "url": "https://directory.fsf.org/",
"order": 3, "order": 3,
"title": "FSF Directory", "title": "FSF Directory",
"id": "dbff6206-2ada-57ad-8091-8a62ac37be4c", "id": "abe5bfb2-9487-5697-9f27-e0b782dfe006",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://libreplanet.org/", "url": "https://libreplanet.org/",
"order": 4, "order": 4,
"title": "LibrePlanet", "title": "LibrePlanet",
"id": "6f586839-4063-58b8-95ed-62e034e1915e", "id": "e3d2cf88-a4dc-5d2e-9f9a-f3ea241d17d8",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://www.wikipedia.org/", "url": "https://www.wikipedia.org/",
"order": 5, "order": 5,
"title": "Wikipedia", "title": "Wikipedia",
"id": "5a18acd7-0440-5512-b3a4-20a35bdc9a1d", "id": "02c295f5-54a8-5d29-8d1f-b619216b20c0",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
}, },
{ {
"url": "https://www.wikinews.org/", "url": "https://h-node.org/",
"order": 6, "order": 6,
"title": "Wikinews", "title": "h-node",
"id": "3bb633ba-0823-4501-b3b5-bc1b8670e3e1", "id": "c426481f-8c3f-53b8-b23a-431a91a1c7b4",
"last_modified": $(date +%s%N | cut -b1-13) "last_modified": $(date +%s%N | cut -b1-13)
} }
] ],
"timestamp": $(date +%s%N | cut -b1-13)
} }
TOP_JSON TOP_JSON
...@@ -231,20 +243,24 @@ sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk ...@@ -231,20 +243,24 @@ sed "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk
############################################################################3 ############################################################################3
############################################################################3 ############################################################################3
############################################################################3 ############################################################################3
sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
# Branding files # Branding files
cp -a $DATA/branding/* browser/branding/official cp -a $DATA/branding/* browser/branding/official
cp -a $DATA/branding/* browser/branding/unofficial cp -a $DATA/branding/* browser/branding/unofficial
cp -a $DATA/branding/* browser/branding/nightly cp -a $DATA/branding/* browser/branding/nightly
cp -a $DATA/branding/* browser/branding/aurora
sed '/about-wordmark.svg/d' -i browser/base/content/aboutDialog.css sed '/about-wordmark.svg/d' -i browser/base/content/aboutDialog.css
echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> browser/base/content/aboutDialog.css echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> browser/base/content/aboutDialog.css
# Disable preprocessor # Disable preprocessor
sed 's/_PP//' -i browser/branding/branding-common.mozbuild sed 's/_PP//' -i browser/branding/branding-common.mozbuild
cat << EOF >> debian/config/branch.mk #Prevent duplicated values.
cat << EOF > debian/config/branch.mk
MOZILLA_REPO = https://hg.mozilla.org/releases/mozilla-release
L10N_REPO = https://hg.mozilla.org/l10n-central
CHANNEL = release CHANNEL = release
MOZ_WANT_UNIT_TESTS = 0 MOZ_WANT_UNIT_TESTS = 0
MOZ_BUILD_OFFICIAL = 0 MOZ_OFFICIAL_BUILD = 0
MOZ_ENABLE_BREAKPAD = 0 MOZ_ENABLE_BREAKPAD = 0
MOZ_ENABLE_TELEMETRY = 0 MOZ_ENABLE_TELEMETRY = 0
EOF EOF
...@@ -260,8 +276,9 @@ s|www.mozilla.com/firefox/central|trisquel.info/browser|g; ...@@ -260,8 +276,9 @@ s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
s|mozilla.com/plugincheck|trisquel.info/browser|g; s|mozilla.com/plugincheck|trisquel.info/browser|g;
s|www.mozilla.com/legal/privacy|trisquel.info/legal|g; s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
s|Firefox Nightly|Abrowser|; s|Firefox Nightly|Abrowser|;
s|Firefox Developer Edition|Abrowser|g;
s|Nightly|Abrowser|g; s|Nightly|Abrowser|g;
s|brandProductName=Firefox|brandProductName=Abrowser|; s|brand-product-name = Firefox|brand-product-name = Abrowser|;
s|Sign in to Firefox|Sign in to Sync|; s|Sign in to Firefox|Sign in to Sync|;
s|Search addons.mozilla.org|Search|g; s|Search addons.mozilla.org|Search|g;
s|firefox.settings.services.mozilla.com|127.0.0.1|g; s|firefox.settings.services.mozilla.com|127.0.0.1|g;
...@@ -282,7 +299,7 @@ sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1 ...@@ -282,7 +299,7 @@ sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1
rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/osx ./b2g rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/osx ./b2g
#Trisquel custom bookmarks #Trisquel custom bookmarks
cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in cp $DATA/default-bookmarks.html browser/base/content/default-bookmarks.html
#Trisquel custom search engines #Trisquel custom search engines
cp -a $DATA/searchplugins/* browser/components/search/extensions/ cp -a $DATA/searchplugins/* browser/components/search/extensions/
...@@ -358,16 +375,8 @@ MOZ_TELEMETRY_REPORTING=0 ...@@ -358,16 +375,8 @@ MOZ_TELEMETRY_REPORTING=0
MOZ_ADDON_SIGNING=0 MOZ_ADDON_SIGNING=0
EOF EOF
# Fix locale #Enable EGL by default
cat << EOF >> mobile/locales/en-US/chrome/region.properties sed -i '/gfx.x11-egl.force-enabled/,/mirror/s|false|true|' modules/libpref/init/StaticPrefList.yaml
browser.search.defaultenginename=DuckDuckGo
browser.search.order.1=DuckDuckGo
browser.search.order.2=Google
browser.search.order.3=Yahoo
browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
browser.suggestedsites.webmaker.title=GNU Project
browser.suggestedsites.webmaker.url=https://www.gnu.org
EOF
# Branding # Branding
rm mobile/android/branding/{official,unofficial,beta,nightly} -rf rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
...@@ -376,6 +385,10 @@ cp $DATA/android/mobile.ico mobile/android/app/ ...@@ -376,6 +385,10 @@ cp $DATA/android/mobile.ico mobile/android/app/
#cp $DATA/android/images/* mobile/android/themes/core/images/ #cp $DATA/android/images/* mobile/android/themes/core/images/
cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
#Fixes by patch on source.
##Firefox v100, based on parabola 9004-FSDG-misc.patch
patch -p1 < $DATA/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
# Postinst script to manage profile migration and system links # Postinst script to manage profile migration and system links
echo ' echo '
......
#!/bin/sh
# trisquel package helper for 'freedom-maker'
#
# Copyright (C) 2022 bill-auger <bill-auger@programmer.net>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
VERSION=1
. ./config
for patch in $(ls -v ${DATA}/*.patch)
do
echo "Applying $patch"
patch -Np1 < $patch
done
changelog "Build from Trisquel repos - Delete support for non-free hardware and emulators"
compile
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2021 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2021,2022 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# 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=7 VERSION=9
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe' EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
. ./config . ./config
...@@ -104,6 +104,9 @@ sed '/Paned/,/^$/s/background-image.*//' -i light/gtk-3.0/_common.scss ...@@ -104,6 +104,9 @@ sed '/Paned/,/^$/s/background-image.*//' -i light/gtk-3.0/_common.scss
sed '/Paned/,/^$/s/background-size.*//' -i light/gtk-3.0/_common.scss sed '/Paned/,/^$/s/background-size.*//' -i light/gtk-3.0/_common.scss
sed '/Paned/,/^}$/s/image($backdrop_borders_color)/image($bg_color)/' -i light/gtk-3.0/_common.scss sed '/Paned/,/^}$/s/image($backdrop_borders_color)/image($bg_color)/' -i light/gtk-3.0/_common.scss
# fix panel toggles too wide
sed '/min-width: 44px/d' -i light/gtk-3.0/_others.scss dark/gtk-3.0/_others.scss
# lxde panel # lxde panel
cat << EOF >> dark/gtk-2.0/apps/xfce-panel.rc cat << EOF >> dark/gtk-2.0/apps/xfce-panel.rc
......
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
# 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=1 VERSION=2
# note, we need version 3.20.6 or higher, the binary plugin requirement # note, we need version 3.20.6 or higher, the binary plugin requirement
# was reworked on that version. # was reworked on that version.
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe' EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
REPOKEY=871920D1991BC93C REPOKEY=871920D1991BC93C
QUILT=skip QUILT=skip
...@@ -31,9 +31,6 @@ QUILT=skip ...@@ -31,9 +31,6 @@ QUILT=skip
sed '/debhelper-compat/s/13/12/' -i debian/control sed '/debhelper-compat/s/13/12/' -i debian/control
# This is somehow missing from the source tarball, fetched from Debian git
cp $DATA/Common.h .
rm debian/patches/*-Install-check-plugin.py-as-a-script.patch rm debian/patches/*-Install-check-plugin.py-as-a-script.patch
sed -i '/Install-check-plugin.py-as-a-script.patch/d' debian/patches/series sed -i '/Install-check-plugin.py-as-a-script.patch/d' debian/patches/series
sed '/plugin/d' -i debian/hplip-gui.manpages debian/hplip.manpages debian/hplip-gui.install debian/hplip.install sed '/plugin/d' -i debian/hplip-gui.manpages debian/hplip.manpages debian/hplip-gui.install debian/hplip.install
......
#!/bin/sh
#
# Copyright (C) 2022 Luis Guzmán <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=1
EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main'
REPOKEY="C5E6A5ED249AD24C"
BACKPORT=true
. ./config
changelog "Imported to Trisquel from oficial PPA as dependency for deluge 2.x."
compile
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2021 Luis Guzman <ark@switnet.org> # Copyright (C) 2021 Luis Guzman <ark@switnet.org>
# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net> # Copyright (C) 2019 David Trudgian <dave@trudgian.net>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,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=10 VERSION=11
. ./config . ./config
...@@ -108,6 +108,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create ...@@ -108,6 +108,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create
line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1) line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
cat << EOF > debian.master/etc/kernelconfig
archs="amd64 i386 armhf arm64 ppc64el"
family='trisquel'
EOF
rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
......
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
# Copyright (C) 2021 Luis Guzman <ark@switnet.org> # Copyright (C) 2022 Luis Guzman <ark@switnet.org>
# Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com> # Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
# Copyright (C) 2019 David Trudgian <dave@trudgian.net> # Copyright (C) 2019 David Trudgian <dave@trudgian.net>
# #
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,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=3 VERSION=4
. ./config . ./config
......
#!/bin/sh
#
# Copyright (C) 2022 Luis Guzman <ark@switnet.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION=0
. ./config
#Remove gnome-shell and notification-daemon dependency
sed -i 's/gnome-shell <!s390x> | //g' debian/control
sed -i 's/notification-daemon <!s390x>/policykit-1-gnome <!s390x>/g' debian/control
changelog "Remove gnome-shell and notification-daemon dependency from network-manager-gnome"
compile
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2019 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -17,47 +17,46 @@ ...@@ -17,47 +17,46 @@
# 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=3 VERSION=4
COMPONENT=main COMPONENT=main
. ./config . ./config
cat << EOF > data/templates/Trisquel.mirrors cat << EOF > data/templates/Trisquel.mirrors
#LOC:CA #LOC:CA
https://mirror.freemirror.org/trisquel-packages/ https://mirror.csclub.uwaterloo.ca/trisquel/packages/
#LOC:FR
https://archive.trisquel.info/trisquel/
#LOC:US
https://mirror.fsf.org/trisquel/
http://mirrors.knoesis.org/trisquel/packages
https://mirrors.ocf.berkeley.edu/trisquel/
#LOC:IN
http://in.archive.trisquel.info/trisquel/
#LOC:EC
https://mirror.cedia.org.ec/trisquel.packages
#LOC:RO
http://mirrors.serverhost.ro/trisquel/packages
#LOC:CN #LOC:CN
https://mirrors.ustc.edu.cn/trisquel https://mirrors.ustc.edu.cn/trisquel
https://mirrors.nju.edu.cn/trisquel/
#LOC:DE
https://mirrors.dotsrc.org/trisquel/
#LOC:EC
https://mirror.cedia.org.ec/trisquel.packages
#LOC:HU
https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
#LOC:ES #LOC:ES
https://ftp.caliu.cat/pub/distribucions/trisquel/packages https://ftp.caliu.cat/pub/distribucions/trisquel/packages
https://mirror.librelabucm.org/trisquel/ https://mirror.librelabucm.org/trisquel/
#LOC:TW
https://ftp.yzu.edu.tw/Linux/trisquel.packages/
#LOC:SE #LOC:SE
https://mirror.linux.pizza/trisquel/packages/ https://mirror.linux.pizza/trisquel/packages/
https://ftp.acc.umu.se/mirror/trisquel/packages/ https://ftp.acc.umu.se/mirror/trisquel/packages/
#LOC:HU https://ftpmirror1.infania.net/mirror/trisquel/packages/
https://quantum-mirror.hu/mirrors/pub/trisquel/packages/ https://mirror.operationtulip.com/trisquel/packages/
#LOC:US
https://archive.trisquel.info/trisquel/
https://archive.trisquel.org/trisquel/
https://mirror.fsf.org/trisquel/
https://mirrors.ocf.berkeley.edu/trisquel/
https://mirror.math.princeton.edu/pub/trisquel-packages/
EOF EOF
cat << EOF > data/templates/Trisquel.info.in cat << EOF > data/templates/Trisquel.info.in
_ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/changelog _ChangelogURI: https://packages.trisquel.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
Suite: $CODENAME Suite: $CODENAME
RepositoryType: deb RepositoryType: deb
BaseURI: https://archive.trisquel.info/trisquel/ BaseURI: https://archive.trisquel.org/trisquel/
MatchURI: archive.trisquel.info/trisquel MatchURI: archive.trisquel.org/trisquel
MirrorsFile: Trisquel.mirrors MirrorsFile: Trisquel.mirrors
_Description: Trisquel $REVISION '$CODENAME' _Description: Trisquel $REVISION '$CODENAME'
Component: main Component: main
...@@ -67,8 +66,8 @@ _CompDescriptionLong: Officially supported ...@@ -67,8 +66,8 @@ _CompDescriptionLong: Officially supported
Suite: $CODENAME-security Suite: $CODENAME-security
ParentSuite: $CODENAME ParentSuite: $CODENAME
RepositoryType: deb RepositoryType: deb
BaseURI: https://archive.trisquel.info/trisquel/ BaseURI: https://archive.trisquel.org/trisquel/
MatchURI: archive.trisquel.info/trisquel MatchURI: archive.trisquel.org/trisquel
_Description: Important security updates _Description: Important security updates
Suite: $CODENAME-updates Suite: $CODENAME-updates
......