Merge lp:~ubuntu-branches/ubuntu/maverick/bind9/maverick-201007131825 into lp:ubuntu/maverick/bind9
| Status: | Needs review |
|---|---|
| Proposed branch: | lp:~ubuntu-branches/ubuntu/maverick/bind9/maverick-201007131825 |
| Merge into: | lp:ubuntu/maverick/bind9 |
| Diff against target: |
23 lines (+9/-0) (has conflicts) 1 file modified
debian/changelog (+9/-0) Text conflict in debian/changelog |
| To merge this branch: | bzr merge lp:~ubuntu-branches/ubuntu/maverick/bind9/maverick-201007131825 |
| Related bugs: |
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/maverick/bind9 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/bind9/maverick-201007131825. A merge should be performed if necessary.
Unmerged revisions
- 22. By LaMont Jones
-
build for upload
- 21. By LaMont Jones
-
lucid port
- 20. By LaMont Jones
-
no-change lucid-port.
- 19. By LaMont Jones
-
upload of -1 to lucid, LP#530107
- 18. By LaMont Jones
-
New upstream release. CVE-2010-0097
- 17. By LaMont Jones
-
Ubuntu upload for early access to 9.6.1.dfsg.P3-1.
9.6.1.dfsg.P3-1 should sync over: no source changes present. - 16. By LaMont Jones
-
[Internet Software Consortium, Inc]
* 9.6.1-P2
- When validating, track whether pending data was from the
additional section or not and only return it if validates
as secure. [RT #20438] CVE-2009-4022[LaMont Jones]
* prerm: do not stop named on upgrade. Closes: #542888
* Drop some RFCs that crept into the diff.
* meta: add ${misc:Depends}
* lintian: update config.guess, config.sub in idnkit-1.0 tree
* dnsutils: remove pre-sarge dpkg-divert calls in postinst
* meta: soname changes
* l10n: missing newline in pofile. - 15. By LaMont Jones
-
upload to lucid
