From a0895a74fe95997a5d75e5b54c95afb9594554f6 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Dec 2009 21:59:49 +0100
Subject: merged -r 1923..1926 from lp:~donkult/apt/sid

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 0696541a7..c75ea227e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,7 @@ apt (0.7.25) UNRELEASED; urgency=low
     - source doesn't need the complete version for match (Closes: #245250)
     - source ignores versions/releases if not available (Closes: #377424)
     - only warn if (free) space overflows (Closes: #522238)
+    - add --debian-only as alias for --diff-only
   * methods/connect.cc:
     - display also strerror of "wicked" getaddrinfo errors
   * buildlib/configure.mak, buildlib/config.{sub,guess}:
@@ -85,6 +86,8 @@ apt (0.7.25) UNRELEASED; urgency=low
       thanks Carl Chenet! (Closes: #521284)
   * ftparchive/writer.{cc,h}:
     - add APT::FTPArchive::LongDescription to be able to disable them
+  * apt-pkg/deb/debsrcrecords.cc:
+    - use "diff" filetype for .debian.tar.* files (Closes: #554898)
 
   [ Chris Leick ]
   * doc/ various manpages:
-- 
cgit v1.2.3