Merge lp://qastaging/~mterry/update-manager/split-release-upgrader into lp://qastaging/update-manager
Proposed by
Michael Terry
Status: | Merged |
---|---|
Merged at revision: | 2509 |
Proposed branch: | lp://qastaging/~mterry/update-manager/split-release-upgrader |
Merge into: | lp://qastaging/update-manager |
Prerequisite: | lp://qastaging/~mterry/update-manager/drop-auto-tester |
Diff against target: |
21114 lines (+200/-19816) 123 files modified
.bzr-builddeb/default.conf (+0/-3) DistUpgrade/Changelog (+0/-188) DistUpgrade/DevelReleaseAnnouncement (+0/-58) DistUpgrade/DistUpgrade.cfg (+0/-117) DistUpgrade/DistUpgrade.cfg.dapper (+0/-56) DistUpgrade/DistUpgrade.cfg.hardy (+0/-106) DistUpgrade/DistUpgrade.cfg.lucid (+0/-114) DistUpgrade/DistUpgrade.ui (+0/-1605) DistUpgrade/DistUpgradeApport.py (+0/-91) DistUpgrade/DistUpgradeAptCdrom.py (+0/-308) DistUpgrade/DistUpgradeAufs.py (+0/-253) DistUpgrade/DistUpgradeCache.py (+0/-1235) DistUpgrade/DistUpgradeConfigParser.py (+0/-85) DistUpgrade/DistUpgradeController.py (+0/-1793) DistUpgrade/DistUpgradeFetcherCore.py (+0/-313) DistUpgrade/DistUpgradeFetcherSelf.py (+0/-32) DistUpgrade/DistUpgradeGettext.py (+0/-83) DistUpgrade/DistUpgradeMain.py (+0/-237) DistUpgrade/DistUpgradePatcher.py (+0/-105) DistUpgrade/DistUpgradeQuirks.py (+0/-1270) DistUpgrade/DistUpgradeVersion.py (+0/-1) DistUpgrade/DistUpgradeView.py (+0/-436) DistUpgrade/DistUpgradeViewGtk.py (+0/-749) DistUpgrade/DistUpgradeViewGtk3.py (+0/-749) DistUpgrade/DistUpgradeViewKDE.py (+0/-873) DistUpgrade/DistUpgradeViewNonInteractive.py (+0/-329) DistUpgrade/DistUpgradeViewText.py (+0/-279) DistUpgrade/EOLReleaseAnnouncement (+0/-62) DistUpgrade/README (+0/-90) DistUpgrade/ReleaseAnnouncement (+0/-56) DistUpgrade/TODO (+0/-65) DistUpgrade/additional_pkgs.cfg (+0/-2) DistUpgrade/apt-autoinst-fixup.py (+0/-69) DistUpgrade/build-dist.sh (+0/-53) DistUpgrade/build-exclude.txt (+0/-9) DistUpgrade/build-tarball.sh (+0/-41) DistUpgrade/cdromupgrade (+0/-40) DistUpgrade/crashdialog.ui (+0/-142) DistUpgrade/dialog_changes.ui (+0/-213) DistUpgrade/dialog_conffile.ui (+0/-142) DistUpgrade/dialog_error.ui (+0/-119) DistUpgrade/dist-upgrade.py (+0/-10) DistUpgrade/etc-default-apport (+0/-7) DistUpgrade/get_kernel_list.sh (+0/-29) DistUpgrade/imported/invoke-rc.d (+0/-455) DistUpgrade/imported/invoke-rc.d.diff (+0/-24) DistUpgrade/mirrors.cfg (+0/-830) DistUpgrade/patches/README (+0/-17) DistUpgrade/patches/_usr_bin_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 (+0/-80) DistUpgrade/prerequists-sources.dapper-ports.list (+0/-4) DistUpgrade/prerequists-sources.dapper.list (+0/-4) DistUpgrade/prerequists-sources.list (+0/-6) DistUpgrade/removal_blacklist.cfg (+0/-19) DistUpgrade/screenrc (+0/-3) DistUpgrade/window_main.ui (+0/-267) DistUpgrade/xorg_fix_proprietary.py (+0/-179) DistUpgrade/zz-update-grub (+0/-19) README.dist-upgrade (+0/-34) check-new-release-gtk (+0/-210) data/do-release-upgrade.8 (+0/-35) data/gtkbuilder/UpgradePromptDialog.ui (+0/-343) data/meta-release (+0/-7) data/release-upgrades (+0/-17) debian/91-release-upgrade (+0/-5) debian/control (+4/-20) debian/python-update-manager.install (+0/-6) debian/python3-update-manager.install (+0/-1) debian/release-upgrade-motd (+0/-40) debian/rules (+1/-25) debian/source_update-manager.py (+7/-26) debian/update-manager-core.dirs (+0/-3) debian/update-manager-core.install (+0/-5) debian/update-manager-core.links (+0/-1) debian/update-manager-core.manpages (+0/-1) debian/update-manager-core.postinst (+0/-44) debian/update-manager-core.preinst (+0/-41) debian/update-manager-kde.install (+0/-1) debian/update-manager.install (+0/-1) do-release-upgrade (+0/-131) kubuntu-devel-release-upgrade (+0/-2) po/POTFILES.in (+0/-18) po/POTFILES.skip (+0/-2) po/update-manager.pot (+187/-1626) pre-build.sh (+0/-48) setup.py (+1/-9) tests/Makefile (+0/-3) tests/patchdir/dotdot_expected (+0/-2) tests/patchdir/dotdot_orig (+0/-1) tests/patchdir/fail_orig (+0/-1) tests/patchdir/foo_orig (+0/-2) tests/patchdir/fstab_orig (+0/-17) tests/patchdir/patchdir_dotdot.8cf8463b34caa8ac871a52d5dd7ad1ef.cddc4be46bedd91db15ddb9f7ddfa804 (+0/-4) tests/patchdir/patchdir_fail.ed04abbc6ee688ee7908c9dbb4b9e0a2.deadbeefdeadbeefdeadbeff (+0/-1) tests/patchdir/patchdir_foo.f41121a903eafadf258962abc57c8644.52f83ff6877e42f613bcd2444c22528c (+0/-1) tests/patchdir/patchdir_fstab.a1b72f1370f4f847f602fd0e239265d2.c56d2d038afb651920c83106ec8dfd09 (+0/-13) tests/patchdir/patchdir_pycompile.b17cebfbf18d152702278b15710d5095.97c07a02e5951cf68cb3f86534f6f917 (+0/-80) tests/patchdir/pycompile_orig (+0/-281) tests/test-data-cdrom/.disk/base_components (+0/-2) tests/test-data-cdrom/.disk/cd_type (+0/-1) tests/test-data-cdrom/.disk/info (+0/-1) tests/test-data-cdrom/.disk/udeb_include (+0/-4) tests/test-data-cdrom/README.diskdefines (+0/-9) tests/test-data-cdrom/cdromupgrade (+0/-32) tests/test-data-cdrom/dists/intrepid/Release (+0/-27) tests/test-data-cdrom/dists/intrepid/Release.gpg (+0/-7) tests/test-data-cdrom/dists/intrepid/main/binary-amd64/Release (+0/-6) tests/test-data-cdrom/dists/intrepid/main/debian-installer/binary-amd64/Packages.gz (+0/-1) tests/test-data-cdrom/dists/intrepid/restricted/binary-amd64/Release (+0/-6) tests/test-data/fstab.ntfs.orig (+0/-22) tests/test-data/xorg.conf.orig (+0/-89) tests/test_cdrom.py (+0/-131) tests/test_end_of_life.py (+0/-65) tests/test_kernel_from_baseinstaller.py (+0/-42) tests/test_prerequists.py (+0/-160) tests/test_quirks.py (+0/-181) tests/test_sources_list.py (+0/-324) tests/test_xorg_fix_intrepid.py (+0/-46) utils/demoted.cfg.dapper (+0/-243) utils/demoted.cfg.hardy (+0/-568) utils/demotions.py (+0/-129) utils/est_kernel_size.py (+0/-15) utils/update-base-installer.sh (+0/-51) utils/update_mirrors.py (+0/-22) |
To merge this branch: | bzr merge lp://qastaging/~mterry/update-manager/split-release-upgrader |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Michael Vogt | Pending | ||
Review via email: mp+109211@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2012-06-07.
Description of the change
This drops all the bits from https:/
It will need a further change to update-notifier to notice the new paths for check-new-release, but that's a separate merge.
(resubmitted so I could set a pre-req branch on lp:~mterry/update-manager/drop-auto-tester)
To post a comment you must log in.
The removal of the whole code seems fine to me and from my small testing, it seems you didn't forget to remove anything in the package.
I have a small dummy question though, debian/rules were already using dh --with python2 and you still use the same, even if you ship a python3 package? (python3- update- manager) . Do you know what's the plan for that?
Apart from that all, looks good. I'll let gary looking at the update- release- manager side :)