Merge lp://staging/~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238 into lp://staging/ubuntu/natty/debhelper
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238 |
| Merge into: | lp://staging/ubuntu/natty/debhelper |
| Diff against target: |
73 lines (+48/-0) (has conflicts) 2 files modified
debhelper.pod (+16/-0) debian/changelog (+32/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | 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/natty/debhelper now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/debhelper/natty-201103250238. A merge should be performed if necessary.
Unmerged revisions
- 86. By Steve Langasek
-
tidy up the changelog
- 85. By Steve Langasek
-
releasing version 8.1.2ubuntu3
- 84. By Steve Langasek
-
Revert the patch for env variable expansion based on feedback from Joey
Hess. It appears this patch is not as far along the path to upstream
inclusion as I thought it was; sorry for the confusion, Joey. - 83. By Steve Langasek
-
releasing version 8.1.2ubuntu2
- 82. By Steve Langasek
-
bump dpkg-dev build-dep to the *real* final Ubuntu version
- 81. By Steve Langasek
-
bump the env var expansion to compat level 9; we don't need it except for
multiarch and it's not committed upstream yet, so don't press our luck - 80. By Steve Langasek
-
update dpkg-dev dependency to final Ubuntu multiarch version
- 79. By Steve Langasek
-
fix up changelog for upload to natty
- 78. By Steve Langasek
-
Merge upstream refinements to the multiarch patch.
- 77. By Steve Langasek
-
releasing version 8.1.2ubuntu1+
multiarch. 3
