CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfix-ubuntu-release-upgrader' into 'belenos'

Browse source 
Bugfix ubuntu release upgrader

There were multiple issues:
 - Sed tries to change symbolic links not owned by the user
 - Some packages were removed. This isn't needed when using trisquel chroots, as those packages are never avaliable.
 - The package used one file from ubuntu-drivers-common related to non-free nvidia drivers, that is not needed in trisquel. The source file can be found [here](http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/utopic/ubuntu-drivers-common/utopic-proposed/view/head:/share/obsolete)

See merge request !10
This commit is contained in:
ruben 2014-12-16 16:01:10 +00:00
commit a6f445d7d0
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
helpers/make-ubuntu-release-upgrader
View file

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2008-2010 Rubén Rodríguez <ruben@trisquel.info> # 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 # 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
@ -20,8 +21,9 @@
# Note that you would need to publish and sign the upgrade tarball # Note that you would need to publish and sign the upgrade tarball
# gpg -ba release_name.tar.gz # gpg -ba release_name.tar.gz
# 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
VERSION=10 VERSION=11
. ./config . ./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 sed '/nvidia/d' DistUpgrade/build-tarball.sh -i
rm tests/test-data/xorg.conf.fglrx 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 #https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
cat << EOF >> DistUpgrade/DistUpgradeQuirks.py cat << EOF >> DistUpgrade/DistUpgradeQuirks.py
@ -195,7 +193,6 @@ EOF
rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html rm DistUpgrade/EOLReleaseAnnouncement.html DistUpgrade/ReleaseAnnouncement.html
apt-get install -q -y parsewiki
parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html parsewiki DistUpgrade/EOLReleaseAnnouncement > DistUpgrade/EOLReleaseAnnouncement.html
parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnouncement.html
@ -265,9 +262,8 @@ chmod 755 DistUpgrade/trisquel-postinstall.sh
replace changelogs.ubuntu.com packages.trisquel.info . replace changelogs.ubuntu.com packages.trisquel.info .
/bin/sed -i 's/<2F>~Lubuntu/<2F>~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/<2F>~Lubuntu/<2F>~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 DistUpgrade/*.ui
rpl 11\.04 5\.0 po/* -R rpl 11\.04 5\.0 po/* -R
rpl 11\.10 5\.5 DistUpgrade/*.ui 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 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
cp ../dist-upgrader* /root