diff --git a/helpers/make-update-manager b/helpers/make-update-manager index 2b9871a..4e14351 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2010 Rubén Rodríguez +# Copyright (C) 2008-2014 Rubén Rodríguez # # 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 @@ -17,290 +17,20 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -# 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 - -VERSION=13 +VERSION=6 . ./config -#%FSDG: Remove functions to deal with proprietary drivers -rm ./DistUpgrade/xorg_fix_proprietary.py -rm ./DistUpgrade/NvidiaDetector -sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i -sed s/self._test_and_warn_on_old_nvidia/#self._test_and_warn_on_old_nvidia/ -i DistUpgrade/DistUpgradeQuirks.py -sed s/self._test_and_warn_on_nvidia_and_no_sse/#self._test_and_warn_on_nvidia_and_no_sse/ -i DistUpgrade/DistUpgradeQuirks.py -sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropped_fglrx_support/ -i DistUpgrade/DistUpgradeQuirks.py -sed '/nvidia/d' debian/control DistUpgrade/build-tarball.sh -i -rm tests/test-data/xorg.conf.fglrx +cp $DATA/index.docbook help/C/index.docbook -#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740 -cat << EOF >> DistUpgrade/DistUpgradeQuirks.py +replace Ubuntu Trisquel . +replace "Trisquel-Gettext" "Ubuntu-Gettext" . - def from_taranisPostInitialUpdate(self): - logging.debug("Setting APT::Immediate-Configure=false") - apt.apt_pkg.config.set("APT::Immediate-Configure", "false") - os.system("apt-get install --force-yes -y libblkid1 lzma dpkg") - - def from_taranisPostCleanup(self): - logging.debug("Setting APT::Immediate-Configure=true") - apt.apt_pkg.config.set("APT::Immediate-Configure", "true") -EOF - - -rm ./DistUpgrade/Ubuntu.info -cat << EOF > DistUpgrade/Trisquel.info -ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/%s - -Suite: $CODENAME -RepositoryType: deb -BaseURI: http://archive.trisquel.info/trisquel/ -Description: Trisquel $CODENAME -Component: main -Enabled: 1 -CompDescription: Trisquel GNU/linux packages - -Suite: $CODENAME-security -RepositoryType: deb -BaseURI: http://archive.trisquel.info/trisquel/ -Description: Trisquel $CODENAME Security Updates -Component: main -Enabled: 1 -CompDescription: Trisquel GNU/linux packages - -Suite: $CODENAME-updates -RepositoryType: deb -BaseURI: http://archive.trisquel.info/trisquel/ -Description: Trisquel $CODENAME Updates -Component: main -Enabled: 1 -CompDescription: Trisquel GNU/linux packages - -Suite: $CODENAME-backports -RepositoryType: deb -BaseURI: http://archive.trisquel.info/trisquel/ -Description: Trisquel $CODENAME Backports -Component: main -Enabled: 1 -CompDescription: Trisquel GNU/linux packages -EOF - -rm DistUpgrade/ReleaseAnnouncement -cat << EOF > DistUpgrade/ReleaseAnnouncement -= Welcome to Trisquel GNU/Linux $REVISION '$CODENAME' = - -The Trisquel team is proud to announce Trisquel $REVISION '$CODENAME'. -We recommend to apply all pending updates to the system before upgrading. - -Trisquel is a fully free operating system based in GNU/Linux, for domestic -users, small enterprises and educational centers. - -We hope you enjoy Trisquel. - -== Feedback and Helping == - -If you would like to help shape Trisquel, take a look at the list of -ways you can participate at - - http://trisquel.info/en/wiki/how-help - -Your comments, bug reports, patches and suggestions will help ensure -that our next release is the best release of Trisquel ever. If you feel -that you have found a bug please send it to us via - - http://trisquel.info/project/issues - -If you have a question, or if you think you may have found a bug but -aren't sure, first try asking on the #trisquel IRC channel on Freenode, -on the Trisquel Users mailing list, or on the Trisquel forums: - - http://listas.trisquel.info/ - http://trisquel.info/forum - -== More Information == - -You can find out more about Trisquel on our website, IRC channel and wiki. -If you're new to Trisquel, please visit: - - http://trisquel.info - -To sign up for future Trisquel announcements, please subscribe to Trisquel's -very low volume announcement list at: - - http://listas.trisquel.info/mailman/listinfo/trisquel-announce - -EOF - -rm DistUpgrade/DevelReleaseAnnouncement -cat << EOF > DistUpgrade/DevelReleaseAnnouncement -This is a development release, do not install on production systems! - -EOF - -cat DistUpgrade/ReleaseAnnouncement >> DistUpgrade/DevelReleaseAnnouncement - -rm DistUpgrade/EOLReleaseAnnouncement -cat << EOF > DistUpgrade/EOLReleaseAnnouncement -= Trisquel GNU/Linux $REVISION '$CODENAME' is NO LONGER SUPPORTED! = - -You are atempting to upgrade to a version of Trisquel that is no longer -supported. Since we do only keep upgrade packages for decomissioned releases -for a while, this upgrade may fail. Try the sandbox method first (by running -update-manager -s) or ask in our forums, lists or irc channels if you are -unsure about this procedure. - -Even if the required upgrade packages for $CODENAME are still available, to -get a currently supported release you would need to upgrade at least once -more after this procedure ends, so we recommend you to do a clean install -using the latest LTS or STS edition. - -== Feedback and Helping == - -If you would like to help shape Trisquel, take a look at the list of -ways you can participate at - - http://trisquel.info/en/wiki/how-help - -Your comments, bug reports, patches and suggestions will help ensure -that our next release is the best release of Trisquel ever. If you feel -that you have found a bug please send it to us via - - http://trisquel.info/project/issues - -If you have a question, or if you think you may have found a bug but -aren't sure, first try asking on the #trisquel IRC channel on Freenode, -on the Trisquel Users mailing list, or on the Trisquel forums: - - http://listas.trisquel.info/ - http://trisquel.info/forum - -== More Information == - -You can find out more about Trisquel on our website, IRC channel and wiki. -If you're new to Trisquel, please visit: - - http://trisquel.info - -To sign up for future Trisquel announcements, please subscribe to Trisquel's -very low volume announcement list at: - - http://listas.trisquel.info/mailman/listinfo/trisquel-announce - -EOF - -rm DistUpgrade/removal_blacklist.cfg -cat < DistUpgrade/removal_blacklist.cfg -# blacklist of packages that should never be removed -trisquel-base -trisquel-minimal -trisquel-desktop-common -trisquel -trisquel-mini -triskel -# update-manager should not remove itself -update-manager -update-manager-core -EOF - -rm DistUpgrade/mirrors.cfg -cat << EOF > DistUpgrade/mirrors.cfg -http://mirror.fsf.org/trisquel/ -http://es.archive.trisquel.info/trisquel/ -ftp://es.archive.trisquel.info/trisquel/ -http://fr.archive.trisquel.info/trisquel/ -ftp://fr.archive.trisquel.info/trisquel/ -http://archive.trisquel.info/trisquel/ -ftp://archive.trisquel.info/trisquel/ -http://us.archive.trisquel.info/trisquel/ -http://nl.archive.trisquel.info/ -http://in.archive.trisquel.info/ -ftp://in.archive.trisquel.info/ -EOF - -rm DistUpgrade/DistUpgrade.cfg* -cp $DATA/DistUpgrade.cfg* DistUpgrade/ - -cat << EOF1 > DistUpgrade/trisquel-postinstall.sh -#!/bin/sh - -# Making sure this is gone -apt-get remove --force-yes -y notification-daemon - -if ! [ -f /etc/grub.d/01_PASSWORD ]; then -cat << EOF > /etc/grub.d/01_PASSWORD -#! /bin/sh -e -# Trisquel enables a random password to grub during install -# Comment this file to remove the password. -# This file should only be readable by root. - -echo set superusers=grub -echo password grub \$(bash -c 'echo \$RANDOM') -EOF -fi - -# Just in case -update-initramfs -u -update-grub -EOF1 -chmod 755 DistUpgrade/trisquel-postinstall.sh - -echo "notification-daemon" > DistUpgrade/demoted.cfg - -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/>>>>>> 5c90594756614985f2ef243e0b0aa55dacf7bdef