summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-01-27 12:12:33 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2010-01-27 12:12:33 +0100
commit39b4b76cbfc378d240eb30caaa102b0ca51fad3f (patch)
tree12cefb632cb17b44e41b0e9de6ef643a71a9f7a2
parent89504deb355453e2022cafe54b3b235588bea7d7 (diff)
parent5810683948b6e46223db4e873160b01dd5ad6aac (diff)
merged from lp:~mvo/apt/mvo
-rw-r--r--debian/apt.dirs1
-rw-r--r--debian/changelog7
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs
index 1377c8066..d11ee0f2f 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -10,7 +10,6 @@ var/cache/apt/archives/partial
var/lib/apt/lists/partial
var/lib/apt/mirrors/partial
var/lib/apt/periodic
-var/lib/apt/media
var/log/apt
usr/share/bug/apt
usr/share/lintian/overrides
diff --git a/debian/changelog b/debian/changelog
index 21c71e4d6..4647c0e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,14 +5,17 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low
* apt-pkg/contrib/cdromutl.cc:
- fix UnmountCdrom() fails, give it a bit more time and try
the umount again
+ * apt-pkg/cdrom.cc:
+ - fix crash in pkgUdevCdromDevices
* methods/cdrom.cc:
- fixes in multi cdrom setup code
- add new "Acquire::cdrom::AutoDetect" variable that enables/disables
the dlopen of libudev for automatic cdrom detection
* cmdline/apt-cdrom.cc:
- - add new --auto-detect option
+ - add new --auto-detect option that uses libudev to figure out
+ the cdrom/mount-point
- -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Jan 2010 12:01:36 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jan 2010 12:12:16 +0100
apt (0.7.25ubuntu2) lucid; urgency=low