diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-02-23 15:47:36.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000 @@ -6,6 +6,7 @@ arora aspell-tl at-spi-doc +automake1.9-doc bogofilter bogofilter-bdb bogofilter-common @@ -13,6 +14,7 @@ brltty-x11 byacc cantor +checkbox-gtk cheese cheese-common compiz-fusion-bcop @@ -38,17 +40,27 @@ eucalyptus-sc eucalyptus-walrus evolution-couchdb +exiv2 f-spot fancontrol flex-old flex-old-doc +foomatic-db-gutenprint g++-4.4-multilib gamin gbrainy gcc-4.4-multilib +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gconf-defaults-service gconf-editor gdebi +gdebi-core gdebi-kde genromfs gfortran-4.4 @@ -78,6 +90,7 @@ ibus-pinyin-db-open-phrase icedtea6-plugin idle-python2.6 +ijsgutenprint indicator-applet indicator-applet-session janino @@ -180,6 +193,10 @@ libfreezethaw-perl libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev libgconfmm-2.6-1c2 libgconfmm-2.6-dev libgconfmm-2.6-doc @@ -274,6 +291,10 @@ libmockobjects-java libmockobjects-java-doc libmodplug-dev +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins0.2-cil libmusicbrainz4-dev libmusicbrainz4c2a libmvel-java @@ -380,11 +401,16 @@ migrationtools mono-2.0-gac mono-dbg +mono-jay myspell-de-de-oldspell myspell-fr myspell-ns +myspell-tools openoffice.org-style-galaxy +oxygen-icon-theme-complete +packagekit packagekit-backend-apt +php5-sybase pinyin-database plasma-widget-quickaccess plymouth-x11 diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-02-03 08:19:27.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-03-05 08:00:46.000000000 +0000 @@ -494,12 +494,11 @@ try: # get new detection module and use the modalises files # from within the release-upgrader - nv = NvidiaDetection(datadir="./modaliases/", - obsolete="./nvidia-obsolete.pkgs") + nv = NvidiaDetection(obsolete="./nvidia-obsolete.pkgs") #nv = NvidiaDetection() # check if a binary driver is installed now for oldDriver in nv.oldPackages: - if self.has_key(oldDriver) and self[oldDriver].is_installed: + if oldDriver in self and self[oldDriver].is_installed: self.mark_remove(oldDriver, "old nvidia driver") break else: @@ -508,7 +507,7 @@ # check which one to use driver = nv.selectDriver() logging.debug("nv.selectDriver() returned '%s'" % driver) - if not self.has_key(driver): + if not driver in self: logging.warning("no '%s' found" % driver) return False if not (self[driver].marked_install or self[driver].marked_upgrade): diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 2012-02-23 15:43:02.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeController.py 2012-03-05 08:00:46.000000000 +0000 @@ -43,6 +43,7 @@ get_string_with_no_auth_from_source_entry, is_child_of_process_name) from string import Template +from urlparse import urlsplit import DistUpgradeView from DistUpgradeCache import MyCache @@ -172,7 +173,7 @@ self.valid_3p_mirrors = [pair[1] for pair in self.config.items('ThirdPartyMirrors')] # debugging - #apt_pkg.Config.set("DPkg::Options::","--debug=0077") + #apt_pkg.config.set("DPkg::Options::","--debug=0077") # apt cron job self._aptCronJobPerms = 0755 @@ -1233,7 +1234,7 @@ def runPostInstallScripts(self): """ scripts that are run in any case after the distupgrade finished - whether or not it was successfull + whether or not it was successful """ # now run the post-upgrade fixup scripts (if any) for script in self.config.getlist("Distro","PostInstallScripts"): @@ -1350,8 +1351,14 @@ return True def isMirror(self, uri): - " check if uri is a known mirror " - uri = uri.rstrip("/") + """ check if uri is a known mirror """ + # deal with username:password in a netloc + raw_uri = uri.rstrip("/") + scheme, netloc, path, query, fragment = urlsplit(raw_uri) + if "@" in netloc: + netloc = netloc.split("@")[1] + # construct new mirror url without the username/pw + uri = "%s://%s%s" % (scheme, netloc, path) for mirror in self.valid_mirrors: mirror = mirror.rstrip("/") if is_mirror(mirror, uri): diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-02-23 15:48:23.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-03-05 08:05:07.000000000 +0000 @@ -1 +1 @@ -VERSION='0.156.6' +VERSION='0.156.7' diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/mirrors.cfg update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/mirrors.cfg --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-02-23 15:47:48.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-03-05 08:04:36.000000000 +0000 @@ -14,10 +14,14 @@ http://extras.ubuntu.com/ubuntu ftp://extras.ubuntu.com/ubuntu -#commercial (both urls are valid +#commercial (both urls are valid) http://archive.canonical.com http://archive.canonical.com/ubuntu/ +#commercial-ppas +https://private-ppa.launchpad.net/commercial-ppa-uploaders + + ##===Australia=== http://ftp.iinet.net.au/pub/ubuntu/ http://mirror.optus.net/ubuntu/ @@ -613,11 +617,13 @@ http://ubuntu-archives.mirror.nexicom.net/ http://ftp.acc.umu.se/ubuntu/ http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ +http://mirror.internetone.it/ubuntu-archive/ http://mirror.pnl.gov/ubuntu/ http://ubuntu.idrepo.or.id/ubuntu/ http://ubuntu.mirror.tudos.de/ubuntu/ http://mirror.nl.leaseweb.net/ubuntu/ http://mirror.us.leaseweb.net/ubuntu/ +http://mirror.qdu.edu.cn/ubuntu/ http://bouyguestelecom.ubuntu.lafibre.info/ubuntu/ http://ftp.byfly.by/ubuntu/ http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ @@ -627,6 +633,7 @@ http://mirror.lstn.net/ubuntu/ http://mirror.lzu.edu.cn/ubuntu/ http://mirror.netcologne.de/ubuntu/ +http://mirror.serverloft.eu/ubuntu/ubuntu/ http://mirrors.adnettelecom.ro/ubuntu/ http://mirror.ovh.net/ubuntu/ http://ubuntu.cica.es/ubuntu/ @@ -667,7 +674,6 @@ http://mirror.corbina.net/ubuntu/ http://mirror.cse.iitk.ac.in/ubuntu/ http://mirror.dattobackup.com/ubuntu/ -http://mirror.edatel.net.co/ubuntu/ http://mirror.ihug.co.nz/ubuntu/ http://mirror.its.sfu.ca/mirror/ubuntu/ http://mirror.kavalinux.com/ubuntu/ @@ -717,6 +723,7 @@ http://tux.rainside.sk/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu-mirror.telesys.org.ua/ubuntu/ +http://ubuntu.arcticnetwork.ca/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ http://ubuntu.datahop.net/ubuntu/ @@ -759,6 +766,7 @@ http://mirror.beget.ru/ubuntu/ http://mirror-cybernet.lums.edu.pk/pub/ubuntu/ http://mirror.alfredstate.edu/ubuntu/ +http://mirror.as24220.net/pub/ubuntu/archive/ http://mirror.bjtu.edu.cn/ubuntu/ http://mirror.clarkson.edu/ubuntu/ http://mirror.crazynetwork.it/ubuntu/archive/ @@ -766,17 +774,14 @@ http://mirror.hosef.org/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.learn.ac.lk/ubuntu/ -http://mirror.linux.org.au/ubuntu/ http://mirror.neolabs.kz/ubuntu/ ftp://mirror.space.kz/ubuntu/ http://mirror.squ.edu.om/ubuntuarchive/ http://mirrors.bloomu.edu/ubuntu/ http://mirrors.ispros.com.bd/ubuntu/ http://mirrors.serverhost.ro/ubuntu/archive/ -http://mirrors.ucr.ac.cr/ubuntu/ http://pandawa.ipb.ac.id/ubuntu/ http://singo.ub.ac.id/ubuntu/ -http://ubuntu.alex-vichev.info/ http://ubuntu.eecs.wsu.edu/ http://ubuntu.mirror.netelligent.ca/ubuntu/ http://ubuntu.mirrors.skynet.be/ubuntu/ @@ -793,7 +798,7 @@ http://us.archive.ubuntu.com/ubuntu/ http://www.lug.bu.edu/mirror/ubuntu/ http://www.mirror.upm.edu.my/ubuntu/ -http://archive.ubuntu.schoolnet.lk/ubuntu/ +http://bos.fkip.uns.ac.id/ubuntu/ http://distrib-coffee.ipsl.jussieu.fr/ubuntu/ http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ http://ftp.ccc.uba.ar/pub/linux/ubuntu/ diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 2012-02-03 08:19:27.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 2012-03-05 08:00:46.000000000 +0000 @@ -15,4 +15,4 @@ screen # unity unity$ -unity-2d +unity-2d$ diff -Nru update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py --- update-manager-0.156.6/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py 2012-01-13 10:01:23.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/xorg_fix_proprietary.py 2012-03-05 08:00:46.000000000 +0000 @@ -12,6 +12,7 @@ import shutil import subprocess import apt_pkg +apt_pkg.init() # main xorg.conf XORG_CONF="/etc/X11/xorg.conf" @@ -157,7 +158,7 @@ # now run the removeInputDevices() if we have a new xserver ver=subprocess.Popen(["dpkg-query","-W","-f=${Version}","xserver-xorg-core"], stdout=subprocess.PIPE).communicate()[0] logging.info("xserver-xorg-core version is '%s'" % ver) - if ver and apt_pkg.VersionCompare(ver, "2:1.5.0") > 0: + if ver and apt_pkg.version_compare(ver, "2:1.5.0") > 0: if not is_multiseat(): remove_input_devices() else: diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/lts-main-all/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/lts-main-all/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/main-all/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/main-all/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/server/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/server/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/server/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/server/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/ubuntu/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/universe-amd64/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/universe-amd64/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/AutoUpgradeTester/profile/universe-i386/demoted.cfg update-manager-0.156.7/AutoUpgradeTester/profile/universe-i386/demoted.cfg --- update-manager-0.156.6/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/debian/changelog update-manager-0.156.7/debian/changelog --- update-manager-0.156.6/debian/changelog 2012-02-23 15:44:50.000000000 +0000 +++ update-manager-0.156.7/debian/changelog 2012-03-05 08:02:14.000000000 +0000 @@ -1,3 +1,23 @@ +update-manager (1:0.156.7) precise; urgency=low + + [ Michael Vogt ] + * DistUpgrade/DistUpgradeCache.py: + - fix nvidia detection, thanks to Brian Murray + * DistUpgrade/xorg_fix_proprietary.py: + - fix crash when apt_pkg is not initialized (LP: #942106) + * DistUpgrade/DistUpgradeController.py, DistUpgrade/mirrors.cfg: + - support upgrades with commercial-ppas in the sources.list + (LP: #939461) and add tests + * UpdateManager/UpdateManager.py: + - fix inaccurate string, thanks to JohnNapster (LP: #942590) + + [ Brian Murray ] + * DistUpgrade/removal_blacklist.cfg: + - Only blacklist unity-2d, not all packages whose names start with + unity-2d. (LP: #940196) + + -- Michael Vogt Mon, 05 Mar 2012 09:02:14 +0100 + update-manager (1:0.156.6) precise; urgency=low [ Robert Roth ] diff -Nru update-manager-0.156.6/DistUpgrade/demoted.cfg update-manager-0.156.7/DistUpgrade/demoted.cfg --- update-manager-0.156.6/DistUpgrade/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/DistUpgrade/demoted.cfg.lucid update-manager-0.156.7/DistUpgrade/demoted.cfg.lucid --- update-manager-0.156.6/DistUpgrade/demoted.cfg.lucid 2012-02-23 15:47:36.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000 @@ -6,6 +6,7 @@ arora aspell-tl at-spi-doc +automake1.9-doc bogofilter bogofilter-bdb bogofilter-common @@ -13,6 +14,7 @@ brltty-x11 byacc cantor +checkbox-gtk cheese cheese-common compiz-fusion-bcop @@ -38,17 +40,27 @@ eucalyptus-sc eucalyptus-walrus evolution-couchdb +exiv2 f-spot fancontrol flex-old flex-old-doc +foomatic-db-gutenprint g++-4.4-multilib gamin gbrainy gcc-4.4-multilib +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gconf-defaults-service gconf-editor gdebi +gdebi-core gdebi-kde genromfs gfortran-4.4 @@ -78,6 +90,7 @@ ibus-pinyin-db-open-phrase icedtea6-plugin idle-python2.6 +ijsgutenprint indicator-applet indicator-applet-session janino @@ -180,6 +193,10 @@ libfreezethaw-perl libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev libgconfmm-2.6-1c2 libgconfmm-2.6-dev libgconfmm-2.6-doc @@ -274,6 +291,10 @@ libmockobjects-java libmockobjects-java-doc libmodplug-dev +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins0.2-cil libmusicbrainz4-dev libmusicbrainz4c2a libmvel-java @@ -380,11 +401,16 @@ migrationtools mono-2.0-gac mono-dbg +mono-jay myspell-de-de-oldspell myspell-fr myspell-ns +myspell-tools openoffice.org-style-galaxy +oxygen-icon-theme-complete +packagekit packagekit-backend-apt +php5-sybase pinyin-database plasma-widget-quickaccess plymouth-x11 diff -Nru update-manager-0.156.6/DistUpgrade/DistUpgradeCache.py update-manager-0.156.7/DistUpgrade/DistUpgradeCache.py --- update-manager-0.156.6/DistUpgrade/DistUpgradeCache.py 2012-02-03 08:19:27.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/DistUpgradeCache.py 2012-03-05 08:00:46.000000000 +0000 @@ -494,12 +494,11 @@ try: # get new detection module and use the modalises files # from within the release-upgrader - nv = NvidiaDetection(datadir="./modaliases/", - obsolete="./nvidia-obsolete.pkgs") + nv = NvidiaDetection(obsolete="./nvidia-obsolete.pkgs") #nv = NvidiaDetection() # check if a binary driver is installed now for oldDriver in nv.oldPackages: - if self.has_key(oldDriver) and self[oldDriver].is_installed: + if oldDriver in self and self[oldDriver].is_installed: self.mark_remove(oldDriver, "old nvidia driver") break else: @@ -508,7 +507,7 @@ # check which one to use driver = nv.selectDriver() logging.debug("nv.selectDriver() returned '%s'" % driver) - if not self.has_key(driver): + if not driver in self: logging.warning("no '%s' found" % driver) return False if not (self[driver].marked_install or self[driver].marked_upgrade): diff -Nru update-manager-0.156.6/DistUpgrade/DistUpgradeController.py update-manager-0.156.7/DistUpgrade/DistUpgradeController.py --- update-manager-0.156.6/DistUpgrade/DistUpgradeController.py 2012-02-23 15:43:02.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/DistUpgradeController.py 2012-03-05 08:00:46.000000000 +0000 @@ -43,6 +43,7 @@ get_string_with_no_auth_from_source_entry, is_child_of_process_name) from string import Template +from urlparse import urlsplit import DistUpgradeView from DistUpgradeCache import MyCache @@ -172,7 +173,7 @@ self.valid_3p_mirrors = [pair[1] for pair in self.config.items('ThirdPartyMirrors')] # debugging - #apt_pkg.Config.set("DPkg::Options::","--debug=0077") + #apt_pkg.config.set("DPkg::Options::","--debug=0077") # apt cron job self._aptCronJobPerms = 0755 @@ -1233,7 +1234,7 @@ def runPostInstallScripts(self): """ scripts that are run in any case after the distupgrade finished - whether or not it was successfull + whether or not it was successful """ # now run the post-upgrade fixup scripts (if any) for script in self.config.getlist("Distro","PostInstallScripts"): @@ -1350,8 +1351,14 @@ return True def isMirror(self, uri): - " check if uri is a known mirror " - uri = uri.rstrip("/") + """ check if uri is a known mirror """ + # deal with username:password in a netloc + raw_uri = uri.rstrip("/") + scheme, netloc, path, query, fragment = urlsplit(raw_uri) + if "@" in netloc: + netloc = netloc.split("@")[1] + # construct new mirror url without the username/pw + uri = "%s://%s%s" % (scheme, netloc, path) for mirror in self.valid_mirrors: mirror = mirror.rstrip("/") if is_mirror(mirror, uri): diff -Nru update-manager-0.156.6/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.7/DistUpgrade/DistUpgradeVersion.py --- update-manager-0.156.6/DistUpgrade/DistUpgradeVersion.py 2012-02-23 15:48:23.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/DistUpgradeVersion.py 2012-03-05 08:05:07.000000000 +0000 @@ -1 +1 @@ -VERSION='0.156.6' +VERSION='0.156.7' diff -Nru update-manager-0.156.6/DistUpgrade/mirrors.cfg update-manager-0.156.7/DistUpgrade/mirrors.cfg --- update-manager-0.156.6/DistUpgrade/mirrors.cfg 2012-02-23 15:47:48.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/mirrors.cfg 2012-03-05 08:04:36.000000000 +0000 @@ -14,10 +14,14 @@ http://extras.ubuntu.com/ubuntu ftp://extras.ubuntu.com/ubuntu -#commercial (both urls are valid +#commercial (both urls are valid) http://archive.canonical.com http://archive.canonical.com/ubuntu/ +#commercial-ppas +https://private-ppa.launchpad.net/commercial-ppa-uploaders + + ##===Australia=== http://ftp.iinet.net.au/pub/ubuntu/ http://mirror.optus.net/ubuntu/ @@ -613,11 +617,13 @@ http://ubuntu-archives.mirror.nexicom.net/ http://ftp.acc.umu.se/ubuntu/ http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ +http://mirror.internetone.it/ubuntu-archive/ http://mirror.pnl.gov/ubuntu/ http://ubuntu.idrepo.or.id/ubuntu/ http://ubuntu.mirror.tudos.de/ubuntu/ http://mirror.nl.leaseweb.net/ubuntu/ http://mirror.us.leaseweb.net/ubuntu/ +http://mirror.qdu.edu.cn/ubuntu/ http://bouyguestelecom.ubuntu.lafibre.info/ubuntu/ http://ftp.byfly.by/ubuntu/ http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ @@ -627,6 +633,7 @@ http://mirror.lstn.net/ubuntu/ http://mirror.lzu.edu.cn/ubuntu/ http://mirror.netcologne.de/ubuntu/ +http://mirror.serverloft.eu/ubuntu/ubuntu/ http://mirrors.adnettelecom.ro/ubuntu/ http://mirror.ovh.net/ubuntu/ http://ubuntu.cica.es/ubuntu/ @@ -667,7 +674,6 @@ http://mirror.corbina.net/ubuntu/ http://mirror.cse.iitk.ac.in/ubuntu/ http://mirror.dattobackup.com/ubuntu/ -http://mirror.edatel.net.co/ubuntu/ http://mirror.ihug.co.nz/ubuntu/ http://mirror.its.sfu.ca/mirror/ubuntu/ http://mirror.kavalinux.com/ubuntu/ @@ -717,6 +723,7 @@ http://tux.rainside.sk/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu-mirror.telesys.org.ua/ubuntu/ +http://ubuntu.arcticnetwork.ca/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ http://ubuntu.datahop.net/ubuntu/ @@ -759,6 +766,7 @@ http://mirror.beget.ru/ubuntu/ http://mirror-cybernet.lums.edu.pk/pub/ubuntu/ http://mirror.alfredstate.edu/ubuntu/ +http://mirror.as24220.net/pub/ubuntu/archive/ http://mirror.bjtu.edu.cn/ubuntu/ http://mirror.clarkson.edu/ubuntu/ http://mirror.crazynetwork.it/ubuntu/archive/ @@ -766,17 +774,14 @@ http://mirror.hosef.org/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.learn.ac.lk/ubuntu/ -http://mirror.linux.org.au/ubuntu/ http://mirror.neolabs.kz/ubuntu/ ftp://mirror.space.kz/ubuntu/ http://mirror.squ.edu.om/ubuntuarchive/ http://mirrors.bloomu.edu/ubuntu/ http://mirrors.ispros.com.bd/ubuntu/ http://mirrors.serverhost.ro/ubuntu/archive/ -http://mirrors.ucr.ac.cr/ubuntu/ http://pandawa.ipb.ac.id/ubuntu/ http://singo.ub.ac.id/ubuntu/ -http://ubuntu.alex-vichev.info/ http://ubuntu.eecs.wsu.edu/ http://ubuntu.mirror.netelligent.ca/ubuntu/ http://ubuntu.mirrors.skynet.be/ubuntu/ @@ -793,7 +798,7 @@ http://us.archive.ubuntu.com/ubuntu/ http://www.lug.bu.edu/mirror/ubuntu/ http://www.mirror.upm.edu.my/ubuntu/ -http://archive.ubuntu.schoolnet.lk/ubuntu/ +http://bos.fkip.uns.ac.id/ubuntu/ http://distrib-coffee.ipsl.jussieu.fr/ubuntu/ http://distrib-coffee.ipsl.jussieu.fr/pub/linux/ubuntu/ http://ftp.ccc.uba.ar/pub/linux/ubuntu/ diff -Nru update-manager-0.156.6/DistUpgrade/removal_blacklist.cfg update-manager-0.156.7/DistUpgrade/removal_blacklist.cfg --- update-manager-0.156.6/DistUpgrade/removal_blacklist.cfg 2012-02-03 08:19:27.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/removal_blacklist.cfg 2012-03-05 08:00:46.000000000 +0000 @@ -15,4 +15,4 @@ screen # unity unity$ -unity-2d +unity-2d$ diff -Nru update-manager-0.156.6/DistUpgrade/xorg_fix_proprietary.py update-manager-0.156.7/DistUpgrade/xorg_fix_proprietary.py --- update-manager-0.156.6/DistUpgrade/xorg_fix_proprietary.py 2012-01-13 10:01:23.000000000 +0000 +++ update-manager-0.156.7/DistUpgrade/xorg_fix_proprietary.py 2012-03-05 08:00:46.000000000 +0000 @@ -12,6 +12,7 @@ import shutil import subprocess import apt_pkg +apt_pkg.init() # main xorg.conf XORG_CONF="/etc/X11/xorg.conf" @@ -157,7 +158,7 @@ # now run the removeInputDevices() if we have a new xserver ver=subprocess.Popen(["dpkg-query","-W","-f=${Version}","xserver-xorg-core"], stdout=subprocess.PIPE).communicate()[0] logging.info("xserver-xorg-core version is '%s'" % ver) - if ver and apt_pkg.VersionCompare(ver, "2:1.5.0") > 0: + if ver and apt_pkg.version_compare(ver, "2:1.5.0") > 0: if not is_multiseat(): remove_input_devices() else: diff -Nru update-manager-0.156.6/po/update-manager.pot update-manager-0.156.7/po/update-manager.pot --- update-manager-0.156.6/po/update-manager.pot 2011-11-30 16:37:51.000000000 +0000 +++ update-manager-0.156.7/po/update-manager.pot 2012-03-05 08:00:46.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-07 17:53+0200\n" +"POT-Creation-Date: 2012-03-02 12:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,30 +18,22 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#. TRANSLATORS: download size is 0 -#: ../DistUpgrade/utils.py:389 ../UpdateManager/Core/utils.py:389 -msgid "0 KB" -msgstr "" - -#. TRANSLATORS: download size of very small updates -#: ../DistUpgrade/utils.py:392 ../UpdateManager/Core/utils.py:392 -msgid "1 KB" -msgstr "" - -#. TRANSLATORS: download size of small updates, e.g. "250 KB" -#: ../DistUpgrade/utils.py:395 ../UpdateManager/Core/utils.py:395 +#. TRANSLATORS: download size of small updates, e.g. "250 kB" +#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397 #, python-format -msgid "%.0f KB" -msgstr "" +msgid "%(size).0f kB" +msgid_plural "%(size).0f kB" +msgstr[0] "" +msgstr[1] "" #. TRANSLATORS: download size of updates, e.g. "2.3 MB" -#: ../DistUpgrade/utils.py:398 ../UpdateManager/Core/utils.py:398 +#: ../DistUpgrade/utils.py:400 ../UpdateManager/Core/utils.py:400 #, python-format msgid "%.1f MB" msgstr "" #. TRANSLATORS: %s is a country -#: ../DistUpgrade/distro.py:210 ../DistUpgrade/distro.py:428 +#: ../DistUpgrade/distro.py:206 ../DistUpgrade/distro.py:434 #, python-format msgid "Server for %s" msgstr "" @@ -49,12 +41,12 @@ #. More than one server is used. Since we don't handle this case #. in the user interface we set "custom servers" to true and #. append a list of all used servers -#: ../DistUpgrade/distro.py:228 ../DistUpgrade/distro.py:234 -#: ../DistUpgrade/distro.py:250 +#: ../DistUpgrade/distro.py:224 ../DistUpgrade/distro.py:230 +#: ../DistUpgrade/distro.py:246 msgid "Main server" msgstr "" -#: ../DistUpgrade/distro.py:254 +#: ../DistUpgrade/distro.py:250 msgid "Custom servers" msgstr "" @@ -82,13 +74,13 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:141 +#: ../DistUpgrade/DistUpgradeCache.py:147 msgid "Remove package in bad state" msgid_plural "Remove packages in bad state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeCache.py:144 +#: ../DistUpgrade/DistUpgradeCache.py:150 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -103,22 +95,22 @@ #. FIXME: not ideal error message, but we just reuse a #. existing one here to avoid a new string -#: ../DistUpgrade/DistUpgradeCache.py:242 +#: ../DistUpgrade/DistUpgradeCache.py:248 msgid "The server may be overloaded" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:352 +#: ../DistUpgrade/DistUpgradeCache.py:361 msgid "Broken packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:353 +#: ../DistUpgrade/DistUpgradeCache.py:362 msgid "" "Your system contains broken packages that couldn't be fixed with this " "software. Please fix them first using synaptic or apt-get before proceeding." msgstr "" #. FIXME: change the text to something more useful -#: ../DistUpgrade/DistUpgradeCache.py:646 +#: ../DistUpgrade/DistUpgradeCache.py:659 #, python-format msgid "" "An unresolvable problem occurred while calculating the upgrade:\n" @@ -131,65 +123,65 @@ "\n" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:656 +#: ../DistUpgrade/DistUpgradeCache.py:669 msgid "This is most likely a transient problem, please try again later." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:659 +#: ../DistUpgrade/DistUpgradeCache.py:672 msgid "" "If none of this applies, then please report this bug using the command " "'ubuntu-bug update-manager' in a terminal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:664 -#: ../UpdateManager/UpdateManager.py:1032 +#: ../DistUpgrade/DistUpgradeCache.py:677 +#: ../UpdateManager/UpdateManager.py:1024 msgid "Could not calculate the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:715 +#: ../DistUpgrade/DistUpgradeCache.py:728 msgid "Error authenticating some packages" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:716 +#: ../DistUpgrade/DistUpgradeCache.py:729 msgid "" "It was not possible to authenticate some packages. This may be a transient " "network problem. You may want to try again later. See below for a list of " "unauthenticated packages." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:736 +#: ../DistUpgrade/DistUpgradeCache.py:749 #, python-format msgid "" "The package '%s' is marked for removal but it is in the removal blacklist." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:740 +#: ../DistUpgrade/DistUpgradeCache.py:753 #, python-format msgid "The essential package '%s' is marked for removal." msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:749 +#: ../DistUpgrade/DistUpgradeCache.py:762 #, python-format msgid "Trying to install blacklisted version '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:868 +#: ../DistUpgrade/DistUpgradeCache.py:880 #, python-format msgid "Can't install '%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:869 +#: ../DistUpgrade/DistUpgradeCache.py:881 msgid "" "It was impossible to install a required package. Please report this as a bug " "using 'ubuntu-bug update-manager' in a terminal." msgstr "" #. FIXME: provide a list -#: ../DistUpgrade/DistUpgradeCache.py:880 +#: ../DistUpgrade/DistUpgradeCache.py:892 msgid "Can't guess meta-package" msgstr "" -#: ../DistUpgrade/DistUpgradeCache.py:881 +#: ../DistUpgrade/DistUpgradeCache.py:893 msgid "" "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-" "desktop or edubuntu-desktop package and it was not possible to detect which " @@ -198,25 +190,25 @@ "before proceeding." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:86 +#: ../DistUpgrade/DistUpgradeController.py:100 msgid "Reading cache" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:189 +#: ../DistUpgrade/DistUpgradeController.py:210 msgid "Unable to get exclusive lock" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:190 +#: ../DistUpgrade/DistUpgradeController.py:211 msgid "" "This usually means that another package management application (like apt-get " "or aptitude) already running. Please close that application first." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:223 +#: ../DistUpgrade/DistUpgradeController.py:244 msgid "Upgrading over remote connection not supported" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:224 +#: ../DistUpgrade/DistUpgradeController.py:245 msgid "" "You are running the upgrade over a remote ssh connection with a frontend " "that does not support this. Please try a text mode upgrade with 'do-release-" @@ -225,11 +217,11 @@ "The upgrade will abort now. Please try without ssh." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:238 +#: ../DistUpgrade/DistUpgradeController.py:259 msgid "Continue running under SSH?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:239 +#: ../DistUpgrade/DistUpgradeController.py:260 #, python-format msgid "" "This session appears to be running under ssh. It is not recommended to " @@ -240,11 +232,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:253 +#: ../DistUpgrade/DistUpgradeController.py:274 msgid "Starting additional sshd" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:254 +#: ../DistUpgrade/DistUpgradeController.py:275 #, python-format msgid "" "To make recovery in case of failure easier, an additional sshd will be " @@ -252,7 +244,7 @@ "still connect to the additional one.\n" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:262 +#: ../DistUpgrade/DistUpgradeController.py:283 #, python-format msgid "" "If you run a firewall, you may need to temporarily open this port. As this " @@ -261,59 +253,72 @@ "'%s'" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:333 -#: ../DistUpgrade/DistUpgradeController.py:378 +#: ../DistUpgrade/DistUpgradeController.py:355 +#: ../DistUpgrade/DistUpgradeController.py:400 msgid "Can not upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:334 +#: ../DistUpgrade/DistUpgradeController.py:356 #, python-format msgid "An upgrade from '%s' to '%s' is not supported with this tool." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:343 +#: ../DistUpgrade/DistUpgradeController.py:365 msgid "Sandbox setup failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:344 +#: ../DistUpgrade/DistUpgradeController.py:366 msgid "It was not possible to create the sandbox environment." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:350 +#: ../DistUpgrade/DistUpgradeController.py:372 msgid "Sandbox mode" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:351 +#: ../DistUpgrade/DistUpgradeController.py:373 #, python-format msgid "" "This upgrade is running in sandbox (test) mode. All changes are written to " "'%s' and will be lost on the next reboot.\n" "\n" -"*No* changes written to a systemdir from now until the next reboot are " -"permanent." +"*No* changes written to a system directory from now until the next reboot " +"are permanent." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:379 +#: ../DistUpgrade/DistUpgradeController.py:401 msgid "" "Your python install is corrupted. Please fix the '/usr/bin/python' symlink." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:405 +#: ../DistUpgrade/DistUpgradeController.py:427 msgid "Package 'debsig-verify' is installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:406 +#: ../DistUpgrade/DistUpgradeController.py:428 msgid "" "The upgrade can not continue with that package installed.\n" "Please remove it with synaptic or 'apt-get remove debsig-verify' first and " "run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:416 +#: ../DistUpgrade/DistUpgradeController.py:440 +#, python-format +msgid "Can not write to '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:441 +#, python-format +msgid "" +"Its not possible to write to the system directory '%s' on your system. The " +"upgrade can not continue.\n" +"Please make sure that the system directory is writable." +msgstr "" + +#: ../DistUpgrade/DistUpgradeController.py:452 msgid "Include latest updates from the Internet?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:417 +#: ../DistUpgrade/DistUpgradeController.py:453 msgid "" "The upgrade system can use the internet to automatically download the latest " "updates and install them during the upgrade. If you have a network " @@ -325,16 +330,16 @@ "If you answer 'no' here, the network is not used at all." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:634 +#: ../DistUpgrade/DistUpgradeController.py:673 #, python-format msgid "disabled on upgrade to %s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:661 +#: ../DistUpgrade/DistUpgradeController.py:700 msgid "No valid mirror found" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:662 +#: ../DistUpgrade/DistUpgradeController.py:701 #, python-format msgid "" "While scanning your repository information no mirror entry for the upgrade " @@ -347,11 +352,11 @@ msgstr "" #. hm, still nothing useful ... -#: ../DistUpgrade/DistUpgradeController.py:682 +#: ../DistUpgrade/DistUpgradeController.py:721 msgid "Generate default sources?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:683 +#: ../DistUpgrade/DistUpgradeController.py:722 #, python-format msgid "" "After scanning your 'sources.list' no valid entry for '%s' was found.\n" @@ -360,35 +365,34 @@ "will cancel." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:718 +#: ../DistUpgrade/DistUpgradeController.py:757 msgid "Repository information invalid" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:719 +#: ../DistUpgrade/DistUpgradeController.py:758 msgid "" -"Upgrading the repository information resulted in a invalid file. Please " -"report this as a bug using the command 'ubuntu-bug update-manager' in a " -"terminal." +"Upgrading the repository information resulted in a invalid file so a bug " +"reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:727 +#: ../DistUpgrade/DistUpgradeController.py:765 msgid "Third party sources disabled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:728 +#: ../DistUpgrade/DistUpgradeController.py:766 msgid "" "Some third party entries in your sources.list were disabled. You can re-" "enable them after the upgrade with the 'software-properties' tool or your " "package manager." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:768 +#: ../DistUpgrade/DistUpgradeController.py:806 msgid "Package in inconsistent state" msgid_plural "Packages in inconsistent state" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:771 +#: ../DistUpgrade/DistUpgradeController.py:809 #, python-format msgid "" "The package '%s' is in an inconsistent state and needs to be reinstalled, " @@ -401,23 +405,23 @@ msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeController.py:819 +#: ../DistUpgrade/DistUpgradeController.py:857 msgid "Error during update" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:820 +#: ../DistUpgrade/DistUpgradeController.py:858 msgid "" "A problem occurred during the update. This is usually some sort of network " "problem, please check your network connection and retry." msgstr "" #. print "on_button_install_clicked" -#: ../DistUpgrade/DistUpgradeController.py:829 -#: ../UpdateManager/UpdateManager.py:741 +#: ../DistUpgrade/DistUpgradeController.py:867 +#: ../UpdateManager/UpdateManager.py:749 msgid "Not enough free disk space" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:830 +#: ../DistUpgrade/DistUpgradeController.py:868 #, python-format msgid "" "The upgrade has aborted. The upgrade needs a total of %s free space on disk " @@ -428,95 +432,96 @@ #. calc the dist-upgrade and see if the removals are ok/expected #. do the dist-upgrade -#: ../DistUpgrade/DistUpgradeController.py:858 -#: ../DistUpgrade/DistUpgradeController.py:1599 +#: ../DistUpgrade/DistUpgradeController.py:897 +#: ../DistUpgrade/DistUpgradeController.py:1640 msgid "Calculating the changes" msgstr "" #. ask the user -#: ../DistUpgrade/DistUpgradeController.py:890 +#: ../DistUpgrade/DistUpgradeController.py:929 msgid "Do you want to start the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:956 +#: ../DistUpgrade/DistUpgradeController.py:995 msgid "Upgrade canceled" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:957 +#: ../DistUpgrade/DistUpgradeController.py:996 msgid "" "The upgrade will cancel now and the original system state will be restored. " "You can resume the upgrade at a later time." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:963 -#: ../DistUpgrade/DistUpgradeController.py:1078 +#: ../DistUpgrade/DistUpgradeController.py:1002 +#: ../DistUpgrade/DistUpgradeController.py:1128 msgid "Could not download the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:964 +#: ../DistUpgrade/DistUpgradeController.py:1003 msgid "" "The upgrade has aborted. Please check your Internet connection or " -"installation media and try again. All files downloaded so far are kept." +"installation media and try again. All files downloaded so far have been kept." msgstr "" #. FIXME: strings are not good, but we are in string freeze #. currently -#: ../DistUpgrade/DistUpgradeController.py:1029 -#: ../DistUpgrade/DistUpgradeController.py:1066 -#: ../DistUpgrade/DistUpgradeController.py:1171 +#: ../DistUpgrade/DistUpgradeController.py:1079 +#: ../DistUpgrade/DistUpgradeController.py:1116 +#: ../DistUpgrade/DistUpgradeController.py:1221 msgid "Error during commit" msgstr "" #. generate a new cache -#: ../DistUpgrade/DistUpgradeController.py:1031 -#: ../DistUpgrade/DistUpgradeController.py:1068 -#: ../DistUpgrade/DistUpgradeController.py:1210 +#: ../DistUpgrade/DistUpgradeController.py:1081 +#: ../DistUpgrade/DistUpgradeController.py:1118 +#: ../DistUpgrade/DistUpgradeController.py:1260 msgid "Restoring original system state" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1032 -#: ../DistUpgrade/DistUpgradeController.py:1047 -#: ../DistUpgrade/DistUpgradeController.py:1069 +#: ../DistUpgrade/DistUpgradeController.py:1082 +#: ../DistUpgrade/DistUpgradeController.py:1097 +#: ../DistUpgrade/DistUpgradeController.py:1119 msgid "Could not install the upgrades" msgstr "" #. invoke the frontend now and show a error message -#: ../DistUpgrade/DistUpgradeController.py:1037 +#: ../DistUpgrade/DistUpgradeController.py:1087 msgid "" "The upgrade has aborted. Your system could be in an unusable state. A " "recovery will run now (dpkg --configure -a)." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1042 +#: ../DistUpgrade/DistUpgradeController.py:1092 #, python-format msgid "" "\n" "\n" -"Please report this bug using the command 'ubuntu-bug update-manager' in a " -"terminal and include the files in /var/log/dist-upgrade/ in the bug report.\n" +"Please report this bug in a browser at http://bugs.launchpad.net/ubuntu/" +"+source/update-manager/+filebug and attach the files in /var/log/dist-" +"upgrade/ to the bug report.\n" "%s" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1079 +#: ../DistUpgrade/DistUpgradeController.py:1129 msgid "" "The upgrade has aborted. Please check your Internet connection or " "installation media and try again. " msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1159 +#: ../DistUpgrade/DistUpgradeController.py:1209 msgid "Remove obsolete packages?" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1160 +#: ../DistUpgrade/DistUpgradeController.py:1210 #: ../DistUpgrade/DistUpgrade.ui.h:22 msgid "_Keep" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1160 +#: ../DistUpgrade/DistUpgradeController.py:1210 msgid "_Remove" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1172 +#: ../DistUpgrade/DistUpgradeController.py:1222 msgid "" "A problem occurred during the clean-up. Please see the below message for " "more information. " @@ -524,141 +529,136 @@ #. FIXME: instead of error out, fetch and install it #. here -#: ../DistUpgrade/DistUpgradeController.py:1248 +#: ../DistUpgrade/DistUpgradeController.py:1298 msgid "Required depends is not installed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1249 +#: ../DistUpgrade/DistUpgradeController.py:1299 #, python-format msgid "The required dependency '%s' is not installed. " msgstr "" #. sanity check (check for ubuntu-desktop, brokenCache etc) #. then open the cache (again) -#: ../DistUpgrade/DistUpgradeController.py:1496 -#: ../DistUpgrade/DistUpgradeController.py:1566 +#: ../DistUpgrade/DistUpgradeController.py:1544 +#: ../DistUpgrade/DistUpgradeController.py:1609 msgid "Checking package manager" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1501 +#: ../DistUpgrade/DistUpgradeController.py:1549 msgid "Preparing the upgrade failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1502 +#: ../DistUpgrade/DistUpgradeController.py:1550 msgid "" -"Preparing the system for the upgrade failed. Please report this using the " -"command 'ubuntu-bug update-manager' in a terminal and include the files in /" -"var/log/dist-upgrade/ in the bug report." +"Preparing the system for the upgrade failed so a bug reporting process is " +"being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1518 +#: ../DistUpgrade/DistUpgradeController.py:1564 msgid "Getting upgrade prerequisites failed" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1519 +#: ../DistUpgrade/DistUpgradeController.py:1565 msgid "" "The system was unable to get the prerequisites for the upgrade. The upgrade " "will abort now and restore the original system state.\n" "\n" -"Please report this as a bug using the command 'ubuntu-bug update-manager' in " -"a terminal and include the files in /var/log/dist-upgrade/ in the bug report." +"Additionally, a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1550 +#: ../DistUpgrade/DistUpgradeController.py:1593 msgid "Updating repository information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1557 +#: ../DistUpgrade/DistUpgradeController.py:1600 msgid "Failed to add the cdrom" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1558 +#: ../DistUpgrade/DistUpgradeController.py:1601 msgid "Sorry, adding the cdrom was not successful." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1586 +#: ../DistUpgrade/DistUpgradeController.py:1629 msgid "Invalid package information" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1587 +#: ../DistUpgrade/DistUpgradeController.py:1630 #, python-format msgid "" "After your package information was updated the essential package '%s' can " -"not be found anymore.\n" -"This indicates a serious error, please report this bug using the command " -"'ubuntu-bug update-manager' in a terminal and include the files in /var/log/" -"dist-upgrade/ in the bug report." +"not be found anymore so a bug reporting process is being started." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1605 -#: ../DistUpgrade/DistUpgradeController.py:1657 +#: ../DistUpgrade/DistUpgradeController.py:1646 +#: ../DistUpgrade/DistUpgradeController.py:1699 msgid "Fetching" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1611 -#: ../DistUpgrade/DistUpgradeController.py:1661 +#: ../DistUpgrade/DistUpgradeController.py:1652 +#: ../DistUpgrade/DistUpgradeController.py:1703 msgid "Upgrading" msgstr "" #. don't abort here, because it would restore the sources.list -#: ../DistUpgrade/DistUpgradeController.py:1616 -#: ../DistUpgrade/DistUpgradeController.py:1663 -#: ../DistUpgrade/DistUpgradeController.py:1670 -#: ../DistUpgrade/DistUpgradeController.py:1681 +#: ../DistUpgrade/DistUpgradeController.py:1657 +#: ../DistUpgrade/DistUpgradeController.py:1705 +#: ../DistUpgrade/DistUpgradeController.py:1712 +#: ../DistUpgrade/DistUpgradeController.py:1723 msgid "Upgrade complete" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1617 -#: ../DistUpgrade/DistUpgradeController.py:1664 -#: ../DistUpgrade/DistUpgradeController.py:1671 +#: ../DistUpgrade/DistUpgradeController.py:1658 +#: ../DistUpgrade/DistUpgradeController.py:1706 +#: ../DistUpgrade/DistUpgradeController.py:1713 msgid "" "The upgrade has completed but there were errors during the upgrade process." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1624 +#: ../DistUpgrade/DistUpgradeController.py:1665 msgid "Searching for obsolete software" msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1633 +#: ../DistUpgrade/DistUpgradeController.py:1674 msgid "System upgrade is complete." msgstr "" -#: ../DistUpgrade/DistUpgradeController.py:1682 +#: ../DistUpgrade/DistUpgradeController.py:1724 msgid "The partial upgrade was completed." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:182 +#: ../DistUpgrade/DistUpgradeQuirks.py:202 msgid "evms in use" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:183 +#: ../DistUpgrade/DistUpgradeQuirks.py:203 msgid "" "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' " "software is no longer supported, please switch it off and run the upgrade " "again when this is done." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:468 +#: ../DistUpgrade/DistUpgradeQuirks.py:496 msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:470 +#: ../DistUpgrade/DistUpgradeQuirks.py:498 msgid "" "The support in Ubuntu 11.04 for your intel graphics hardware is limited and " "you may encounter problems after the upgrade. Do you want to continue with " "the upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:490 #: ../DistUpgrade/DistUpgradeQuirks.py:518 -#: ../DistUpgrade/DistUpgradeQuirks.py:545 +#: ../DistUpgrade/DistUpgradeQuirks.py:546 +#: ../DistUpgrade/DistUpgradeQuirks.py:573 msgid "" "Upgrading may reduce desktop effects, and performance in games and other " "graphically intensive programs." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:494 #: ../DistUpgrade/DistUpgradeQuirks.py:522 +#: ../DistUpgrade/DistUpgradeQuirks.py:550 msgid "" "This computer is currently using the NVIDIA 'nvidia' graphics driver. No " "version of this driver is available that works with your video card in " @@ -667,7 +667,7 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:549 +#: ../DistUpgrade/DistUpgradeQuirks.py:577 msgid "" "This computer is currently using the AMD 'fglrx' graphics driver. No version " "of this driver is available that works with your hardware in Ubuntu 10.04 " @@ -676,11 +676,11 @@ "Do you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:579 +#: ../DistUpgrade/DistUpgradeQuirks.py:607 msgid "No i686 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:580 +#: ../DistUpgrade/DistUpgradeQuirks.py:608 msgid "" "Your system uses an i586 CPU or a CPU that does not have the 'cmov' " "extension. All packages were built with optimizations requiring i686 as the " @@ -688,11 +688,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:616 +#: ../DistUpgrade/DistUpgradeQuirks.py:644 msgid "No ARMv6 CPU" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:617 +#: ../DistUpgrade/DistUpgradeQuirks.py:645 msgid "" "Your system uses an ARM CPU that is older than the ARMv6 architecture. All " "packages in karmic were built with optimizations requiring ARMv6 as the " @@ -700,11 +700,11 @@ "Ubuntu release with this hardware." msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:637 +#: ../DistUpgrade/DistUpgradeQuirks.py:665 msgid "No init available" msgstr "" -#: ../DistUpgrade/DistUpgradeQuirks.py:638 +#: ../DistUpgrade/DistUpgradeQuirks.py:666 msgid "" "Your system appears to be a virtualised environment without an init daemon, " "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of " @@ -714,65 +714,71 @@ "Are you sure you want to continue?" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:48 +#: ../DistUpgrade/DistUpgradeMain.py:63 msgid "Sandbox upgrade using aufs" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:50 +#: ../DistUpgrade/DistUpgradeMain.py:65 msgid "Use the given path to search for a cdrom with upgradable packages" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:56 +#: ../DistUpgrade/DistUpgradeMain.py:71 msgid "" "Use frontend. Currently available: \n" "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:59 -msgid "*DEPRECATED* this option will be ignore" +#: ../DistUpgrade/DistUpgradeMain.py:74 +msgid "*DEPRECATED* this option will be ignored" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:62 +#: ../DistUpgrade/DistUpgradeMain.py:77 msgid "Perform a partial upgrade only (no sources.list rewriting)" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:65 +#: ../DistUpgrade/DistUpgradeMain.py:80 msgid "Disable GNU screen support" msgstr "" -#: ../DistUpgrade/DistUpgradeMain.py:67 +#: ../DistUpgrade/DistUpgradeMain.py:82 msgid "Set datadir" msgstr "" #. print "mediaChange %s %s" % (medium, drive) #: ../DistUpgrade/DistUpgradeViewGtk.py:114 -#: ../DistUpgrade/DistUpgradeViewKDE.py:190 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:117 +#: ../DistUpgrade/DistUpgradeViewKDE.py:193 #: ../UpdateManager/DistUpgradeFetcherKDE.py:148 #, python-format msgid "Please insert '%s' into the drive '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:135 -#: ../DistUpgrade/DistUpgradeViewKDE.py:204 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:138 +#: ../DistUpgrade/DistUpgradeViewKDE.py:207 msgid "Fetching is complete" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:146 -#: ../DistUpgrade/DistUpgradeViewKDE.py:217 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:149 +#: ../DistUpgrade/DistUpgradeViewKDE.py:220 #, python-format msgid "Fetching file %li of %li at %sB/s" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:149 #: ../DistUpgrade/DistUpgradeViewGtk.py:295 -#: ../DistUpgrade/DistUpgradeViewKDE.py:218 -#: ../DistUpgrade/DistUpgradeViewKDE.py:362 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:152 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:301 +#: ../DistUpgrade/DistUpgradeViewKDE.py:221 +#: ../DistUpgrade/DistUpgradeViewKDE.py:365 #, python-format msgid "About %s remaining" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:152 -#: ../DistUpgrade/DistUpgradeViewKDE.py:220 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:155 +#: ../DistUpgrade/DistUpgradeViewKDE.py:223 #, python-format msgid "Fetching file %li of %li" msgstr "" @@ -781,24 +787,28 @@ #. of the terminal (to display something useful then) #. -> longer term, move this code into python-apt #: ../DistUpgrade/DistUpgradeViewGtk.py:183 -#: ../DistUpgrade/DistUpgradeViewKDE.py:254 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:186 +#: ../DistUpgrade/DistUpgradeViewKDE.py:257 msgid "Applying changes" msgstr "" #. we do not report followup errors from earlier failures #: ../DistUpgrade/DistUpgradeViewGtk.py:208 -#: ../DistUpgrade/DistUpgradeViewKDE.py:267 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:211 +#: ../DistUpgrade/DistUpgradeViewKDE.py:270 msgid "dependency problems - leaving unconfigured" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:213 -#: ../DistUpgrade/DistUpgradeViewKDE.py:269 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:216 +#: ../DistUpgrade/DistUpgradeViewKDE.py:272 #, python-format msgid "Could not install '%s'" msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:214 -#: ../DistUpgrade/DistUpgradeViewKDE.py:270 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:217 +#: ../DistUpgrade/DistUpgradeViewKDE.py:273 #, python-format msgid "" "The upgrade will continue but the '%s' package may not be in a working " @@ -807,7 +817,8 @@ #. self.expander.set_expanded(True) #: ../DistUpgrade/DistUpgradeViewGtk.py:231 -#: ../DistUpgrade/DistUpgradeViewKDE.py:291 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:234 +#: ../DistUpgrade/DistUpgradeViewKDE.py:294 #, python-format msgid "" "Replace the customized configuration file\n" @@ -815,23 +826,27 @@ msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:232 -#: ../DistUpgrade/DistUpgradeViewKDE.py:292 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:235 +#: ../DistUpgrade/DistUpgradeViewKDE.py:295 msgid "" "You will lose any changes you have made to this configuration file if you " "choose to replace it with a newer version." msgstr "" #: ../DistUpgrade/DistUpgradeViewGtk.py:250 -#: ../DistUpgrade/DistUpgradeViewKDE.py:314 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:253 +#: ../DistUpgrade/DistUpgradeViewKDE.py:317 msgid "The 'diff' command was not found" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:462 -#: ../DistUpgrade/DistUpgradeViewText.py:91 +#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:469 +#: ../DistUpgrade/DistUpgradeViewText.py:90 msgid "A fatal error occurred" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:463 +#: ../DistUpgrade/DistUpgradeViewGtk.py:464 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:470 msgid "" "Please report this as a bug (if you haven't already) and include the files /" "var/log/dist-upgrade/main.log and /var/log/dist-upgrade/apt.log in your " @@ -839,138 +854,147 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:480 +#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:487 msgid "Ctrl-c pressed" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:481 +#: ../DistUpgrade/DistUpgradeViewGtk.py:482 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:488 msgid "" "This will abort the operation and may leave the system in a broken state. " "Are you sure you want to do that?" msgstr "" #. append warning -#: ../DistUpgrade/DistUpgradeViewGtk.py:629 +#: ../DistUpgrade/DistUpgradeViewGtk.py:630 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:621 msgid "To prevent data loss close all open applications and documents." msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:643 +#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:635 #, python-format msgid "No longer supported by Canonical (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:644 +#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:636 #, python-format msgid "Downgrade (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:645 +#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:637 #, python-format msgid "Remove (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:646 +#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:638 #, python-format msgid "No longer needed (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:647 +#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:639 #, python-format msgid "Install (%s)" msgstr "" -#: ../DistUpgrade/DistUpgradeViewGtk.py:648 +#: ../DistUpgrade/DistUpgradeViewGtk.py:649 +#: ../DistUpgrade/DistUpgradeViewGtk3.py:640 #, python-format msgid "Upgrade (%s)" msgstr "" #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel) -#: ../DistUpgrade/DistUpgradeViewKDE.py:191 +#: ../DistUpgrade/DistUpgradeViewKDE.py:194 #: ../UpdateManager/DistUpgradeFetcherKDE.py:150 msgid "Media Change" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:326 +#: ../DistUpgrade/DistUpgradeViewKDE.py:329 msgid "Show Difference >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:329 +#: ../DistUpgrade/DistUpgradeViewKDE.py:332 msgid "<<< Hide Difference" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:544 +#: ../DistUpgrade/DistUpgradeViewKDE.py:547 msgid "Error" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:556 +#: ../DistUpgrade/DistUpgradeViewKDE.py:559 msgid "&Cancel" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:558 -#: ../DistUpgrade/DistUpgradeViewKDE.py:800 +#: ../DistUpgrade/DistUpgradeViewKDE.py:561 +#: ../DistUpgrade/DistUpgradeViewKDE.py:803 msgid "&Close" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:604 +#: ../DistUpgrade/DistUpgradeViewKDE.py:607 msgid "Show Terminal >>>" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:607 +#: ../DistUpgrade/DistUpgradeViewKDE.py:610 msgid "<<< Hide Terminal" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:687 +#: ../DistUpgrade/DistUpgradeViewKDE.py:690 msgid "Information" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:738 -#: ../DistUpgrade/DistUpgradeViewKDE.py:783 -#: ../DistUpgrade/DistUpgradeViewKDE.py:786 ../DistUpgrade/DistUpgrade.ui.h:11 +#: ../DistUpgrade/DistUpgradeViewKDE.py:741 +#: ../DistUpgrade/DistUpgradeViewKDE.py:786 +#: ../DistUpgrade/DistUpgradeViewKDE.py:789 ../DistUpgrade/DistUpgrade.ui.h:11 msgid "Details" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:764 +#: ../DistUpgrade/DistUpgradeViewKDE.py:767 #, python-format msgid "No longer supported %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:766 +#: ../DistUpgrade/DistUpgradeViewKDE.py:769 #, python-format msgid "Remove %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:768 -#: ../DistUpgrade/DistUpgradeViewText.py:180 +#: ../DistUpgrade/DistUpgradeViewKDE.py:771 +#: ../DistUpgrade/DistUpgradeViewText.py:179 #, python-format msgid "Remove (was auto installed) %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:770 +#: ../DistUpgrade/DistUpgradeViewKDE.py:773 #, python-format msgid "Install %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:772 +#: ../DistUpgrade/DistUpgradeViewKDE.py:775 #, python-format msgid "Upgrade %s" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 -#: ../DistUpgrade/DistUpgradeViewText.py:228 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 +#: ../DistUpgrade/DistUpgradeViewText.py:227 msgid "Restart required" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:796 +#: ../DistUpgrade/DistUpgradeViewKDE.py:799 msgid "Restart the system to complete the upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:799 ../DistUpgrade/DistUpgrade.ui.h:25 -#: ../data/glade/UpdateManager.ui.h:32 +#: ../DistUpgrade/DistUpgradeViewKDE.py:802 ../DistUpgrade/DistUpgrade.ui.h:25 +#: ../data/gtkbuilder/UpdateManager.ui.h:32 msgid "_Restart Now" msgstr "" #. FIXME make this user friendly -#: ../DistUpgrade/DistUpgradeViewKDE.py:817 +#: ../DistUpgrade/DistUpgradeViewKDE.py:820 msgid "" "Cancel the running upgrade?\n" "\n" @@ -978,32 +1002,32 @@ "strongly advised to resume the upgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewKDE.py:821 +#: ../DistUpgrade/DistUpgradeViewKDE.py:824 msgid "Cancel Upgrade?" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:60 +#: ../DistUpgrade/DistUpgradeView.py:59 #, python-format msgid "%li day" msgid_plural "%li days" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:62 +#: ../DistUpgrade/DistUpgradeView.py:61 #, python-format msgid "%li hour" msgid_plural "%li hours" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:64 +#: ../DistUpgrade/DistUpgradeView.py:63 #, python-format msgid "%li minute" msgid_plural "%li minutes" msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:65 +#: ../DistUpgrade/DistUpgradeView.py:64 #, python-format msgid "%li second" msgid_plural "%li seconds" @@ -1019,7 +1043,7 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:81 +#: ../DistUpgrade/DistUpgradeView.py:80 #, python-format msgid "%(str_days)s %(str_hours)s" msgstr "" @@ -1033,14 +1057,14 @@ #. plural form #. #. Note: most western languages will not need to change this -#: ../DistUpgrade/DistUpgradeView.py:99 +#: ../DistUpgrade/DistUpgradeView.py:98 #, python-format msgid "%(str_hours)s %(str_minutes)s" msgstr "" #. 56 kbit #. 1Mbit = 1024 kbit -#: ../DistUpgrade/DistUpgradeView.py:148 +#: ../DistUpgrade/DistUpgradeView.py:149 #, python-format msgid "" "This download will take about %s with a 1Mbit DSL connection and about %s " @@ -1048,32 +1072,32 @@ msgstr "" #. if we have a estimated speed, use it -#: ../DistUpgrade/DistUpgradeView.py:152 +#: ../DistUpgrade/DistUpgradeView.py:153 #, python-format msgid "This download will take about %s with your connection. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:254 ../DistUpgrade/DistUpgrade.ui.h:16 +#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:16 msgid "Preparing to upgrade" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:255 +#: ../DistUpgrade/DistUpgradeView.py:256 msgid "Getting new software channels" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:256 ../DistUpgrade/DistUpgrade.ui.h:14 +#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:14 msgid "Getting new packages" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:15 +#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:15 msgid "Installing the upgrades" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:258 ../DistUpgrade/DistUpgrade.ui.h:10 +#: ../DistUpgrade/DistUpgradeView.py:259 ../DistUpgrade/DistUpgrade.ui.h:10 msgid "Cleaning up" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:343 +#: ../DistUpgrade/DistUpgradeView.py:344 #, python-format msgid "" "%(amount)d installed package is no longer supported by Canonical. You can " @@ -1086,28 +1110,28 @@ #. FIXME: make those two separate lines to make it clear #. that the "%" applies to the result of ngettext -#: ../DistUpgrade/DistUpgradeView.py:352 +#: ../DistUpgrade/DistUpgradeView.py:353 #, python-format msgid "%d package is going to be removed." msgid_plural "%d packages are going to be removed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:357 +#: ../DistUpgrade/DistUpgradeView.py:358 #, python-format msgid "%d new package is going to be installed." msgid_plural "%d new packages are going to be installed." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:363 +#: ../DistUpgrade/DistUpgradeView.py:364 #, python-format msgid "%d package is going to be upgraded." msgid_plural "%d packages are going to be upgraded." msgstr[0] "" msgstr[1] "" -#: ../DistUpgrade/DistUpgradeView.py:368 +#: ../DistUpgrade/DistUpgradeView.py:369 #, python-format msgid "" "\n" @@ -1115,123 +1139,145 @@ "You have to download a total of %s. " msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:372 +#: ../DistUpgrade/DistUpgradeView.py:374 +msgid "" +"Installing the upgrade can take several hours. Once the download has " +"finished, the process cannot be canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:378 msgid "" "Fetching and installing the upgrade can take several hours. Once the " -"download has finished, the process cannot be cancelled." +"download has finished, the process cannot be canceled." +msgstr "" + +#: ../DistUpgrade/DistUpgradeView.py:383 +msgid "Removing the packages can take several hours. " msgstr "" #. FIXME: this should go into DistUpgradeController -#: ../DistUpgrade/DistUpgradeView.py:378 ../UpdateManager/UpdateManager.py:657 -msgid "Your system is up-to-date" +#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:674 +msgid "The software on this computer is up to date." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:379 +#: ../DistUpgrade/DistUpgradeView.py:389 msgid "" "There are no upgrades available for your system. The upgrade will now be " "canceled." msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:392 +#: ../DistUpgrade/DistUpgradeView.py:402 msgid "Reboot required" msgstr "" -#: ../DistUpgrade/DistUpgradeView.py:393 +#: ../DistUpgrade/DistUpgradeView.py:403 msgid "" "The upgrade is finished and a reboot is required. Do you want to do this now?" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:135 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:136 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:135 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:136 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:70 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:70 +#, python-format +msgid "authenticate '%(file)s' against '%(signature)s' " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:110 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:110 +#, python-format +msgid "extracting '%s'" +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:130 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "Could not run the upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:136 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:136 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:131 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131 msgid "" "This is most likely a bug in the upgrade tool. Please report it as a bug " "using the command 'ubuntu-bug update-manager'." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:211 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:211 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:206 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206 msgid "Upgrade tool signature" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:216 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:216 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:213 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213 msgid "Upgrade tool" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:247 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247 msgid "Failed to fetch" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:249 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:249 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:248 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248 msgid "Fetching the upgrade failed. There may be a network problem. " msgstr "" +#: ../DistUpgrade/DistUpgradeFetcherCore.py:252 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252 +msgid "Authentication failed" +msgstr "" + #: ../DistUpgrade/DistUpgradeFetcherCore.py:253 #: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253 +msgid "" +"Authenticating the upgrade failed. There may be a problem with the network " +"or with the server. " +msgstr "" + +#: ../DistUpgrade/DistUpgradeFetcherCore.py:258 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258 msgid "Failed to extract" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:254 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:254 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 msgid "" "Extracting the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:259 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:264 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264 msgid "Verification failed" msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:260 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:260 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 msgid "" "Verifying the upgrade failed. There may be a problem with the network or " "with the server. " msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:265 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265 -msgid "Authentication failed" -msgstr "" - -#: ../DistUpgrade/DistUpgradeFetcherCore.py:266 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266 -msgid "" -"Authenticating the upgrade failed. There may be a problem with the network " -"or with the server. " +#: ../DistUpgrade/DistUpgradeFetcherCore.py:279 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:285 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285 +msgid "Can not run the upgrade" msgstr "" #: ../DistUpgrade/DistUpgradeFetcherCore.py:280 -#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 #: ../UpdateManager/Core/DistUpgradeFetcherCore.py:280 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 -msgid "Can not run the upgrade" -msgstr "" - -#: ../DistUpgrade/DistUpgradeFetcherCore.py:281 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:281 msgid "" "This usually is caused by a system where /tmp is mounted noexec. Please " "remount without noexec and run the upgrade again." msgstr "" -#: ../DistUpgrade/DistUpgradeFetcherCore.py:287 -#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:287 +#: ../DistUpgrade/DistUpgradeFetcherCore.py:286 +#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286 #, python-format msgid "The error message is '%s'." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:92 +#: ../DistUpgrade/DistUpgradeViewText.py:91 msgid "" "Please report this as a bug and include the files /var/log/dist-upgrade/main." "log and /var/log/dist-upgrade/apt.log in your report. The upgrade has " @@ -1239,73 +1285,73 @@ "Your original sources.list was saved in /etc/apt/sources.list.distUpgrade." msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:116 +#: ../DistUpgrade/DistUpgradeViewText.py:115 msgid "Aborting" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:121 +#: ../DistUpgrade/DistUpgradeViewText.py:120 msgid "Demoted:\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:128 +#: ../DistUpgrade/DistUpgradeViewText.py:127 msgid "To continue please press [ENTER]" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:156 -#: ../DistUpgrade/DistUpgradeViewText.py:194 -#: ../DistUpgrade/DistUpgradeViewText.py:201 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 +#: ../DistUpgrade/DistUpgradeViewText.py:200 msgid "Continue [yN] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:156 -#: ../DistUpgrade/DistUpgradeViewText.py:194 +#: ../DistUpgrade/DistUpgradeViewText.py:155 +#: ../DistUpgrade/DistUpgradeViewText.py:193 msgid "Details [d]" msgstr "" #. TRANSLATORS: the "y" is "yes" #. TRANSLATORS: first letter of a positive (yes) answer -#: ../DistUpgrade/DistUpgradeViewText.py:160 -#: ../DistUpgrade/DistUpgradeViewText.py:204 +#: ../DistUpgrade/DistUpgradeViewText.py:159 +#: ../DistUpgrade/DistUpgradeViewText.py:203 msgid "y" msgstr "" #. TRANSLATORS: the "n" is "no" #. TRANSLATORS: first letter of a negative (no) answer -#: ../DistUpgrade/DistUpgradeViewText.py:163 -#: ../DistUpgrade/DistUpgradeViewText.py:211 +#: ../DistUpgrade/DistUpgradeViewText.py:162 +#: ../DistUpgrade/DistUpgradeViewText.py:210 msgid "n" msgstr "" #. TRANSLATORS: the "d" is "details" -#: ../DistUpgrade/DistUpgradeViewText.py:166 +#: ../DistUpgrade/DistUpgradeViewText.py:165 msgid "d" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:171 +#: ../DistUpgrade/DistUpgradeViewText.py:170 #, python-format msgid "No longer supported: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:176 +#: ../DistUpgrade/DistUpgradeViewText.py:175 #, python-format msgid "Remove: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:186 +#: ../DistUpgrade/DistUpgradeViewText.py:185 #, python-format msgid "Install: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:191 +#: ../DistUpgrade/DistUpgradeViewText.py:190 #, python-format msgid "Upgrade: %s\n" msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:208 +#: ../DistUpgrade/DistUpgradeViewText.py:207 msgid "Continue [Yn] " msgstr "" -#: ../DistUpgrade/DistUpgradeViewText.py:229 +#: ../DistUpgrade/DistUpgradeViewText.py:228 msgid "" "To finish the upgrade, a restart is required.\n" "If you select 'y' the system will be restarted." @@ -1335,7 +1381,7 @@ msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:9 -msgid "Upgrading Ubuntu to version 11.10" +msgid "Upgrading Ubuntu to version 12.04" msgstr "" #: ../DistUpgrade/DistUpgrade.ui.h:12 @@ -1382,30 +1428,30 @@ msgid "_Start Upgrade" msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:55 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:60 msgid "Please wait, this can take some time." msgstr "" -#: ../UpdateManager/backend/InstallBackendSynaptic.py:57 +#: ../UpdateManager/backend/InstallBackendSynaptic.py:62 msgid "Update is complete" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:109 +#: ../UpdateManager/DistUpgradeFetcher.py:108 #: ../UpdateManager/DistUpgradeFetcherKDE.py:103 msgid "Could not find the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:110 +#: ../UpdateManager/DistUpgradeFetcher.py:109 #: ../UpdateManager/DistUpgradeFetcherKDE.py:104 msgid "The server may be overloaded. " msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:120 +#: ../UpdateManager/DistUpgradeFetcher.py:119 #: ../UpdateManager/DistUpgradeFetcherKDE.py:108 msgid "Could not download the release notes" msgstr "" -#: ../UpdateManager/DistUpgradeFetcher.py:121 +#: ../UpdateManager/DistUpgradeFetcher.py:120 #: ../UpdateManager/DistUpgradeFetcherKDE.py:109 msgid "Please check your internet connection." msgstr "" @@ -1416,8 +1462,8 @@ msgstr "" #: ../UpdateManager/DistUpgradeFetcherKDE.py:89 -#: ../data/glade/UpdateManager.ui.h:13 -#: ../data/glade/UpgradePromptDialog.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:13 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4 msgid "Release Notes" msgstr "" @@ -1437,7 +1483,7 @@ msgid "File %s of %s" msgstr "" -#: ../UpdateManager/ChangelogViewer.py:74 +#: ../UpdateManager/ChangelogViewer.py:73 msgid "Open Link in Browser" msgstr "" @@ -1455,96 +1501,97 @@ msgid "Downloading file %(current)li of %(total)li" msgstr "" -#: ../UpdateManager/UpdateManager.py:107 ../do-release-upgrade:90 +#: ../UpdateManager/UpdateManager.py:103 ../do-release-upgrade:95 msgid "Your Ubuntu release is not supported anymore." msgstr "" -#: ../UpdateManager/UpdateManager.py:108 +#: ../UpdateManager/UpdateManager.py:104 msgid "" "You will not get any further security fixes or critical updates. Please " -"upgrade to a later version of Ubuntu Linux." +"upgrade to a later version of Ubuntu." msgstr "" -#: ../UpdateManager/UpdateManager.py:116 +#: ../UpdateManager/UpdateManager.py:112 msgid "Upgrade information" msgstr "" -#: ../UpdateManager/UpdateManager.py:391 +#. upload_archive = version_match.group(2).strip() +#: ../UpdateManager/UpdateManager.py:387 #, python-format msgid "Version %s: \n" msgstr "" -#: ../UpdateManager/UpdateManager.py:447 +#: ../UpdateManager/UpdateManager.py:444 msgid "" "No network connection detected, you can not download changelog information." msgstr "" -#: ../UpdateManager/UpdateManager.py:455 +#: ../UpdateManager/UpdateManager.py:452 msgid "Downloading list of changes..." msgstr "" -#: ../UpdateManager/UpdateManager.py:498 -msgid "_Uncheck All" +#: ../UpdateManager/UpdateManager.py:496 +msgid "_Deselect All" msgstr "" -#: ../UpdateManager/UpdateManager.py:504 -msgid "_Check All" +#: ../UpdateManager/UpdateManager.py:502 +msgid "Select _All" msgstr "" -#: ../UpdateManager/UpdateManager.py:553 +#: ../UpdateManager/UpdateManager.py:562 #, python-format msgid "%(count)s update has been selected." msgid_plural "%(count)s updates have been selected." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:557 +#: ../UpdateManager/UpdateManager.py:566 #, python-format msgid "%s will be downloaded." msgstr "" -#: ../UpdateManager/UpdateManager.py:569 -msgid "The update has already been downloaded, but not installed" -msgid_plural "The updates have already been downloaded, but not installed" +#: ../UpdateManager/UpdateManager.py:578 +msgid "The update has already been downloaded, but not installed." +msgid_plural "The updates have already been downloaded, but not installed." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:574 -msgid "There are no updates to install" +#: ../UpdateManager/UpdateManager.py:583 +msgid "There are no updates to install." msgstr "" #. TRANSLATORS: this allows to switch the order of the count of #. updates and the download size string (if needed) -#: ../UpdateManager/UpdateManager.py:580 +#: ../UpdateManager/UpdateManager.py:589 #, python-format msgid "%(count_str)s %(download_str)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:587 +#: ../UpdateManager/UpdateManager.py:596 msgid "Unknown download size." msgstr "" -#: ../UpdateManager/UpdateManager.py:613 +#: ../UpdateManager/UpdateManager.py:622 msgid "" -"It is unknown when the package information was updated last. Please try " -"clicking on the 'Check' button to update the information." +"It is unknown when the package information was updated last. Please click " +"the 'Check' button to update the information." msgstr "" -#: ../UpdateManager/UpdateManager.py:618 +#: ../UpdateManager/UpdateManager.py:628 #, python-format msgid "" "The package information was last updated %(days_ago)s days ago.\n" "Press the 'Check' button below to check for new software updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:623 +#: ../UpdateManager/UpdateManager.py:633 #, python-format msgid "The package information was last updated %(days_ago)s day ago." msgid_plural "The package information was last updated %(days_ago)s days ago." msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:627 +#: ../UpdateManager/UpdateManager.py:637 #, python-format msgid "The package information was last updated %(hours_ago)s hour ago." msgid_plural "" @@ -1552,55 +1599,43 @@ msgstr[0] "" msgstr[1] "" -#: ../UpdateManager/UpdateManager.py:631 -msgid "The package information was last updated less than one hour ago." +#. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago +#: ../UpdateManager/UpdateManager.py:642 ../UpdateManager/UpdateManager.py:644 +#: ../UpdateManager/UpdateManager.py:646 +#, python-format +msgid "The package information was last updated about %s minutes ago." +msgstr "" + +#: ../UpdateManager/UpdateManager.py:648 +msgid "The package information was just updated." msgstr "" -#: ../UpdateManager/UpdateManager.py:651 ../data/glade/UpdateManager.ui.h:22 +#: ../UpdateManager/UpdateManager.py:668 +#: ../data/gtkbuilder/UpdateManager.ui.h:22 msgid "" "Software updates correct errors, eliminate security vulnerabilities and " "provide new features." msgstr "" -#: ../UpdateManager/UpdateManager.py:670 +#: ../UpdateManager/UpdateManager.py:687 msgid "Software updates may be available for your computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:678 +#: ../UpdateManager/UpdateManager.py:695 msgid "Welcome to Ubuntu" msgstr "" -#: ../UpdateManager/UpdateManager.py:680 +#: ../UpdateManager/UpdateManager.py:696 msgid "" -"These software updates have been issued since Ubuntu was released. If you " -"don't want to install them now, choose \"Update Manager\" from Applications " -"later." +"These software updates have been issued since this version of Ubuntu was " +"released." msgstr "" -#: ../UpdateManager/UpdateManager.py:682 -msgid "" -"These software updates have been issued since Ubuntu was released. If you " -"don't want to install them now, choose \"Update Manager\" from the " -"Administration Menu later." +#: ../UpdateManager/UpdateManager.py:699 +msgid "Software updates are available for this computer." msgstr "" -#: ../UpdateManager/UpdateManager.py:685 -msgid "Software updates are available for this computer" -msgstr "" - -#: ../UpdateManager/UpdateManager.py:687 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from " -"Applications later." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:689 -msgid "" -"If you don't want to install them now, choose \"Update Manager\" from the " -"Administration menu later." -msgstr "" - -#: ../UpdateManager/UpdateManager.py:742 +#: ../UpdateManager/UpdateManager.py:750 #, python-format msgid "" "The upgrade needs a total of %s free space on disk '%s'. Please free at " @@ -1608,29 +1643,29 @@ "temporary packages of former installations using 'sudo apt-get clean'." msgstr "" -#: ../UpdateManager/UpdateManager.py:767 +#: ../UpdateManager/UpdateManager.py:775 msgid "" "The computer needs to restart to finish installing updates. Please save your " "work before continuing." msgstr "" -#: ../UpdateManager/UpdateManager.py:832 +#: ../UpdateManager/UpdateManager.py:839 msgid "Reading package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:847 +#: ../UpdateManager/UpdateManager.py:854 msgid "Connecting..." msgstr "" -#: ../UpdateManager/UpdateManager.py:864 +#: ../UpdateManager/UpdateManager.py:871 msgid "You may not be able to check for updates or download new updates." msgstr "" -#: ../UpdateManager/UpdateManager.py:1003 +#: ../UpdateManager/UpdateManager.py:995 msgid "Could not initialize the package information" msgstr "" -#: ../UpdateManager/UpdateManager.py:1004 +#: ../UpdateManager/UpdateManager.py:996 msgid "" "An unresolvable problem occurred while initializing the package " "information.\n" @@ -1639,7 +1674,7 @@ "following error message:\n" msgstr "" -#: ../UpdateManager/UpdateManager.py:1033 +#: ../UpdateManager/UpdateManager.py:1025 msgid "" "An unresolvable problem occurred while calculating the upgrade.\n" "\n" @@ -1647,79 +1682,87 @@ "following error message:" msgstr "" -#: ../UpdateManager/UpdateManager.py:1058 +#: ../UpdateManager/UpdateManager.py:1050 msgid " (New install)" msgstr "" #. TRANSLATORS: the b stands for Bytes -#: ../UpdateManager/UpdateManager.py:1065 +#: ../UpdateManager/UpdateManager.py:1057 #, python-format msgid "(Size: %s)" msgstr "" -#: ../UpdateManager/UpdateManager.py:1067 +#: ../UpdateManager/UpdateManager.py:1059 #, python-format msgid "From version %(old_version)s to %(new_version)s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1071 +#: ../UpdateManager/UpdateManager.py:1063 #, python-format msgid "Version %s" msgstr "" -#: ../UpdateManager/UpdateManager.py:1102 ../do-release-upgrade:102 +#: ../UpdateManager/UpdateManager.py:1094 ../do-release-upgrade:107 msgid "Release upgrade not possible right now" msgstr "" -#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:103 +#: ../UpdateManager/UpdateManager.py:1095 ../do-release-upgrade:108 #, c-format, python-format msgid "" "The release upgrade can not be performed currently, please try again later. " "The server reported: '%s'" msgstr "" -#: ../UpdateManager/UpdateManager.py:1105 ../check-new-release-gtk:118 +#: ../UpdateManager/UpdateManager.py:1097 ../check-new-release-gtk:115 msgid "Downloading the release upgrade tool" msgstr "" -#: ../UpdateManager/UpdateManager.py:1112 +#: ../UpdateManager/UpdateManager.py:1104 #, python-format msgid "New Ubuntu release '%s' is available" msgstr "" #. we assert a clean cache -#: ../UpdateManager/UpdateManager.py:1151 +#: ../UpdateManager/UpdateManager.py:1143 msgid "Software index is broken" msgstr "" -#: ../UpdateManager/UpdateManager.py:1152 +#: ../UpdateManager/UpdateManager.py:1144 msgid "" "It is impossible to install or remove any software. Please use the package " "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix " "this issue at first." msgstr "" -#: ../UpdateManager/UnitySupport.py:56 +#: ../UpdateManager/UnitySupport.py:57 msgid "Check for Updates" msgstr "" -#: ../UpdateManager/UnitySupport.py:65 +#: ../UpdateManager/UnitySupport.py:66 msgid "Install All Available Updates" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:26 +#: ../UpdateManagerText/UpdateManagerText.py:31 msgid "Cancel" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:27 +#: ../UpdateManagerText/UpdateManagerText.py:32 msgid "Install" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:45 +#: ../UpdateManagerText/UpdateManagerText.py:34 +msgid "Changelog" +msgstr "" + +#: ../UpdateManagerText/UpdateManagerText.py:37 +msgid "Updates" +msgstr "" + +#: ../UpdateManagerText/UpdateManagerText.py:50 msgid "Building Updates List" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:48 +#: ../UpdateManagerText/UpdateManagerText.py:53 msgid "" "\n" "A normal upgrade can not be calculated, please run: \n" @@ -1733,7 +1776,7 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../UpdateManagerText/UpdateManagerText.py:117 +#: ../UpdateManagerText/UpdateManagerText.py:122 msgid "Downloading changelog" msgstr "" @@ -1742,26 +1785,26 @@ msgid "Other updates (%s)" msgstr "" -#: ../UpdateManager/Core/MyCache.py:287 +#: ../UpdateManager/Core/MyCache.py:285 #, python-format msgid "" "Changes for the versions:\n" -"%s\n" -"%s\n" +"Installed version: %s\n" +"Available version: %s\n" "\n" msgstr "" -#: ../UpdateManager/Core/MyCache.py:301 +#: ../UpdateManager/Core/MyCache.py:299 msgid "This update does not come from a source that supports changelogs." msgstr "" -#: ../UpdateManager/Core/MyCache.py:307 ../UpdateManager/Core/MyCache.py:328 +#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../UpdateManager/Core/MyCache.py:317 +#: ../UpdateManager/Core/MyCache.py:315 #, python-format msgid "" "The changelog does not contain any relevant changes.\n" @@ -1770,7 +1813,7 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/MyCache.py:322 +#: ../UpdateManager/Core/MyCache.py:320 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -1779,44 +1822,40 @@ "until the changes become available or try again later." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:52 +#: ../UpdateManager/Core/UpdateList.py:49 msgid "Failed to detect distribution" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:53 +#: ../UpdateManager/Core/UpdateList.py:50 #, python-format msgid "A error '%s' occurred while checking what system you are using." msgstr "" -#: ../UpdateManager/Core/UpdateList.py:64 +#: ../UpdateManager/Core/UpdateList.py:61 msgid "Important security updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:65 +#: ../UpdateManager/Core/UpdateList.py:62 msgid "Recommended updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:66 +#: ../UpdateManager/Core/UpdateList.py:63 msgid "Proposed updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:67 +#: ../UpdateManager/Core/UpdateList.py:64 msgid "Backports" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:68 +#: ../UpdateManager/Core/UpdateList.py:65 msgid "Distribution updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:73 +#: ../UpdateManager/Core/UpdateList.py:70 msgid "Other updates" msgstr "" -#: ../UpdateManager/Core/UpdateList.py:82 -msgid "Previous selected" -msgstr "" - -#: ../data/glade/UpdateManager.ui.h:1 +#: ../data/gtkbuilder/UpdateManager.ui.h:1 msgid "" "You must check for updates manually\n" "\n" @@ -1824,43 +1863,43 @@ "behavior in Software Sources on the Updates tab." msgstr "" -#: ../data/glade/UpdateManager.ui.h:4 +#: ../data/gtkbuilder/UpdateManager.ui.h:4 msgid "Not all updates can be installed" msgstr "" -#: ../data/glade/UpdateManager.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:5 msgid "Running on battery" msgstr "" -#: ../data/glade/UpdateManager.ui.h:6 +#: ../data/gtkbuilder/UpdateManager.ui.h:6 msgid "Starting Update Manager" msgstr "" -#: ../data/glade/UpdateManager.ui.h:7 +#: ../data/gtkbuilder/UpdateManager.ui.h:7 msgid "Changes" msgstr "" -#: ../data/glade/UpdateManager.ui.h:8 +#: ../data/gtkbuilder/UpdateManager.ui.h:8 msgid "Chec_k" msgstr "" -#: ../data/glade/UpdateManager.ui.h:9 +#: ../data/gtkbuilder/UpdateManager.ui.h:9 msgid "Co_ntinue" msgstr "" -#: ../data/glade/UpdateManager.ui.h:10 +#: ../data/gtkbuilder/UpdateManager.ui.h:10 msgid "Description" msgstr "" -#: ../data/glade/UpdateManager.ui.h:11 +#: ../data/gtkbuilder/UpdateManager.ui.h:11 msgid "Description of update" msgstr "" -#: ../data/glade/UpdateManager.ui.h:12 +#: ../data/gtkbuilder/UpdateManager.ui.h:12 msgid "It’s safer to connect the computer to AC power before updating." msgstr "" -#: ../data/glade/UpdateManager.ui.h:14 +#: ../data/gtkbuilder/UpdateManager.ui.h:14 msgid "" "Run a partial upgrade, to install as many updates as possible. \n" "\n" @@ -1871,84 +1910,85 @@ " * Normal changes of a pre-release version of Ubuntu" msgstr "" -#: ../data/glade/UpdateManager.ui.h:21 -#: ../data/glade/UpgradePromptDialog.ui.h:5 +#: ../data/gtkbuilder/UpdateManager.ui.h:21 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5 msgid "Show progress of individual files" msgstr "" -#: ../data/glade/UpdateManager.ui.h:23 +#: ../data/gtkbuilder/UpdateManager.ui.h:23 msgid "Starting Update Manager" msgstr "" -#: ../data/glade/UpdateManager.ui.h:24 +#: ../data/gtkbuilder/UpdateManager.ui.h:24 msgid "U_pgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:25 ../data/update-manager.desktop.in.h:3 +#: ../data/gtkbuilder/UpdateManager.ui.h:25 +#: ../data/update-manager.desktop.in.h:3 msgid "Update Manager" msgstr "" -#: ../data/glade/UpdateManager.ui.h:26 +#: ../data/gtkbuilder/UpdateManager.ui.h:26 msgid "You are connected via a wireless modem." msgstr "" -#: ../data/glade/UpdateManager.ui.h:27 +#: ../data/gtkbuilder/UpdateManager.ui.h:27 msgid "" "You are connected via roaming and may be charged for the data consumed by " "this update." msgstr "" -#: ../data/glade/UpdateManager.ui.h:28 +#: ../data/gtkbuilder/UpdateManager.ui.h:28 msgid "Your system is running on battery. Are you sure you want to continue?" msgstr "" -#: ../data/glade/UpdateManager.ui.h:29 +#: ../data/gtkbuilder/UpdateManager.ui.h:29 msgid "_Hide this information in the future" msgstr "" -#: ../data/glade/UpdateManager.ui.h:30 +#: ../data/gtkbuilder/UpdateManager.ui.h:30 msgid "_Install Updates" msgstr "" -#: ../data/glade/UpdateManager.ui.h:31 +#: ../data/gtkbuilder/UpdateManager.ui.h:31 msgid "_Partial Upgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:33 +#: ../data/gtkbuilder/UpdateManager.ui.h:33 msgid "_Settings..." msgstr "" -#: ../data/glade/UpdateManager.ui.h:34 +#: ../data/gtkbuilder/UpdateManager.ui.h:34 msgid "_Upgrade" msgstr "" -#: ../data/glade/UpdateManager.ui.h:35 +#: ../data/gtkbuilder/UpdateManager.ui.h:35 msgid "updates" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:1 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1 msgid "A new version of Ubuntu is available. Would you like to upgrade?" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:2 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2 msgid "Ask Me Later" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:3 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3 msgid "Don't Upgrade" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:6 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6 msgid "Yes, Upgrade Now" msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:7 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7 msgid "" "You can upgrade at a later time by opening Update Manager and click on " "\"Upgrade\"." msgstr "" -#: ../data/glade/UpgradePromptDialog.ui.h:8 +#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8 msgid "You have declined to upgrade to the new Ubuntu" msgstr "" @@ -1960,195 +2000,164 @@ msgid "Software Updates" msgstr "" -#: ../data/update-manager.schemas.in.h:1 -msgid "*deprecated* Check for new distribution releases" -msgstr "" - -#: ../data/update-manager.schemas.in.h:2 -msgid "Auto close the install window after successful install" -msgstr "" - -#: ../data/update-manager.schemas.in.h:3 -msgid "First run welcome message" +#: ../update-manager:61 ../update-manager-text:50 ../do-release-upgrade:46 +msgid "Show version and exit" msgstr "" -#: ../data/update-manager.schemas.in.h:4 -msgid "" -"If automatic checking for updates is disabled, you have to reload the " -"channel list manually. This option allows to hide the reminder shown in this " -"case." +#: ../update-manager:64 +msgid "Directory that contains the data files" msgstr "" -#: ../data/update-manager.schemas.in.h:5 -msgid "If this key is set a first run welcome message will be presented." +#: ../update-manager:67 +msgid "Check if a new Ubuntu release is available" msgstr "" -#: ../data/update-manager.schemas.in.h:6 -msgid "" -"If this key is set the install window will be automatically closed on " -"successful installation." +#: ../update-manager:70 ../do-release-upgrade:49 ../check-new-release-gtk:182 +msgid "Check if upgrading to the latest devel release is possible" msgstr "" -#: ../data/update-manager.schemas.in.h:7 -msgid "" -"If this key is set the main update list window will show version information " -"(from version to version)." +#: ../update-manager:74 +msgid "Upgrade using the latest proposed version of the release upgrader" msgstr "" -#: ../data/update-manager.schemas.in.h:8 -msgid "" -"If this key is set, the main update list window will show the package " -"summary before the package name." +#: ../update-manager:81 +msgid "Do not focus on map when starting" msgstr "" -#: ../data/update-manager.schemas.in.h:9 -msgid "Remind to reload the channel list" +#: ../update-manager:84 +msgid "Try to run a dist-upgrade" msgstr "" -#: ../data/update-manager.schemas.in.h:10 -msgid "Show details of an update" +#: ../update-manager:87 +msgid "Do not check for updates when starting" msgstr "" -#: ../data/update-manager.schemas.in.h:11 -msgid "Show package summary before package name in update list" +#: ../update-manager:91 ../do-release-upgrade:65 +msgid "Test upgrade with a sandbox aufs overlay" msgstr "" -#: ../data/update-manager.schemas.in.h:12 -msgid "Show version in update list" +#: ../update-manager:111 +msgid "Running partial upgrade" msgstr "" -#: ../data/update-manager.schemas.in.h:13 -msgid "Stores the height of the update-manager dialog" +#: ../update-manager-text:54 +msgid "Show description of the package instead of the changelog" msgstr "" -#: ../data/update-manager.schemas.in.h:14 +#: ../do-release-upgrade:53 ../check-new-release-gtk:186 msgid "" -"Stores the state of the expander that contains the list of changes and the " -"description" +"Try upgrading to the latest release using the upgrader from $distro-proposed" msgstr "" -#: ../data/update-manager.schemas.in.h:15 -msgid "Stores the width of the update-manager dialog" +#: ../do-release-upgrade:57 +msgid "" +"Run in a special upgrade mode.\n" +"Currently 'desktop' for regular upgrades of a desktop system and 'server' " +"for server systems are supported." msgstr "" -#: ../data/update-manager.schemas.in.h:16 -msgid "The window height" +#: ../do-release-upgrade:63 +msgid "Run the specified frontend" msgstr "" -#: ../data/update-manager.schemas.in.h:17 -msgid "The window width" +#: ../do-release-upgrade:68 +msgid "" +"Check only if a new distribution release is available and report the result " +"via the exit code" msgstr "" -#: ../data/update-manager.schemas.in.h:18 -msgid "" -"This key is deprecated in favor of the file /etc/update-manager/release-" -"upgrades Check automatically if a new version of the current distribution is " -"available and offer to upgrade (if possible)." +#: ../do-release-upgrade:82 +msgid "Checking for a new Ubuntu release" msgstr "" -#: ../data/update-manager.schemas.in.h:19 +#: ../do-release-upgrade:96 msgid "" -"This will permanently hide the new release prompt from check-new-release-" -"gtk. Note that the small button in the main update-manager UI will still be " -"there." +"For upgrade information, please visit:\n" +"%(url)s\n" msgstr "" -#: ../data/update-manager.schemas.in.h:20 -msgid "make check-new-release-gtk ignore a given new release" +#: ../do-release-upgrade:102 +msgid "No new release found" msgstr "" -#: ../update-manager:54 ../do-release-upgrade:41 -msgid "Show version and exit" +#: ../do-release-upgrade:114 +#, c-format +msgid "New release '%s' available." msgstr "" -#: ../update-manager:57 -msgid "Directory that contains the data files" +#: ../do-release-upgrade:115 +msgid "Run 'do-release-upgrade' to upgrade to it." msgstr "" -#: ../update-manager:60 -msgid "Check if a new Ubuntu release is available" +#: ../check-new-release-gtk:90 +msgid "Ubuntu %(version)s Upgrade Available" msgstr "" -#: ../update-manager:63 ../do-release-upgrade:44 ../check-new-release-gtk:179 -msgid "Check if upgrading to the latest devel release is possible" +#: ../check-new-release-gtk:132 +#, c-format +msgid "You have declined the upgrade to Ubuntu %s" msgstr "" -#: ../update-manager:67 -msgid "Upgrade using the latest proposed version of the release upgrader" +#: ../check-new-release-gtk:192 +msgid "Add debug output" msgstr "" -#: ../update-manager:74 -msgid "Do not focus on map when starting" +#: ../ubuntu-support-status:79 +msgid "Show unsupported packages on this machine" msgstr "" -#: ../update-manager:77 -msgid "Try to run a dist-upgrade" +#: ../ubuntu-support-status:82 +msgid "Show supported packages on this machine" msgstr "" -#: ../update-manager:80 -msgid "Do not check for updates when starting" +#: ../ubuntu-support-status:85 +msgid "Show all packages with their status" msgstr "" -#: ../update-manager:84 ../do-release-upgrade:60 -msgid "Test upgrade with a sandbox aufs overlay" +#: ../ubuntu-support-status:88 +msgid "Show all packages in a list" msgstr "" -#: ../update-manager:104 -msgid "Running partial upgrade" +#: ../ubuntu-support-status:130 +#, c-format +msgid "Support status summary of '%s':" msgstr "" -#: ../do-release-upgrade:48 ../check-new-release-gtk:183 -msgid "" -"Try upgrading to the latest release using the upgrader from $distro-proposed" +#: ../ubuntu-support-status:133 +msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s" msgstr "" -#: ../do-release-upgrade:52 +#: ../ubuntu-support-status:139 msgid "" -"Run in a special upgrade mode.\n" -"Currently 'desktop' for regular upgrades of a desktop system and 'server' " -"for server systems are supported." +"You have %(num)s packages (%(percent).1f%%) that can not/no-longer be " +"downloaded" msgstr "" -#: ../do-release-upgrade:58 -msgid "Run the specified frontend" +#: ../ubuntu-support-status:142 +msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported" msgstr "" -#: ../do-release-upgrade:63 +#: ../ubuntu-support-status:150 msgid "" -"Check only if a new distribution release is available and report the result " -"via the exit code" +"Run with --show-unsupported, --show-supported or --show-all to see more " +"details" msgstr "" -#: ../do-release-upgrade:77 -msgid "Checking for a new ubuntu release" +#: ../ubuntu-support-status:154 +msgid "No longer downloadable:" msgstr "" -#: ../do-release-upgrade:91 -msgid "" -"For upgrade information, please visit:\n" -"%(url)s\n" -msgstr "" - -#: ../do-release-upgrade:97 -msgid "No new release found" +#: ../ubuntu-support-status:157 +msgid "Unsupported: " msgstr "" -#: ../do-release-upgrade:109 +#: ../ubuntu-support-status:162 #, c-format -msgid "New release '%s' available." +msgid "Supported until %s:" msgstr "" -#: ../do-release-upgrade:110 -msgid "Run 'do-release-upgrade' to upgrade to it." -msgstr "" - -#: ../check-new-release-gtk:93 -msgid "Ubuntu %(version)s Upgrade Available" -msgstr "" - -#: ../check-new-release-gtk:134 -#, c-format -msgid "You have declined the upgrade to Ubuntu %s" +#: ../ubuntu-support-status:171 +msgid "Unsupported" msgstr "" #: ../Janitor/computerjanitor/exc.py:30 diff -Nru update-manager-0.156.6/tests/data-sources-list-test/mirrors.cfg update-manager-0.156.7/tests/data-sources-list-test/mirrors.cfg --- update-manager-0.156.6/tests/data-sources-list-test/mirrors.cfg 2011-09-30 14:05:01.000000000 +0000 +++ update-manager-0.156.7/tests/data-sources-list-test/mirrors.cfg 2012-03-05 08:00:46.000000000 +0000 @@ -8,6 +8,10 @@ http://archive.canonical.com http://archive.canonical.com/ubuntu/ +#commercial-ppas +https://private-ppa.launchpad.net/commercial-ppa-uploaders + + # random german mirror http://ftp.inf.tu-dresden.de/os/linux/dists/ubuntu/ diff -Nru update-manager-0.156.6/tests/data-sources-list-test/sources.list.apt-cacher update-manager-0.156.7/tests/data-sources-list-test/sources.list.apt-cacher --- update-manager-0.156.6/tests/data-sources-list-test/sources.list.apt-cacher 2011-09-30 14:05:01.000000000 +0000 +++ update-manager-0.156.7/tests/data-sources-list-test/sources.list.apt-cacher 2012-03-05 08:00:46.000000000 +0000 @@ -1,5 +1,5 @@ -deb http://localhost:9977/security.ubuntu.com/ubuntu feisty-security main restricted +deb http://localhost:9977/security.ubuntu.com/ubuntu feisty-security main restricted universe multiverse deb http://localhost:9977/archive.canonical.com/ubuntu feisty partner deb http://localhost:9977/us.archive.ubuntu.com/ubuntu/ feisty main deb http://localhost:9977/archive.ubuntu.com/ubuntu/ feisty main diff -Nru update-manager-0.156.6/tests/data-sources-list-test/sources.list.commercial-ppa-uploaders update-manager-0.156.7/tests/data-sources-list-test/sources.list.commercial-ppa-uploaders --- update-manager-0.156.6/tests/data-sources-list-test/sources.list.commercial-ppa-uploaders 1970-01-01 00:00:00.000000000 +0000 +++ update-manager-0.156.7/tests/data-sources-list-test/sources.list.commercial-ppa-uploaders 2012-03-05 08:00:46.000000000 +0000 @@ -0,0 +1,11 @@ +# main repo +deb http://archive.ubuntu.com/ubuntu/ feisty main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ feisty main restricted multiverse + +deb http://security.ubuntu.com/ubuntu/ feisty-security main restricted + +# random one +deb http://user:pass@private-ppa.launchpad.net/random-ppa feisty main + +# commercial PPA +deb https://user:pass@private-ppa.launchpad.net/commercial-ppa-uploaders feisty main diff -Nru update-manager-0.156.6/tests/test_sources_list.py update-manager-0.156.7/tests/test_sources_list.py --- update-manager-0.156.6/tests/test_sources_list.py 2011-10-19 14:13:35.000000000 +0000 +++ update-manager-0.156.7/tests/test_sources_list.py 2012-03-05 08:00:46.000000000 +0000 @@ -12,7 +12,7 @@ from DistUpgrade.DistUpgradeViewNonInteractive import DistUpgradeViewNonInteractive import logging -class testSourcesListUpdate(unittest.TestCase): +class TestSourcesListUpdate(unittest.TestCase): testdir = os.path.abspath("./data-sources-list-test/") @@ -109,7 +109,7 @@ deb http://ports.ubuntu.com/ubuntu-ports/ gutsy main restricted multiverse universe deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ gutsy-security main restricted +deb http://ports.ubuntu.com/ubuntu-ports/ gutsy-security main restricted universe multiverse """) apt_pkg.config.set("APT::Architecture",arch) @@ -134,7 +134,7 @@ deb http://ports.ubuntu.com/ubuntu-ports/ hardy main restricted multiverse universe deb-src http://archive.ubuntu.com/ubuntu/ hardy main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security main restricted +deb http://ports.ubuntu.com/ubuntu-ports/ hardy-security main restricted universe multiverse """) apt_pkg.config.set("APT::Architecture",arch) @@ -173,7 +173,7 @@ deb http://old-releases.ubuntu.com/ubuntu hoary main restricted multiverse universe deb-src http://old-releases.ubuntu.com/ubuntu hoary main restricted multiverse -deb http://old-releases.ubuntu.com/ubuntu hoary-security main restricted +deb http://old-releases.ubuntu.com/ubuntu hoary-security main restricted universe multiverse """) def testEOL2SupportedWithMirrorUpgrade(self): @@ -196,7 +196,7 @@ deb http://de.archive.ubuntu.com/ubuntu hardy main restricted multiverse universe deb-src http://de.archive.ubuntu.com/ubuntu hardy main restricted multiverse -deb http://de.archive.ubuntu.com/ubuntu hardy-security main restricted +deb http://de.archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse """) def testEOL2SupportedUpgrade(self): @@ -219,7 +219,7 @@ deb http://archive.ubuntu.com/ubuntu hardy main restricted multiverse universe deb-src http://archive.ubuntu.com/ubuntu hardy main restricted multiverse -deb http://archive.ubuntu.com/ubuntu hardy-security main restricted +deb http://archive.ubuntu.com/ubuntu hardy-security main restricted universe multiverse """) def test_partner_update(self): @@ -245,6 +245,33 @@ deb http://archive.canonical.com/ubuntu gutsy partner """) + def test_private_ppa_transition(self): + shutil.copy( + os.path.join(self.testdir,"sources.list.commercial-ppa-uploaders"), + os.path.join(self.testdir,"sources.list")) + apt_pkg.config.set( + "Dir::Etc::sourceparts",os.path.join(self.testdir,"sources.list.d")) + v = DistUpgradeViewNonInteractive() + d = DistUpgradeController(v,datadir=self.testdir) + d.openCache(lock=False) + res = d.updateSourcesList() + self.assert_(res == True) + + # now test the result + self._verifySources(""" +deb http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse universe +deb-src http://archive.ubuntu.com/ubuntu/ gutsy main restricted multiverse + +deb http://security.ubuntu.com/ubuntu/ gutsy-security main restricted universe multiverse + +# random one +# deb http://user:pass@private-ppa.launchpad.net/random-ppa gutsy main # disabled on upgrade to gutsy + +# commercial PPA +deb https://user:pass@private-ppa.launchpad.net/commercial-ppa-uploaders gutsy main +""") + + def test_apt_cacher_and_apt_bittorent(self): """ test transition of apt-cacher/apt-torrent uris @@ -260,7 +287,7 @@ # now test the result self._verifySources(""" -deb http://localhost:9977/security.ubuntu.com/ubuntu gutsy-security main restricted +deb http://localhost:9977/security.ubuntu.com/ubuntu gutsy-security main restricted universe multiverse deb http://localhost:9977/archive.canonical.com/ubuntu gutsy partner deb http://localhost:9977/us.archive.ubuntu.com/ubuntu/ gutsy main deb http://localhost:9977/archive.ubuntu.com/ubuntu/ gutsy main @@ -278,7 +305,7 @@ def _verifySources(self, expected): sources_list = open(apt_pkg.config.find_file("Dir::Etc::sourcelist")).read() for l in expected.split("\n"): - self.assert_(l in sources_list, + self.assert_(l in sources_list.split("\n"), "expected entry '%s' in sources.list missing. got:\n'''%s'''" % (l, sources_list)) diff -Nru update-manager-0.156.6/UpdateManager/UpdateManager.py update-manager-0.156.7/UpdateManager/UpdateManager.py --- update-manager-0.156.6/UpdateManager/UpdateManager.py 2012-01-13 10:01:23.000000000 +0000 +++ update-manager-0.156.7/UpdateManager/UpdateManager.py 2012-03-05 08:00:46.000000000 +0000 @@ -62,8 +62,7 @@ from gettext import ngettext -from Core.utils import (is_unity_running, - humanize_size, +from Core.utils import (humanize_size, init_proxy, on_battery, inhibit_sleep, @@ -104,7 +103,7 @@ _("Your Ubuntu release is not supported anymore."), _("You will not get any further security fixes or critical " "updates. " - "Please upgrade to a later version of Ubuntu Linux.")) + "Please upgrade to a later version of Ubuntu.")) dialog = Gtk.MessageDialog(parent, 0, Gtk.MessageType.WARNING, Gtk.ButtonsType.CLOSE,"") dialog.set_title("") @@ -694,22 +693,14 @@ firstrun = self.settings.get_boolean("first-run") if firstrun: text_header = "%s" % _("Welcome to Ubuntu") - if is_unity_running(): - text_label_main = _("These software updates have been issued since this version of Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from Applications later.") - else: - text_label_main = _("These software updates have been issued since this version of Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from the Administration Menu later.") + text_label_main = _("These software updates have been issued since this version of Ubuntu was released.") self.settings.set_boolean("first-run", False) else: - text_header = "%s" % _("Software updates are available for this computer") - if is_unity_running(): - text_label_main = _("If you don't want to install them now, choose \"Update Manager\" from Applications later.") - else: - text_label_main = _("If you don't want to install them now, choose \"Update Manager\" from the Administration menu later.") + text_header = "%s" % _("Software updates are available for this computer.") self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() - self.treeview_update.set_cursor( - Gtk.TreePath.new_from_string("1"), None, False) + self.treeview_update.set_cursor(Gtk.TreePath.new_from_string("1"), None, False) self.label_header.set_markup(text_header) self.label_main_details.set_text(text_label_main) return True diff -Nru update-manager-0.156.6/utils/demoted.cfg update-manager-0.156.7/utils/demoted.cfg --- update-manager-0.156.6/utils/demoted.cfg 2012-02-23 15:46:15.000000000 +0000 +++ update-manager-0.156.7/utils/demoted.cfg 2012-03-05 08:03:23.000000000 +0000 @@ -2,8 +2,13 @@ ajaxterm asp.net-examples at-spi-doc +automake1.9-doc +banshee +banshee-dbg +banshee-extension-soundmenu cantor cantor-dbg +checkbox-gtk couchdb-bin dcraw desktopcouch @@ -12,8 +17,17 @@ ecosconfig-imx evolution-couchdb evolution-couchdb-backend +exiv2 +g++-4.5-multilib gamin gbrainy +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gir1.2-couchdb-1.0 gir1.2-desktopcouch-1.0 gnome-desktop-data @@ -22,8 +36,11 @@ jython-doc kaffeine kaffeine-dbg -kchart +kdevelop +kdevelop-data kdevelop-dev +kdevplatform-dbg +kdevplatform-dev kdewallpapers koffice-l10n-ca koffice-l10n-cavalencia @@ -52,7 +69,6 @@ koffice-l10n-wa koffice-l10n-zhcn koffice-l10n-zhtw -kword-data libaccess-bridge-java libaccess-bridge-java-jni libamd2.2.0 @@ -69,6 +85,10 @@ libcouchdb-glib-doc libcsparse2.2.3 libcxsparse2.2.3 +libdbus-glib1.0-cil +libdbus-glib1.0-cil-dev +libdbus1.0-cil +libdbus1.0-cil-dev libdesktopcouch-glib-1.0-2 libdesktopcouch-glib-dev libdirectfb-1.2-9 @@ -80,14 +100,27 @@ libdirectfb-extra-dbg libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev +libgdata-cil-dev +libgio-cil +libgio2.0-cil-dev +libgkeyfile-cil-dev +libgkeyfile1.0-cil libgladeui-1-11 libgmm-dev +libgtk-sharp-beans-cil +libgtk-sharp-beans2.0-cil-dev libgtkhtml-editor-common libgtkhtml-editor-dev libgtkhtml-editor0 libgtkhtml3.14-19 libgtkhtml3.14-dbg libgtkhtml3.14-dev +libgudev1.0-cil +libgudev1.0-cil-dev libklu1.1.0 libldl2.0.1 libllvm-2.9-ocaml-dev @@ -95,6 +128,14 @@ liblpsolve55-dev libmodplug-dev libmodplug1 +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins-msbuild-cil-dev +libmono-addins-msbuild0.2-cil +libmono-addins0.2-cil +libmono-zeroconf-cil-dev +libmono-zeroconf1.0-cil libmozjs185-1.0 libmozjs185-dev libmusicbrainz4-dev @@ -102,6 +143,8 @@ libmysql-java libmysqlclient16 libmysqlclient16-dev +libnotify-cil-dev +libnotify0.4-cil libofa0 libofa0-dev libpg-java @@ -116,9 +159,12 @@ libsac-java libsac-java-doc libsac-java-gcj +libsublime-dev libsuitesparse-dbg libsuitesparse-dev libsuitesparse-doc +libtaglib-cil-dev +libtaglib2.0-cil libtextcat-data libtextcat-dev libtextcat0 @@ -151,9 +197,11 @@ llvm-2.9-runtime lp-solve lp-solve-doc +mono-jay mono-xsp2 mono-xsp2-base -nova-ajax-console-proxy +myspell-tools +oxygen-icon-theme-complete pngquant python-bittorrent python-central diff -Nru update-manager-0.156.6/utils/demoted.cfg.lucid update-manager-0.156.7/utils/demoted.cfg.lucid --- update-manager-0.156.6/utils/demoted.cfg.lucid 2012-02-23 15:47:36.000000000 +0000 +++ update-manager-0.156.7/utils/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000 @@ -6,6 +6,7 @@ arora aspell-tl at-spi-doc +automake1.9-doc bogofilter bogofilter-bdb bogofilter-common @@ -13,6 +14,7 @@ brltty-x11 byacc cantor +checkbox-gtk cheese cheese-common compiz-fusion-bcop @@ -38,17 +40,27 @@ eucalyptus-sc eucalyptus-walrus evolution-couchdb +exiv2 f-spot fancontrol flex-old flex-old-doc +foomatic-db-gutenprint g++-4.4-multilib gamin gbrainy gcc-4.4-multilib +gcc-4.4-source +gcj-4.4-base +gcj-4.4-jdk +gcj-4.4-jre +gcj-4.4-jre-headless +gcj-4.4-jre-lib +gcj-4.4-source gconf-defaults-service gconf-editor gdebi +gdebi-core gdebi-kde genromfs gfortran-4.4 @@ -78,6 +90,7 @@ ibus-pinyin-db-open-phrase icedtea6-plugin idle-python2.6 +ijsgutenprint indicator-applet indicator-applet-session janino @@ -180,6 +193,10 @@ libfreezethaw-perl libgamin-dev libgamin0 +libgcj10 +libgcj10-awt +libgcj10-dbg +libgcj10-dev libgconfmm-2.6-1c2 libgconfmm-2.6-dev libgconfmm-2.6-doc @@ -274,6 +291,10 @@ libmockobjects-java libmockobjects-java-doc libmodplug-dev +libmono-addins-cil-dev +libmono-addins-gui-cil-dev +libmono-addins-gui0.2-cil +libmono-addins0.2-cil libmusicbrainz4-dev libmusicbrainz4c2a libmvel-java @@ -380,11 +401,16 @@ migrationtools mono-2.0-gac mono-dbg +mono-jay myspell-de-de-oldspell myspell-fr myspell-ns +myspell-tools openoffice.org-style-galaxy +oxygen-icon-theme-complete +packagekit packagekit-backend-apt +php5-sybase pinyin-database plasma-widget-quickaccess plymouth-x11