update-manager: update patches and match newer release.
This commit is contained in:
parent
226526fcbc
commit
5bab20d013
4 changed files with 156 additions and 117 deletions
|
|
@ -23,30 +23,34 @@ VERSION=23
|
|||
|
||||
. ./config
|
||||
|
||||
PRE_REVISION=10.0
|
||||
PRE_UPSTREAMRELEASE=20.04
|
||||
|
||||
rm UpdateManager/Core/LivePatchSocket.py
|
||||
rm tests/test_livepatch_socket.py
|
||||
# Important patch make sure to update when necessary.
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/remove-livepatch2.patch
|
||||
patch_p1 $DATA/remove-livepatch2.patch
|
||||
sed -i "/ubuntu-advantage-tools/d" debian/control
|
||||
|
||||
#Closes #12545
|
||||
patch --no-backup-if-mismatch -p0 < $DATA/trisquel-versions.patch
|
||||
patch_p1 $DATA/trisquel-versions.patch
|
||||
|
||||
cp $DATA/index.docbook help/C/index.docbook
|
||||
|
||||
# Prevent automated connections
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/prevent-autoconnection.patch
|
||||
patch_p1 $DATA/prevent-autoconnection.patch
|
||||
# NOTE: prevent-autoconnection.patch l10n is now part of the DATA/l10n/ patches.
|
||||
|
||||
# Roll back the usage of uaclient.api.u.pro.packages.updates.v1
|
||||
patch --no-backup-if-mismatch -p1 -R < $DATA/rm-usage_uaclient.api.u.pro.packages.updates.v1.patch
|
||||
patch_p1 $DATA/rm_pro.packages.updates_from_u-m.patch
|
||||
|
||||
replace internet Internet .
|
||||
replace Ubuntu Trisquel .
|
||||
replace TrisquelDistroInfo UbuntuDistroInfo .
|
||||
replace "Trisquel-Gettext" "Ubuntu-Gettext" .
|
||||
|
||||
sed -i 's/Trisquel 20.04 LTS to Trisquel 22.04 LTS/Trisquel 10.0 LTS to Trisquel 11.0 LTS/' HweSupportStatus/consts.py
|
||||
sed -i "s|Trisquel $PRE_UPSTREAMRELEASE LTS to Trisquel $UPSTREAMRELEASE LTS|Trisquel $PRE_REVISION LTS to Trisquel $REVISION LTS|" \
|
||||
HweSupportStatus/consts.py
|
||||
|
||||
replace kubuntu-desktop triskel .
|
||||
replace xubuntu-desktop trisquel-mini .
|
||||
|
|
@ -55,7 +59,6 @@ replace ubuntu-desktop trisquel .
|
|||
|
||||
sed '/%s base/ s/name.*/name = "Trisquel base"/' -i ./UpdateManager/Core/UpdateList.py
|
||||
sed 's_https://changelogs.ubuntu.com/changelogs/pool/_https://packages.trisquel.org/changelogs/pool/_' -i UpdateManager/Core/MyCache.py
|
||||
sed '/len(changelog) == 0/,/"later."/d' -i UpdateManager/Core/MyCache.py
|
||||
|
||||
#Make sure apt_pkg is enabled for prevent-autoconnection.patch to work.
|
||||
[ -z "$(grep 'import apt_pkg' UpdateManager/UpdateManager.py)" ] && \
|
||||
|
|
@ -76,8 +79,7 @@ sed -i 's|changelogs.ubuntu.com/|archive.trisquel.org/trisquel/|' UpdateManager/
|
|||
# Trisquel l10n modifications using git patches.
|
||||
for patch in $(ls -v ${DATA}/l10n/*.patch)
|
||||
do
|
||||
echo "> Applying $(echo $patch|xargs basename)"
|
||||
patch --no-backup-if-mismatch -Np1 < $patch
|
||||
patch_p1 $patch
|
||||
done
|
||||
|
||||
changelog "Compiled for Trisquel"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue