diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index d2b896369..681684daa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,5 @@ apt (0.6.37) breezy; urgency=low - * apt-cache show <virtualpkg> shows the available packages providing - the virtual pkg (thanks to otavio) (closes: #202493) * make pinning on the "component" work again (using the section of the archive, we don't use per-section Release files anymore with apt-0.6) (closes ubuntu #9935) @@ -23,7 +21,6 @@ apt (0.6.36ubuntu1) breezy; urgency=low -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 May 2005 11:57:53 +0200 ->>>>>>> MERGE-SOURCE apt (0.6.36) experimental; urgency=low * Merge apt--mvo--0: @@ -35,11 +32,7 @@ apt (0.6.36) experimental; urgency=low - apt-pkg/cdrom.cc: honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496) -<<<<<<< TREE - -- Michael Vogt <mvo@debian.org> Fri, 6 May 2005 10:12:20 +0200 -======= -- Michael Vogt <mvo@debian.org> Thu, 31 Mar 2005 20:37:11 +0200 ->>>>>>> MERGE-SOURCE apt (0.6.35) hoary; urgency=low |