diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 9305893140206bde41ef00c6ea4b1afbf08ea15a..6d1e66232cb55736cd3fc202f5fa22f6519e8e15 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2008-2010 Rubén RodrÃguez <ruben@trisquel.info> +# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info> # # 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 @@ -20,8 +21,9 @@ # Note that you would need to publish and sign the upgrade tarball # gpg -ba release_name.tar.gz # 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=10 +VERSION=11 . ./config @@ -35,10 +37,6 @@ sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropp sed '/nvidia/d' DistUpgrade/build-tarball.sh -i rm tests/test-data/xorg.conf.fglrx -#% Make sure nvidia-common and fglrx-modaliases are not installed -apt-get remove --purge -y nvidia-common || true -apt-get remove --purge -y fglrx-modaliases || true - #https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740 cat << EOF >> DistUpgrade/DistUpgradeQuirks.py @@ -195,7 +193,6 @@ EOF rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html -apt-get install -q -y parsewiki parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html @@ -265,9 +262,8 @@ chmod 755 DistUpgrade/trisquel-postinstall.sh replace changelogs.ubuntu.com packages.trisquel.info . -/bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$') +/bin/sed -i 's/�~Lubuntu/�~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find -type f | grep py$) $(find -type f | grep '\.glade$') -apt-get install --force-yes -y rpl rpl 11\.04 5\.0 DistUpgrade/*.ui rpl 11\.04 5\.0 po/* -R rpl 11\.10 5\.5 DistUpgrade/*.ui @@ -323,8 +319,11 @@ 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 -cp ../dist-upgrader* /root