update for etiona
This commit is contained in:
parent
79e26d7b5e
commit
0ae7f6878b
1 changed files with 2 additions and 6 deletions
|
|
@ -2,6 +2,7 @@
|
||||||
#
|
#
|
||||||
# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
|
# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info>
|
||||||
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
|
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
|
||||||
|
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
|
||||||
#
|
#
|
||||||
# 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
|
||||||
|
|
@ -23,7 +24,7 @@
|
||||||
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
||||||
# The "obsoletes" list from ubuntu has been removed
|
# The "obsoletes" list from ubuntu has been removed
|
||||||
|
|
||||||
VERSION=3
|
VERSION=4
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
|
|
@ -33,7 +34,6 @@ rm ./DistUpgrade/NvidiaDetector
|
||||||
sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i
|
sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i
|
||||||
sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py
|
sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py
|
||||||
sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py
|
sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py
|
||||||
sed '/nvidia/d' DistUpgrade/build-tarball.sh -i
|
|
||||||
rm tests/test-data/xorg.conf.fglrx
|
rm tests/test-data/xorg.conf.fglrx
|
||||||
|
|
||||||
#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
|
#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
|
||||||
|
|
@ -333,10 +333,6 @@ for i in core gtk qt; do
|
||||||
sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control
|
sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control
|
||||||
done
|
done
|
||||||
|
|
||||||
#ubuntu-drivers-common is not a build-dep, nor avaliable in trisquel.
|
|
||||||
sed -i 's/cp \/usr\/share\/ubuntu-drivers-common\/obsolete/touch/g' DistUpgrade/build-tarball.sh
|
|
||||||
|
|
||||||
|
|
||||||
changelog "Compiled for Trisquel"
|
changelog "Compiled for Trisquel"
|
||||||
|
|
||||||
PARALLEL=false compile
|
PARALLEL=false compile
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue