* apt-pkg/deb/dpkgpm.{cc,h}:

  - merged dpkg-log branch, this lets you specify a 
    Dir::Log::Terminal file to log dpkg output to
    ABI break

4 files changed, 15 insertions, 0 deletions

diff --git a/debian/apt.dirs b/debian/apt.dirs
index 1543e8bb1..8ce9b175a 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -4,7 +4,9 @@ usr/lib/dpkg/methods/apt
 etc/apt
 etc/apt/apt.conf.d
 etc/apt/sources.list.d
+etc/logrotate.d
 var/cache/apt/archives/partial
 var/lib/apt/lists/partial
 var/lib/apt/periodic
+var/log/apt
 usr/share/bug/apt
diff --git a/debian/apt.logrotate b/debian/apt.logrotate
new file mode 100644
index 000000000..3e924d383
--- /dev/null
+++ b/debian/apt.logrotate
@@ -0,0 +1,8 @@
+/var/log/apt/term.log {
+  rotate 6
+  monthly
+  compress
+  missingok
+  notifempty
+}
+
diff --git a/debian/changelog b/debian/changelog
index b9824f84a..8c0bc2d0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ apt (0.7.7) UNRELEASED; urgency=low
     - only send LastModified if we actually have one
     - send range request with if-range 
     - delete failed downloads
+  * apt-pkg/deb/dpkgpm.{cc,h}:
+    - merged dpkg-log branch, this lets you specify a 
+      Dir::Log::Terminal file to log dpkg output to
+      ABI break
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 02 Aug 2007 11:55:54 +0200
 
diff --git a/debian/rules b/debian/rules
index 473821f16..b3222f3b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,6 +209,7 @@ apt: build debian/shlibs.local
 	cp -r $(BLD)/locale debian/$@/usr/share/
 
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
+	cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
 
 	cp share/debian-archive.gpg debian/$@/usr/share/$@
 	cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove