command-not-found

Merge lp://qastaging/~vorlon/command-not-found/dh_python2 into lp://qastaging/~zyga/command-not-found/trunk

  1. dh_python2
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merge reported by: Zygmunt Krynicki
Merged at revision: not available
Proposed branch: lp://qastaging/~vorlon/command-not-found/dh_python2
Merge into: lp://qastaging/~zyga/command-not-found/trunk
Diff against target: 284 lines (+182/-9) (has conflicts)
6 files modified
CommandNotFound/client_misc.py (+28/-1)
debian/changelog (+135/-0)
debian/control (+5/-2)
debian/rules (+3/-3)
pre-build.sh (+1/-1)
update-from-web.sh (+10/-2)
Text conflict in CommandNotFound/client_misc.py
Text conflict in debian/changelog
Text conflict in debian/control
To merge this branch: bzr merge lp://qastaging/~vorlon/command-not-found/dh_python2
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+64112@code.qastaging.launchpad.net

Description of the change

Would have pushed this directly, but I can't figure out where the UnifiedDataExtractor referenced in the pre-build hook comes from... please document ;)

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for this branch! I merged it into trunk now.

I also fixed the pre-build hook. It used to require a manual run of
"update-from-web.sh". This is done automatically now so bzr-buildpackage
will just DTRT.

review: Approve

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