Merge lp:~ember/update-manager/ubuntu.bug1002956 into lp:update-manager
Proposed by
Pedro Fragoso
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Michael Vogt | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~ember/update-manager/ubuntu.bug1002956 | ||||
Merge into: | lp:update-manager | ||||
Diff against target: |
336905 lines (+333319/-0) (has conflicts) 641 files modified
.bzr-builddeb/default.conf (+2/-0) AUTHORS (+19/-0) AutoUpgradeTester/README (+8/-0) AutoUpgradeTester/UpgradeTestBackend.py (+167/-0) AutoUpgradeTester/UpgradeTestBackendChroot.py (+338/-0) AutoUpgradeTester/UpgradeTestBackendEC2.py (+329/-0) AutoUpgradeTester/UpgradeTestBackendQemu.py (+585/-0) AutoUpgradeTester/UpgradeTestBackendSSH.py (+218/-0) AutoUpgradeTester/UpgradeTestBackendSimulate.py (+32/-0) AutoUpgradeTester/apt-watchdog (+50/-0) AutoUpgradeTester/auto-install-tester.py (+207/-0) AutoUpgradeTester/auto-upgrade-tester (+383/-0) AutoUpgradeTester/auto-upgrade-tester-jenkins-slave (+60/-0) AutoUpgradeTester/chart_dpkg_progress.py (+51/-0) AutoUpgradeTester/install_all.py (+235/-0) AutoUpgradeTester/install_all_main.py (+79/-0) AutoUpgradeTester/install_blacklist.cfg (+33/-0) AutoUpgradeTester/install_universe (+263/-0) AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave (+12/-0) AutoUpgradeTester/jenkins/auto-upgrade-tester-jenkins-slave.conf (+28/-0) AutoUpgradeTester/jeos/README (+49/-0) AutoUpgradeTester/jeos/create-base-image.sh (+36/-0) AutoUpgradeTester/post_upgrade_tests/README (+8/-0) AutoUpgradeTester/post_upgrade_tests/conffiles_test.sh (+12/-0) AutoUpgradeTester/post_upgrade_tests/debconf_test.py (+65/-0) AutoUpgradeTester/post_upgrade_tests/debsums_lite.py (+19/-0) AutoUpgradeTester/post_upgrade_tests/kernel_test.py (+24/-0) AutoUpgradeTester/post_upgrade_tests/python_import_test.py (+104/-0) AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_system.py (+66/-0) AutoUpgradeTester/post_upgrade_tests/test_lts_upgrade_user.py (+98/-0) AutoUpgradeTester/post_upgrade_tests/xserver_test.py (+29/-0) AutoUpgradeTester/prepare_lts_desktop (+22/-0) AutoUpgradeTester/prepare_lts_user (+116/-0) AutoUpgradeTester/profile/auto-install-tester/DistUpgrade.cfg (+60/-0) AutoUpgradeTester/profile/auto-install-tester/pkgs.cfg (+1/-0) AutoUpgradeTester/profile/auto-install-tester/pkgs_blacklist.txt (+3/-0) AutoUpgradeTester/profile/dapper-hardy-lucid-server/DistUpgrade.cfg (+67/-0) AutoUpgradeTester/profile/dapper-hardy-lucid-ubuntu/DistUpgrade.cfg (+67/-0) AutoUpgradeTester/profile/defaults.cfg.d/defaults.cfg (+63/-0) AutoUpgradeTester/profile/edubuntu/DistUpgrade.cfg (+8/-0) AutoUpgradeTester/profile/euca-cloud/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/profile/euca-cloud/pkgs.cfg (+5/-0) AutoUpgradeTester/profile/euca-nc/DistUpgrade.cfg (+3/-0) AutoUpgradeTester/profile/euca-nc/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/kubuntu/DistUpgrade.cfg (+3/-0) AutoUpgradeTester/profile/lts-kubuntu/DistUpgrade.cfg (+6/-0) AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg (+12/-0) AutoUpgradeTester/profile/lts-main-all-amd64/DistUpgrade.cfg.dapper (+65/-0) AutoUpgradeTester/profile/lts-main-all-amd64/install_blacklist.cfg (+46/-0) AutoUpgradeTester/profile/lts-main-all-amd64/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-main-all-amd64/prerequists-sources.list (+5/-0) AutoUpgradeTester/profile/lts-main-all-amd64/removal_blacklist.cfg (+11/-0) AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg (+8/-0) AutoUpgradeTester/profile/lts-main-all/DistUpgrade.cfg.dapper (+65/-0) AutoUpgradeTester/profile/lts-main-all/install_blacklist.cfg (+46/-0) AutoUpgradeTester/profile/lts-main-all/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-main-all/prerequists-sources.list (+5/-0) AutoUpgradeTester/profile/lts-main-all/removal_blacklist.cfg (+11/-0) AutoUpgradeTester/profile/lts-mythbuntu/DistUpgrade.cfg (+8/-0) AutoUpgradeTester/profile/lts-server-amd64/DistUpgrade.cfg (+9/-0) AutoUpgradeTester/profile/lts-server-amd64/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-server-tasks/DistUpgrade.cfg (+6/-0) AutoUpgradeTester/profile/lts-server-tasks/pkgs.cfg (+10/-0) AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg (+7/-0) AutoUpgradeTester/profile/lts-server/DistUpgrade.cfg.dapper (+53/-0) AutoUpgradeTester/profile/lts-server/local_testing.list (+1/-0) AutoUpgradeTester/profile/lts-server/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-ubuntu-amd64/DistUpgrade.cfg (+13/-0) AutoUpgradeTester/profile/lts-ubuntu-amd64/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg (+10/-0) AutoUpgradeTester/profile/lts-ubuntu/DistUpgrade.cfg.dapper (+67/-0) AutoUpgradeTester/profile/lts-ubuntu/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-universe-amd64/DistUpgrade.cfg (+12/-0) AutoUpgradeTester/profile/lts-universe-amd64/install_blacklist.cfg (+40/-0) AutoUpgradeTester/profile/lts-universe-amd64/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lts-universe-i386/DistUpgrade.cfg (+11/-0) AutoUpgradeTester/profile/lts-universe-i386/install_blacklist.cfg (+40/-0) AutoUpgradeTester/profile/lts-universe-i386/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/profile/main-all-amd64/DistUpgrade.cfg (+8/-0) AutoUpgradeTester/profile/main-all-amd64/install_blacklist.cfg (+29/-0) AutoUpgradeTester/profile/main-all-amd64/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/main-all/DistUpgrade.cfg (+5/-0) AutoUpgradeTester/profile/main-all/install_blacklist.cfg (+28/-0) AutoUpgradeTester/profile/main-all/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/mythbuntu/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/profile/override.cfg.d/global.cfg (+9/-0) AutoUpgradeTester/profile/python-all/DistUpgrade.cfg (+6/-0) AutoUpgradeTester/profile/python-all/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/server-amd64/DistUpgrade.cfg (+7/-0) AutoUpgradeTester/profile/server-amd64/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/server-tasks-amd64/DistUpgrade.cfg (+6/-0) AutoUpgradeTester/profile/server-tasks-amd64/pkgs.cfg (+9/-0) AutoUpgradeTester/profile/server-tasks/DistUpgrade.cfg (+3/-0) AutoUpgradeTester/profile/server-tasks/pkgs.cfg (+10/-0) AutoUpgradeTester/profile/server/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/profile/server/pkgs.cfg (+2/-0) AutoUpgradeTester/profile/ubuntu-amd64/DistUpgrade.cfg (+7/-0) AutoUpgradeTester/profile/ubuntu-amd64/pkgs.cfg (+1/-0) AutoUpgradeTester/profile/ubuntu/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/profile/ubuntu/pkgs.cfg (+1/-0) AutoUpgradeTester/profile/universe-amd64/DistUpgrade.cfg (+9/-0) AutoUpgradeTester/profile/universe-amd64/install_blacklist.cfg (+34/-0) AutoUpgradeTester/profile/universe-amd64/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/universe-i386/DistUpgrade.cfg (+8/-0) AutoUpgradeTester/profile/universe-i386/install_blacklist.cfg (+34/-0) AutoUpgradeTester/profile/universe-i386/pkgs.cfg (+3/-0) AutoUpgradeTester/profile/xubuntu/DistUpgrade.cfg (+4/-0) AutoUpgradeTester/randomInst.py (+21/-0) AutoUpgradeTester/run_and_publish_tests.sh (+92/-0) AutoUpgradeTester/toChroot/etc/hosts (+2/-0) AutoUpgradeTester/toChroot/etc/kernel-img.conf (+6/-0) BUGS (+5/-0) COPYING (+340/-0) ChangeLog (+62/-0) DistUpgrade/Changelog (+188/-0) DistUpgrade/DevelReleaseAnnouncement (+58/-0) DistUpgrade/DevelReleaseAnnouncement.html (+88/-0) DistUpgrade/DistUpgrade.cfg (+117/-0) DistUpgrade/DistUpgrade.cfg.dapper (+56/-0) DistUpgrade/DistUpgrade.cfg.hardy (+106/-0) DistUpgrade/DistUpgrade.cfg.lucid (+114/-0) DistUpgrade/DistUpgrade.ui (+1605/-0) DistUpgrade/DistUpgradeApport.py (+84/-0) DistUpgrade/DistUpgradeAptCdrom.py (+298/-0) DistUpgrade/DistUpgradeAufs.py (+252/-0) DistUpgrade/DistUpgradeCache.py (+1218/-0) DistUpgrade/DistUpgradeConfigParser.py (+70/-0) DistUpgrade/DistUpgradeController.py (+1779/-0) DistUpgrade/DistUpgradeFetcherCore.py (+292/-0) DistUpgrade/DistUpgradeFetcherSelf.py (+30/-0) DistUpgrade/DistUpgradeGettext.py (+59/-0) DistUpgrade/DistUpgradeMain.py (+223/-0) DistUpgrade/DistUpgradePatcher.py (+106/-0) DistUpgrade/DistUpgradeQuirks.py (+1262/-0) DistUpgrade/DistUpgradeVersion.py (+1/-0) DistUpgrade/DistUpgradeView.py (+432/-0) DistUpgrade/DistUpgradeViewGtk.py (+748/-0) DistUpgrade/DistUpgradeViewGtk3.py (+741/-0) DistUpgrade/DistUpgradeViewKDE.py (+863/-0) DistUpgrade/DistUpgradeViewNonInteractive.py (+320/-0) DistUpgrade/DistUpgradeViewText.py (+276/-0) DistUpgrade/EOLReleaseAnnouncement (+62/-0) DistUpgrade/EOLReleaseAnnouncement.html (+95/-0) DistUpgrade/README (+90/-0) DistUpgrade/ReleaseAnnouncement (+56/-0) DistUpgrade/ReleaseAnnouncement.html (+90/-0) DistUpgrade/TODO (+65/-0) DistUpgrade/additional_pkgs.cfg (+2/-0) DistUpgrade/apt-autoinst-fixup.py (+71/-0) DistUpgrade/apt_btrfs_snapshot.py (+188/-0) DistUpgrade/base-installer/VERSION (+500/-0) DistUpgrade/base-installer/kernel/Makefile (+7/-0) DistUpgrade/base-installer/kernel/README (+76/-0) DistUpgrade/base-installer/kernel/alpha.sh (+19/-0) DistUpgrade/base-installer/kernel/amd64.sh (+38/-0) DistUpgrade/base-installer/kernel/armeb.sh (+20/-0) DistUpgrade/base-installer/kernel/armel.sh (+26/-0) DistUpgrade/base-installer/kernel/hppa.sh (+25/-0) DistUpgrade/base-installer/kernel/hurd-i386.sh (+14/-0) DistUpgrade/base-installer/kernel/i386.sh (+141/-0) DistUpgrade/base-installer/kernel/ia64.sh (+17/-0) DistUpgrade/base-installer/kernel/kfreebsd-amd64.sh (+18/-0) DistUpgrade/base-installer/kernel/kfreebsd-i386.sh (+72/-0) DistUpgrade/base-installer/kernel/m68k.sh (+29/-0) DistUpgrade/base-installer/kernel/mips.sh (+49/-0) DistUpgrade/base-installer/kernel/mipsel.sh (+44/-0) DistUpgrade/base-installer/kernel/powerpc.sh (+51/-0) DistUpgrade/base-installer/kernel/s390.sh (+19/-0) DistUpgrade/base-installer/kernel/sh4.sh (+29/-0) DistUpgrade/base-installer/kernel/sparc.sh (+27/-0) DistUpgrade/base-installer/kernel/tests/README (+52/-0) DistUpgrade/base-installer/kernel/tests/alpha/escher-smp.test (+13/-0) DistUpgrade/base-installer/kernel/tests/alpha/escher.cpuinfo (+19/-0) DistUpgrade/base-installer/kernel/tests/alpha/escher.test (+10/-0) DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.cpuinfo (+20/-0) DistUpgrade/base-installer/kernel/tests/amd64/cittagazze.test (+23/-0) DistUpgrade/base-installer/kernel/tests/armeb/slug.cpuinfo (+24/-0) DistUpgrade/base-installer/kernel/tests/armeb/slug.test (+7/-0) DistUpgrade/base-installer/kernel/tests/armel/adsvgx.cpuinfo (+24/-0) DistUpgrade/base-installer/kernel/tests/armel/adsvgx.test (+30/-0) DistUpgrade/base-installer/kernel/tests/armel/armadaxp.cpuinfo (+23/-0) DistUpgrade/base-installer/kernel/tests/armel/armadaxp.test (+29/-0) DistUpgrade/base-installer/kernel/tests/armel/dove.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/armel/dove.test (+29/-0) DistUpgrade/base-installer/kernel/tests/armel/efikamx.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/armel/efikamx.test (+18/-0) DistUpgrade/base-installer/kernel/tests/armel/imx51.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/armel/imx51.test (+27/-0) DistUpgrade/base-installer/kernel/tests/armel/n2100.cpuinfo (+24/-0) DistUpgrade/base-installer/kernel/tests/armel/n2100.test (+29/-0) DistUpgrade/base-installer/kernel/tests/armel/omap4.cpuinfo (+17/-0) DistUpgrade/base-installer/kernel/tests/armel/omap4.test (+27/-0) DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/armel/qemu-versatilepb.test (+34/-0) DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/armel/sheevaplug.test (+26/-0) DistUpgrade/base-installer/kernel/tests/armel/slug.cpuinfo (+24/-0) DistUpgrade/base-installer/kernel/tests/armel/slug.test (+29/-0) DistUpgrade/base-installer/kernel/tests/armel/ts-109.cpuinfo (+24/-0) DistUpgrade/base-installer/kernel/tests/armel/ts-109.test (+25/-0) DistUpgrade/base-installer/kernel/tests/dotest (+109/-0) DistUpgrade/base-installer/kernel/tests/hppa/b180.cpuinfo (+18/-0) DistUpgrade/base-installer/kernel/tests/hppa/b180.test (+12/-0) DistUpgrade/base-installer/kernel/tests/hppa/paer.cpuinfo (+30/-0) DistUpgrade/base-installer/kernel/tests/hppa/paer.test (+11/-0) DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.cpuinfo (+19/-0) DistUpgrade/base-installer/kernel/tests/i386/amd-k7-old.test (+25/-0) DistUpgrade/base-installer/kernel/tests/i386/cittagazze.cpuinfo (+19/-0) DistUpgrade/base-installer/kernel/tests/i386/cittagazze.test (+26/-0) DistUpgrade/base-installer/kernel/tests/i386/oqo1.cpuinfo (+19/-0) DistUpgrade/base-installer/kernel/tests/i386/oqo1.test (+20/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-3.cpuinfo (+19/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-3.test (+23/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test (+24/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-4M-bigmem.test (+24/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.cpuinfo (+18/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-4M.test (+24/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.cpuinfo (+51/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium-d-2p.test (+23/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium.cpuinfo (+17/-0) DistUpgrade/base-installer/kernel/tests/i386/pentium.test (+14/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.cpuinfo (+23/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c3-nehemiah.test (+20/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.cpuinfo (+18/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c7-Esther.test (+24/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.cpuinfo (+18/-0) DistUpgrade/base-installer/kernel/tests/i386/via-c7-Samuel.test (+14/-0) DistUpgrade/base-installer/kernel/tests/ia64/caballero.cpuinfo (+28/-0) DistUpgrade/base-installer/kernel/tests/ia64/caballero.test (+10/-0) DistUpgrade/base-installer/kernel/tests/ia64/merulo.cpuinfo (+28/-0) DistUpgrade/base-installer/kernel/tests/ia64/merulo.test (+10/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.cpuinfo (+9/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/core2.test (+8/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.cpuinfo (+9/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-amd64/k8.test (+8/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.cpuinfo (+9/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/core2.test (+13/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.cpuinfo (+9/-0) DistUpgrade/base-installer/kernel/tests/kfreebsd-i386/k8.test (+13/-0) DistUpgrade/base-installer/kernel/tests/m68k/crest.cpuinfo (+6/-0) DistUpgrade/base-installer/kernel/tests/m68k/crest.test (+16/-0) DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mips/4kc-malta.test (+14/-0) DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mips/5kc-malta.test (+16/-0) DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/mips/ip32-r5k.test (+14/-0) DistUpgrade/base-installer/kernel/tests/mips/qemu.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mips/qemu.test (+14/-0) DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/mips/r4k-ip22.test (+14/-0) DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/mips/r5k-ip22.test (+20/-0) DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.cpuinfo (+25/-0) DistUpgrade/base-installer/kernel/tests/mips/sb1-bcm91250a.test (+19/-0) DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.cpuinfo (+45/-0) DistUpgrade/base-installer/kernel/tests/mips/sb1a-bcm91480b.test (+19/-0) DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mipsel/4kc-malta.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mipsel/5kc-malta.test (+19/-0) DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.cpuinfo (+14/-0) DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2e.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.cpuinfo (+14/-0) DistUpgrade/base-installer/kernel/tests/mipsel/fuloong-2f.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/qemu.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mipsel/qemu.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r3k-kn02.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.cpuinfo (+10/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r4k-kn04.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.cpuinfo (+11/-0) DistUpgrade/base-installer/kernel/tests/mipsel/r5k-cobalt.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.cpuinfo (+23/-0) DistUpgrade/base-installer/kernel/tests/mipsel/sb1-bcm91250a.test (+17/-0) DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.cpuinfo (+45/-0) DistUpgrade/base-installer/kernel/tests/mipsel/sb1a-bcm91480b.test (+17/-0) DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/powerpc/chrp_ibm.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/g5.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/powerpc/g5.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powermac7,3.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.cpuinfo (+12/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powermac_newworld.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.cpuinfo (+7/-0) DistUpgrade/base-installer/kernel/tests/powerpc/powerstackII.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo (+13/-0) DistUpgrade/base-installer/kernel/tests/powerpc/ps3.cpuinfo.moved (+12/-0) DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/ps3.test.moved (+20/-0) DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.cpuinfo (+23/-0) DistUpgrade/base-installer/kernel/tests/powerpc/rs64-iv.test (+20/-0) DistUpgrade/base-installer/kernel/tests/runtests (+128/-0) DistUpgrade/base-installer/kernel/tests/s390/raptor.cpuinfo (+9/-0) DistUpgrade/base-installer/kernel/tests/s390/raptor.test (+16/-0) DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.cpuinfo (+10/-0) DistUpgrade/base-installer/kernel/tests/sh4/rts7751r2d.test (+11/-0) DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.cpuinfo (+10/-0) DistUpgrade/base-installer/kernel/tests/sh4/sh7785lcr.test (+11/-0) DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.cpuinfo (+58/-0) DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-smp.test (+16/-0) DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.cpuinfo (+28/-0) DistUpgrade/base-installer/kernel/tests/sparc/niagara-t1-up.test (+16/-0) DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.cpuinfo (+10/-0) DistUpgrade/base-installer/kernel/tests/sparc/ultra-IIi.test (+14/-0) DistUpgrade/build-dist.sh (+53/-0) DistUpgrade/build-exclude.txt (+9/-0) DistUpgrade/build-tarball.sh (+35/-0) DistUpgrade/cdromupgrade (+40/-0) DistUpgrade/crashdialog.ui (+142/-0) DistUpgrade/dialog_changes.ui (+213/-0) DistUpgrade/dialog_conffile.ui (+142/-0) DistUpgrade/dialog_error.ui (+119/-0) DistUpgrade/dist-upgrade.py (+7/-0) DistUpgrade/etc-default-apport (+7/-0) DistUpgrade/get_kernel_list.sh (+29/-0) DistUpgrade/imported/invoke-rc.d (+455/-0) DistUpgrade/imported/invoke-rc.d.diff (+24/-0) DistUpgrade/mirrors.cfg (+830/-0) DistUpgrade/patches/README (+17/-0) DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 (+80/-0) DistUpgrade/prerequists-sources.dapper-ports.list (+4/-0) DistUpgrade/prerequists-sources.dapper.list (+4/-0) DistUpgrade/prerequists-sources.list (+6/-0) DistUpgrade/removal_blacklist.cfg (+19/-0) DistUpgrade/screenrc (+3/-0) DistUpgrade/window_main.ui (+267/-0) DistUpgrade/xorg_fix_proprietary.py (+165/-0) DistUpgrade/zz-update-grub (+19/-0) Janitor/Makefile (+43/-0) Janitor/README (+37/-0) Janitor/computerjanitor/__init__.py (+60/-0) Janitor/computerjanitor/cruft.py (+138/-0) Janitor/computerjanitor/cruft_tests.py (+56/-0) Janitor/computerjanitor/exc.py (+30/-0) Janitor/computerjanitor/exc_tests.py (+34/-0) Janitor/computerjanitor/file_cruft.py (+58/-0) Janitor/computerjanitor/file_cruft_tests.py (+63/-0) Janitor/computerjanitor/missing_package_cruft.py (+45/-0) Janitor/computerjanitor/missing_package_cruft_tests.py (+61/-0) Janitor/computerjanitor/package_cruft.py (+57/-0) Janitor/computerjanitor/package_cruft_tests.py (+61/-0) Janitor/computerjanitor/plugin.py (+184/-0) Janitor/computerjanitor/plugin_tests.py (+112/-0) Janitor/find-conffiles-dirs (+37/-0) Janitor/plugins/deb_plugin.py (+41/-0) Janitor/plugins/deb_plugin_tests.py (+52/-0) Janitor/plugins/dpkg_status_plugin.py (+66/-0) Janitor/plugins/dpkg_status_plugin_tests.py (+39/-0) Janitor/plugins/kdelibs4to5_plugin.py (+41/-0) Janitor/plugins/langpack_manual_plugin.py (+65/-0) Janitor/plugins/remove_lilo_plugin.py (+43/-0) Janitor/testplugins/hello_plugin.py (+33/-0) LGPL (+510/-0) README (+18/-0) README.dist-upgrade (+34/-0) TODO (+22/-0) UpdateManager/ChangelogViewer.py (+283/-0) UpdateManager/Core/AlertWatcher.py (+94/-0) UpdateManager/Core/DistUpgradeFetcherCore.py (+292/-0) UpdateManager/Core/MetaRelease.py (+331/-0) UpdateManager/Core/MyCache.py (+357/-0) UpdateManager/Core/UpdateList.py (+100/-0) UpdateManager/Core/roam.py (+203/-0) UpdateManager/Core/utils.py (+461/-0) UpdateManager/DistUpgradeFetcher.py (+140/-0) UpdateManager/DistUpgradeFetcherKDE.py (+181/-0) UpdateManager/GtkProgress.py (+202/-0) UpdateManager/HelpViewer.py (+33/-0) UpdateManager/MetaReleaseGObject.py (+53/-0) UpdateManager/ReleaseNotesViewer.py (+186/-0) UpdateManager/ReleaseNotesViewerWebkit.py (+52/-0) UpdateManager/SimpleGtk3builderApp.py (+61/-0) UpdateManager/SimpleGtkbuilderApp.py (+61/-0) UpdateManager/UnitySupport.py (+103/-0) UpdateManager/UpdateManager.py (+1228/-0) UpdateManager/__init__.py (+1/-0) UpdateManager/backend/InstallBackendAptdaemon.py (+89/-0) UpdateManager/backend/InstallBackendSynaptic.py (+69/-0) UpdateManager/backend/__init__.py (+61/-0) UpdateManager/check-meta-release.py (+30/-0) UpdateManager/dialog_release_notes.ui (+70/-0) UpdateManager/fdsend/COPYING (+339/-0) UpdateManager/fdsend/ChangeLog (+5/-0) UpdateManager/fdsend/MANIFEST.in (+3/-0) UpdateManager/fdsend/PKG-INFO (+10/-0) UpdateManager/fdsend/README (+51/-0) UpdateManager/fdsend/fdsend.c (+363/-0) UpdateManager/fdsend/setup.cfg (+11/-0) UpdateManager/fdsend/setup.py (+17/-0) UpdateManager/fetch-progress.ui (+106/-0) UpdateManagerText/UpdateManagerText.py (+186/-0) check-new-release-gtk (+202/-0) data/Makefile (+9/-0) data/com.ubuntu.update-manager.gschema.xml.in (+59/-0) data/do-release-upgrade.8 (+35/-0) data/gtkbuilder/UpdateManager.ui (+1471/-0) data/gtkbuilder/UpgradePromptDialog.ui (+343/-0) data/icons/scalable/apps/system-software-update.svg (+1519/-0) data/meta-release (+7/-0) data/release-upgrades (+17/-0) data/update-manager.8 (+78/-0) data/update-manager.convert (+10/-0) data/update-manager.desktop.in (+10/-0) debian/91-release-upgrade (+5/-0) debian/auto-upgrade-tester.dirs (+4/-0) debian/auto-upgrade-tester.install (+8/-0) debian/changelog (+6115/-0) debian/compat (+1/-0) debian/control (+85/-0) debian/copyright (+22/-0) debian/docs (+3/-0) debian/release-upgrade-motd (+40/-0) debian/rules (+28/-0) debian/source_update-manager.py (+48/-0) debian/update-manager-core.dirs (+7/-0) debian/update-manager-core.install (+14/-0) debian/update-manager-core.links (+1/-0) debian/update-manager-core.manpages (+1/-0) debian/update-manager-core.preinst (+41/-0) debian/update-manager-kde.install (+4/-0) debian/update-manager-text.install (+2/-0) debian/update-manager.install (+21/-0) debian/update-manager.manpages (+1/-0) do-release-upgrade (+126/-0) help/C/Makefile.am (+7/-0) help/C/fdl-appendix.xml (+655/-0) help/C/legal.xml (+76/-0) help/C/update-manager-C.omf (+18/-0) help/C/update-manager.xml (+1023/-0) kubuntu-devel-release-upgrade (+2/-0) missing (+336/-0) mkinstalldirs (+111/-0) po/ChangeLog (+196/-0) po/Makefile (+25/-0) po/POTFILES.in (+61/-0) po/POTFILES.skip (+6/-0) po/af.po (+2342/-0) po/am.po (+2288/-0) po/an.po (+2291/-0) po/ar.po (+2644/-0) po/ast.po (+2713/-0) po/az.po (+2259/-0) po/be.po (+2690/-0) po/bg.po (+2672/-0) po/bn.po (+2777/-0) po/bo.po (+2532/-0) po/br.po (+2498/-0) po/bs.po (+2718/-0) po/ca.po (+2741/-0) po/ca@valencia.po (+2696/-0) po/ceb.po (+2223/-0) po/ckb.po (+2223/-0) po/crh.po (+2725/-0) po/cs.po (+2733/-0) po/csb.po (+2404/-0) po/cv.po (+2223/-0) po/cy.po (+2566/-0) po/da.po (+2716/-0) po/de.po (+2816/-0) po/dv.po (+2225/-0) po/el.po (+2694/-0) po/en_AU.po (+2688/-0) po/en_CA.po (+2500/-0) po/en_GB.po (+2690/-0) po/eo.po (+2699/-0) po/es.po (+2745/-0) po/et.po (+2635/-0) po/eu.po (+2576/-0) po/fa.po (+2255/-0) po/fi.po (+2698/-0) po/fil.po (+2386/-0) po/fo.po (+2245/-0) po/fr.po (+2774/-0) po/fur.po (+2267/-0) po/fy.po (+2237/-0) po/ga.po (+2223/-0) po/gd.po (+2781/-0) po/gl.po (+2715/-0) po/gu.po (+2232/-0) po/gv.po (+2225/-0) po/he.po (+2632/-0) po/hi.po (+2572/-0) po/hr.po (+2738/-0) po/hu.po (+2712/-0) po/hy.po (+2223/-0) po/id.po (+2655/-0) po/is.po (+2448/-0) po/it.po (+2745/-0) po/ja.po (+2549/-0) po/jv.po (+2223/-0) po/ka.po (+2323/-0) po/kk.po (+2641/-0) po/km.po (+2686/-0) po/kn.po (+2223/-0) po/ko.po (+2441/-0) po/ku.po (+2303/-0) po/ky.po (+2223/-0) po/lb.po (+2238/-0) po/lo.po (+2223/-0) po/lt.po (+2735/-0) po/lv.po (+2729/-0) po/mk.po (+2307/-0) po/ml.po (+2287/-0) po/mn.po (+2232/-0) po/mr.po (+2319/-0) po/ms.po (+2713/-0) po/mus.po (+2223/-0) po/my.po (+2234/-0) po/nb.po (+2650/-0) po/nds.po (+2261/-0) po/ne.po (+2232/-0) po/nl.po (+2743/-0) po/nn.po (+2653/-0) po/oc.po (+2758/-0) po/pa.po (+2280/-0) po/pl.po (+2726/-0) po/ps.po (+2223/-0) po/pt.po (+2699/-0) po/pt_BR.po (+2727/-0) po/qu.po (+2223/-0) po/ro.po (+2771/-0) po/ru.po (+2736/-0) po/rw.po (+2231/-0) po/sc.po (+2225/-0) po/sco.po (+2250/-0) po/sd.po (+2223/-0) po/shn.po (+2223/-0) po/si.po (+2226/-0) po/sk.po (+2740/-0) po/sl.po (+2765/-0) po/sq.po (+2735/-0) po/sr.po (+2727/-0) po/sv.po (+2714/-0) po/ta.po (+2239/-0) po/ta_LK.po (+2228/-0) po/te.po (+2353/-0) po/th.po (+2503/-0) po/tl.po (+2360/-0) po/tr.po (+2685/-0) po/ug.po (+2681/-0) po/uk.po (+2742/-0) po/update-manager.pot (+2213/-0) po/ur.po (+2223/-0) po/uz.po (+2232/-0) po/vi.po (+2662/-0) po/xh.po (+2224/-0) po/zh_CN.po (+2484/-0) po/zh_HK.po (+2465/-0) po/zh_TW.po (+2477/-0) po/zu.po (+2223/-0) pre-build.sh (+46/-0) setup.cfg (+10/-0) setup.py (+80/-0) tests/Makefile (+18/-0) tests/aptroot-update-origin/etc/apt/sources.list (+5/-0) tests/data-sources-list-test/DistUpgrade.cfg (+33/-0) tests/data-sources-list-test/mirrors.cfg (+17/-0) tests/data-sources-list-test/prerequists-sources.list.in (+6/-0) tests/data-sources-list-test/prerequists-sources.list.in.broken (+7/-0) tests/data-sources-list-test/prerequists-sources.list.in.no_archive_falllback (+4/-0) tests/data-sources-list-test/sources.list (+7/-0) tests/data-sources-list-test/sources.list.EOL (+6/-0) tests/data-sources-list-test/sources.list.EOL2Supported (+6/-0) tests/data-sources-list-test/sources.list.apt-cacher (+15/-0) tests/data-sources-list-test/sources.list.commercial-ppa-uploaders (+11/-0) tests/data-sources-list-test/sources.list.commercial-transition (+8/-0) tests/data-sources-list-test/sources.list.d/prerequists-sources.list (+6/-0) tests/data-sources-list-test/sources.list.d/prerequists-sources.list.distUpgrade (+6/-0) tests/data-sources-list-test/sources.list.distUpgrade (+7/-0) tests/data-sources-list-test/sources.list.hardy (+10/-0) tests/data-sources-list-test/sources.list.in (+9/-0) tests/data-sources-list-test/sources.list.minimal (+4/-0) tests/data-sources-list-test/sources.list.no_archive_u_c (+8/-0) tests/data-sources-list-test/sources.list.no_valid_mirror (+6/-0) tests/data-sources-list-test/sources.list.nothing (+1/-0) tests/data-sources-list-test/sources.list.partner (+7/-0) tests/data-sources-list-test/sources.list.powerpc (+7/-0) tests/data-sources-list-test/sources.list.sparc (+7/-0) tests/interactive_fetch_release_upgrader.py (+85/-0) tests/patchdir/dotdot_expected (+2/-0) tests/patchdir/dotdot_orig (+1/-0) tests/patchdir/fail_orig (+1/-0) tests/patchdir/foo_orig (+2/-0) tests/patchdir/fstab_orig (+17/-0) tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 (+4/-0) tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff (+1/-0) tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c (+1/-0) tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 (+13/-0) tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 (+80/-0) tests/patchdir/pycompile_orig (+281/-0) tests/test-data-cdrom/.disk/base_components (+2/-0) tests/test-data-cdrom/.disk/cd_type (+1/-0) tests/test-data-cdrom/.disk/info (+1/-0) tests/test-data-cdrom/.disk/udeb_include (+4/-0) tests/test-data-cdrom/README.diskdefines (+9/-0) tests/test-data-cdrom/cdromupgrade (+32/-0) tests/test-data-cdrom/dists/intrepid/Release (+27/-0) tests/test-data-cdrom/dists/intrepid/Release.gpg (+7/-0) tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release (+6/-0) tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz (+1/-0) tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release (+6/-0) tests/test-data/cpuinfo-i486 (+16/-0) tests/test-data/cpuinfo-i586 (+19/-0) tests/test-data/cpuinfo-via-c7m (+19/-0) tests/test-data/cpuinfo-with-sse (+54/-0) tests/test-data/cpuinfo-without-cmov (+50/-0) tests/test-data/cpuinfo-without-sse (+54/-0) tests/test-data/meta-release (+135/-0) tests/test-data/xorg.conf.fglrx (+84/-0) tests/test-data/xorg.conf.multiseat (+163/-0) tests/test_cache.py (+39/-0) tests/test_cdrom.py (+130/-0) tests/test_changelog.py (+62/-0) tests/test_country_mirror.py (+28/-0) tests/test_dist_upgrade_fetcher_core.py (+95/-0) tests/test_end_of_life.py (+64/-0) tests/test_kernel_from_baseinstaller.py (+41/-0) tests/test_meta_release_core.py (+137/-0) tests/test_prerequists.py (+155/-0) tests/test_proxy.py (+31/-0) tests/test_pyflakes.py (+18/-0) tests/test_quirks.py (+179/-0) tests/test_sources_list.py (+317/-0) tests/test_update_origin.py (+123/-0) tests/test_utils.py (+65/-0) tests/test_xorg_fix_intrepid.py (+46/-0) ubuntu-support-status (+173/-0) update-manager (+116/-0) update-manager-text (+66/-0) utils/apt/sources.list (+1/-0) utils/demoted.cfg (+250/-0) utils/demoted.cfg.dapper (+243/-0) utils/demoted.cfg.hardy (+568/-0) utils/demoted.cfg.lucid (+468/-0) utils/demotions.py (+127/-0) utils/est_kernel_size.py (+13/-0) utils/update-base-installer.sh (+51/-0) utils/update_mirrors.py (+22/-0) Conflict adding file .bzr-builddeb. Moved existing file to .bzr-builddeb.moved. Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file AutoUpgradeTester. Moved existing file to AutoUpgradeTester.moved. Conflict adding file BUGS. Moved existing file to BUGS.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file ChangeLog. Moved existing file to ChangeLog.moved. Conflict adding file DistUpgrade. Moved existing file to DistUpgrade.moved. Conflict adding file Janitor. Moved existing file to Janitor.moved. Conflict adding file LGPL. Moved existing file to LGPL.moved. Conflict adding file README.dist-upgrade. Moved existing file to README.dist-upgrade.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file UpdateManager. Moved existing file to UpdateManager.moved. Conflict adding file UpdateManagerText. Moved existing file to UpdateManagerText.moved. Conflict adding file check-new-release-gtk. Moved existing file to check-new-release-gtk.moved. Conflict adding file check_new_release_gtk.py. Moved existing file to check_new_release_gtk.py.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file debian. Moved existing file to debian.moved. Conflict adding file do-release-upgrade. Moved existing file to do-release-upgrade.moved. Conflict adding file help. Moved existing file to help.moved. Conflict adding file kubuntu-devel-release-upgrade. Moved existing file to kubuntu-devel-release-upgrade.moved. Conflict adding file missing. Moved existing file to missing.moved. Conflict adding file mkinstalldirs. Moved existing file to mkinstalldirs.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file pre-build.sh. Moved existing file to pre-build.sh.moved. Conflict adding file setup.cfg. Moved existing file to setup.cfg.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file tests. Moved existing file to tests.moved. Conflict adding file ubuntu-support-status. Moved existing file to ubuntu-support-status.moved. Conflict adding file update-manager-text. Moved existing file to update-manager-text.moved. Conflict adding file update-manager. Moved existing file to update-manager.moved. Conflict adding file utils. Moved existing file to utils.moved. |
||||
To merge this branch: | bzr merge lp:~ember/update-manager/ubuntu.bug1002956 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Vogt (community) | Approve | ||
Review via email: mp+106832@code.launchpad.net |
To post a comment you must log in.
Thanks for this fix! I (manually) merged it into the update-manager branch now and we should SRU it for both precise and oneiric.