diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index aa2075f37e409e27723af84c1e85ca6a32c3123c..d7c48c305aaf049adb76fad0660b56c9e4a7bf44 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -2,6 +2,7 @@ # # Copyright (C) 2008-2018 Ruben Rodriguez <ruben@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 # 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 # The "obsoletes" list from ubuntu has been removed -VERSION=3 +VERSION=4 . ./config @@ -33,7 +34,6 @@ rm ./DistUpgrade/NvidiaDetector sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py -sed '/nvidia/d' DistUpgrade/build-tarball.sh -i rm tests/test-data/xorg.conf.fglrx #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 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" PARALLEL=false compile