Merge lp://qastaging/~ubuntu-branches/ubuntu/karmic/openafs/karmic-proposed-201103250308 into lp://qastaging/ubuntu/karmic-proposed/openafs
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/karmic/openafs/karmic-proposed-201103250308 |
| Merge into: | lp://qastaging/ubuntu/karmic-proposed/openafs |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/karmic/openafs/karmic-proposed-201103250308 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/karmic-proposed/openafs now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/karmic/openafs/karmic-proposed-201103250308. A merge should be performed if necessary.
Unmerged revisions
- 20. By Evan Broder
-
* Backport fix for Debian #553542 to Karmic: (LP: #463429)
- In the postinst of openafs-modules- dkms, if the openafs module
is already added in DKMS, try to remove it first before adding
it. This should more correctly handle the case of a user
installing this package without the correct kernel headers,
having it fail in postinst, and then installing the correct
headers and having dpkg attempt to configure the package again.
Thanks, Philipp Kaluza. (Closes: #553542)
