diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 9305893..6d1e662 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 +# Copyright (C) 2014 Santiago Rodriguez # # 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/