Merge lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228 into lp://qastaging/ubuntu/oneiric/uw-imap
Proposed by
Robie Basak
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228 |
Merge into: | lp://qastaging/ubuntu/oneiric/uw-imap |
Diff against target: |
157 lines (+42/-29) (has conflicts) 2 files modified
debian/changelog (+10/-0) debian/patches/1001_shlibs.patch (+32/-29) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp://qastaging/~racb/ubuntu/oneiric/uw-imap/831228 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dave Walker | Pending | ||
Review via email: mp+74589@code.qastaging.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 16. By Robie Basak
-
Fix libc-client.
so.2007e. 0 dependencies to build correctly with
-Wl,--as-needed. (LP: #831228) - 15. By Robie Basak
-
Fix libc-client.
so.2007e. 0 dependencies as caused by Ubuntu's
-Wl,--as-needed default.
See: http://wiki.debian. org/ToolChain/ DSOLinking (LP: #831228)
Looks good.
Ideally, we'd like to introduce a new patch incase the edited patch isn't accepted by debian, it makes merging easier next cycle.
You probably don't need to quote http:// wiki.debian. org/ToolChain/ DSOLinking, as it's understood --as-needed is enough.
I need to build test this first, but generally happy. If you are confident this is a good fix, do you want to use the "submittodebian" tool?
Thanks