Merge lp://staging/~mbp/ubuntu/maverick/hamster-applet/600857-imports into lp://staging/ubuntu/maverick/hamster-applet
Proposed by
Martin Pool
| Status: | Merged |
|---|---|
| Merge reported by: | Chris Halse Rogers |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~mbp/ubuntu/maverick/hamster-applet/600857-imports |
| Merge into: | lp://staging/ubuntu/maverick/hamster-applet |
| Diff against target: |
117 lines (+19/-12) 8 files modified
debian/changelog (+7/-0) src/hamster/widgets/activityentry.py (+3/-3) src/hamster/widgets/dateinput.py (+1/-1) src/hamster/widgets/dayline.py (+2/-2) src/hamster/widgets/facttree.py (+2/-2) src/hamster/widgets/tags.py (+2/-2) src/hamster/widgets/timechart.py (+1/-1) src/hamster/widgets/timeinput.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~mbp/ubuntu/maverick/hamster-applet/600857-imports |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix "from .hamster import" statements causing massive failure with ImportError, fixes bug 600857 and friends.
To post a comment you must log in.
Revision history for this message
| Chris Halse Rogers (raof) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for this.
The packaging currently uses a patch system, so I'll fold these changes into a patch and upload that.