diff options
| author | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-07-02 08:32:34 +0200 |
| commit | 8e4c3f0a42664b8c37cc2e0de285849fbf118e11 (patch) | |
| tree | 059b76fef1c1636a7e1ad16e5a4ce06304271718 /debian | |
| parent | 25a4d2049fb79bc2c86cd45e977b4a071e5300ac (diff) | |
| parent | e3c62328abbd548bb0da42fdbad954b3ce4f7102 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 25 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 70046aa65..4baa4d18d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,29 @@ apt (0.9.9) unstable; urgency=low * improve debug output for the Debug::pkgProblemResolver and Debug::pkgDepCache::AutoInstall - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Jul 2013 08:26:17 +0200 + [ David Kalnischkies ] + * build the en manpages in subdirectory doc/en + * remove -ldl from cdrom and -lutil from apt-get linkage + * rewrite pkgOrderList::DepRemove to stop incorrect immediate setting + (Closes: 645713) + * prefer Essentials over Removals in ordering score + * fix priority sorting by prefering higher in MarkInstall + * try all providers in order if uninstallable in MarkInstall + * do unpacks before configures in SmartConfigure (Closes: #707578) + * fix support for multiple patterns in apt-cache search (Closes: #691453) + * set Fail flag in FileFd on all errors consistently + * don't explicitly init ExtractTar InFd with invalid fd + * OpenDescriptor should autoclose fd always on error (Closes: #704608) + * fail in CopyFile if the FileFds have error flag set + * ensure state-dir exists before coyping cdrom files + * fix file location for configure-index.gz in apt.conf(5) (Closes: #711921) + * handle missing "Description" in apt-cache show (Closes: #712435) + * try defaults if auto-detection failed in apt-cdrom (Closes: #712433) + * support \n and \r\n line endings in ReadMessages + * do not redownload unchanged InRelease files + * trigger NODATA error for invalid InRelease files (Closes: #712486) + + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 09 Jun 2013 15:06:24 +0200 apt (0.9.8.2) unstable; urgency=low @@ -25,7 +47,6 @@ apt (0.9.8.2) unstable; urgency=low * Fix crash when the "mirror" method does not find any entry (closes: #699303) - [ Johan Kiviniemi ] * cmdline/apt-key: - Create new keyrings with mode 0644 instead of 0600. diff --git a/debian/rules b/debian/rules index 5051dab4f..79a6dbe0c 100755 --- a/debian/rules +++ b/debian/rules @@ -203,7 +203,7 @@ apt: build build-manpages dh_bugfiles -p$@ dh_lintian -p$@ dh_installexamples -p$@ $(BLD)/docs/examples/* - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ dh_installdocs -p$@ dh_installchangelogs -p$@ @@ -253,7 +253,7 @@ apt-utils: build build-manpages dh_installexamples -p$@ # Install the man pages.. - dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) + dh_installman -p$@ $(wildcard $(patsubst %,doc/en/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES))) dh_installchangelogs -p$@ dh_strip -p$@ |