diff options
| author | bubulle@debian.org <> | 2006-03-12 21:18:45 +0100 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-03-12 21:18:45 +0100 |
| commit | a3c8f91f032961aca236f29af646170843a06730 (patch) | |
| tree | cb11505f666d3f5ba23be9c6d30086fe29dab977 /debian | |
| parent | 54a14f507b63236ce8c94bb92a835be0cfd161dd (diff) | |
| parent | ad97ee36860c237427dc38ac8ef7f537ac275d77 (diff) | |
Merge from Michael tree
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/changelog | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs index d39bfd1f7..e1cb738fa 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial var/lib/apt/periodic diff --git a/debian/changelog b/debian/changelog index 3c3fbb4a9..64c743a7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +apt (0.6.43.3) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: + * ca.po: Completed to 512t. Closes: #351592 + * eu.po: Completed to 512t. Closes: #350483 + * ja.po: Completed to 512t. Closes: #349806 + * pl.po: Completed to 512t. Closes: #349514 + * sk.po: Completed to 512t. Closes: #349474 + * gl.po: Completed to 512 strings Closes: #349407 + * sv.po: Completed to 512 strings Closes: #349210 + * ru.po: Completed to 512 strings Closes: #349154 + * da.po: Completed to 512 strings Closes: #349084 + * fr.po: Completed to 512 strings + * vi.po: Completed to 511 strings Closes: #348968 + * zh_CN.po: Completed to 512t. Closes: #353936 + * it.po: Completed to 512t. Closes: #352803 + * pt_BR.po: Completed to 512t. Closes: #352419 + * LINGUAS: Add Welsh + * *.po: Updated from sources (512 strings) + * apt-pkg/deb/deblistparser.cc: + - don't explode on a DepCompareOp in a Provides line, but warn about + it and ignore it otherwise (thanks to James Troup for reporting it) + * cmdline/apt-get.cc: + - don't lock the lists directory in DoInstall, breaks --print-uri + (thanks to James Troup for reporting it) + * debian/apt.dirs: create /etc/apt/sources.list.d + * make apt-cache madison work without deb-src entries (#352583) + * cmdline/apt-get.cc: only run the list-cleaner if a update was + successfull + + -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 + apt (0.6.43.2) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: |