From 416ae9a8417874d932864f64ee51227710151a88 Mon Sep 17 00:00:00 2001 From: Santiago Rodriguez Date: Fri, 12 Dec 2014 16:48:03 +0100 Subject: [PATCH 1/3] Avoid installing packages and moving files outside path --- helpers/make-ubuntu-release-upgrader | 7 ------- 1 file changed, 7 deletions(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 9305893..916022d 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -35,10 +35,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 +191,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 @@ -267,7 +262,6 @@ 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/ Date: Fri, 12 Dec 2014 23:39:26 +0100 Subject: [PATCH 2/3] Avoid failing in symbolic links, search only for regular files --- helpers/make-ubuntu-release-upgrader | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 916022d..49ca870 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -260,7 +260,7 @@ 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/ Date: Sun, 14 Dec 2014 18:57:11 +0100 Subject: [PATCH 3/3] Removed the obsolete list from ubuntu It wasn't a build-dep, and the only contents were packages not avaliable in trisquel. --- helpers/make-ubuntu-release-upgrader | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 49ca870..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 @@ -317,6 +319,10 @@ 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