Merge lp://staging/~adam-stokes/ubuntu/quantal/libbonobo/lp-977947-multiarch into lp://staging/ubuntu/quantal/libbonobo
Proposed by
Adam Stokes
| Status: | Merged |
|---|---|
| Merged at revision: | 45 |
| Proposed branch: | lp://staging/~adam-stokes/ubuntu/quantal/libbonobo/lp-977947-multiarch |
| Merge into: | lp://staging/ubuntu/quantal/libbonobo |
| Diff against target: |
196 lines (+40/-20) 9 files modified
bonobo-activation-config.xml (+1/-0) debian/changelog (+6/-0) debian/control (+11/-4) debian/control.in (+10/-3) debian/libbonobo2-0.install (+5/-4) debian/libbonobo2-bin.install (+1/-1) debian/libbonobo2-common.install (+0/-1) debian/libbonobo2-dev.install (+3/-4) debian/rules (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~adam-stokes/ubuntu/quantal/libbonobo/lp-977947-multiarch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
A hopefully more complete multiarch fix. Changes to note from previous debdiff:
- Moved install of bonobo servers into libbonobo2-
- Hardcode /usr/lib/
To post a comment you must log in.
Revision history for this message
| Steve Langasek (vorlon) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
> - Moved install of bonobo servers into libbonobo2-
This requires bumping the versioned replaces: on libbonobo2-common in the libbonobo2-0 package. i.e.,
- libbonobo2-common (<< 2.20.3-1)
+ libbonobo2-common (<< 2.32.1-0ubuntu2)
> Add depends to control.in for orbit
What's the reason for this added dependency? The existing libbonobo2-0 package has no dependency on orbit2 at all; so a versioned dependency doesn't make sense to me here. Maybe this should be liborbit2 (>= 1:2.14.
Otherwise these changes look correct to me. Have you tested that everything works after these changes? I'm not sure how to go about testing bonobo functionality nowadays.