Merge lp://qastaging/~jbicha/ubuntu-release-upgrader/dont-require-scrollkeeper into lp://qastaging/ubuntu-release-upgrader

Proposed by Jeremy Bícha
Status: Merged
Merged at revision: 2718
Proposed branch: lp://qastaging/~jbicha/ubuntu-release-upgrader/dont-require-scrollkeeper
Merge into: lp://qastaging/ubuntu-release-upgrader
Diff against target: 25 lines (+6/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+0/-1)
To merge this branch: bzr merge lp://qastaging/~jbicha/ubuntu-release-upgrader/dont-require-scrollkeeper
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+177278@code.qastaging.launchpad.net
To post a comment you must log in.
2658. By Brian Murray

Do not try to encode a system error

2659. By Brian Murray

fix pep8 issues in tests

2660. By Brian Murray

Update release version in DistUpgradeQuirks.py (LP: #1202826)

2661. By Brian Murray

Modify demotions so that they are generated for saucy

2662. By Brian Murray

fix pep8 issues in demotions.py

2663. By Brian Murray

add in apt/trusted.gpg

2664. By Brian Murray

Modify how no_longer_supported_nag is set and fix test failure for
test_end_of_life.py, thanks to Michael Terry.

2665. By Brian Murray

releasing version 1:0.199

2666. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

Revision history for this message
Michael Vogt (mvo) wrote :

Looks good to me, +1

review: Approve
2667. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2668. By Brian Murray

DistUpgradeFetcher.py: Properly pass Gtk.window to error (LP: #1199984)

2669. By Brian Murray

ubuntu-release-upgrader-gtk: depend on gir1.2-webkit-3.0 (LP: #1215526)

2670. By Brian Murray

releasing version 1:0.200

2671. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2672. By Colin Watson

DistUpgrade/DistUpgradeController.py: Fix "alllowed" typo.

2673. By Brian Murray

DistUpgrade/DevelReleaseAnnouncement: indicate that it is a Beta now

2674. By Brian Murray

releasing package ubuntu-release-upgrader version 1:0.201

2675. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2676. By Brian Murray

* DistUpgradeQuirks.py: when removing .crash files also remove whoopsie
  .upload and .uploaded files
* DistUpgradeCache.py: remove unhelpful system error message from upgrade
  failure dialog (LP: #1221307)

2677. By Brian Murray

releasing package ubuntu-release-upgrader version 1:0.202

2678. By Brian Murray

merge translations

2679. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2680. By Brian Murray

test/test_sources_list.py: resolve test failure regarding EOL upgrades

2681. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2682. By Brian Murray

* DistUpgradeQuirks.py: pep8 cleanup, remove some additional unnecessary
  quirks
* Drop all quirks for upgrades prior to the karmic->lucid upgrade; all
  releases earlier than 10.04 are entirely EOLed, and in any case users
  should not be upgrading directly from such old releases to 13.10 or
  later without going through the intermediate LTS releases, so this is
  all dead code.
* Drop use of base-installer for detecting "recommended" kernels for the
  hardware. So far this code was only ever used for a one-time transition
  when more specialized kernel flavors became available on i386 that were
  preferred over the -386 flavor, and in the meantime the code is causing
  wrong results on upgrade for users of UbuntuStudio, which ships a kernel
  flavor that's not known by base-installer. LP: #1220898.

2683. By Brian Murray

DistUpgrade/patches/: remove pycompile patch

2684. By Brian Murray

releasing package ubuntu-release-upgrader version 1:0.203

2685. By Brian Murray

Properly raise UnsupportedDialog error (LP: #1210643)
Thanks to Dylan McCall for some help with this.

2686. By Launchpad Translations on behalf of ubuntu-core-dev

Launchpad automatic translations update.

2687. By Brian Murray

Replace references to 13.04 with 13.10 (LP: #1225665)

2688. By Brian Murray

Call update-manager instead of raising it's UnsupportedDialog
error. (LP: #1210643) Thanks to Dylan McCall for some help with this.

2689. By Brian Murray

releasing package ubuntu-release-upgrader version 1:0.204

2690. By Jeremy Bícha

Don't build-depend on scrollkeeper

Revision history for this message
Brian Murray (brian-murray) wrote :

I've gone ahead and merged this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches