summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <egon@debian-devbox>2012-06-11 14:56:11 +0200
committerMichael Vogt <egon@debian-devbox>2012-06-11 14:56:11 +0200
commitcb6a5776bfb5f74d94f32db55f2de148c27a5d10 (patch)
tree3c8f8bcaeefb9e51bff8476b262de18b4b39b11b /debian
parent563fd891d80feedefd812aad83844e2189870e2c (diff)
parent249a02f55a2b311fc130efe3b3a99995b6a71360 (diff)
merged from donkult
Diffstat (limited to 'debian')
-rw-r--r--debian/apt-utils.links1
-rw-r--r--debian/changelog81
2 files changed, 73 insertions, 9 deletions
diff --git a/debian/apt-utils.links b/debian/apt-utils.links
deleted file mode 100644
index 5bf138c4a..000000000
--- a/debian/apt-utils.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/apt-internal-solver usr/lib/apt/solvers/apt
diff --git a/debian/changelog b/debian/changelog
index 432032b1e..f5a764185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,83 @@
apt (0.9.5.2) UNRELEASED; urgency=low
- [ Translation of manpages ]
- * Polish updated by Robert Luberda. Closes: #675603
- * French updated by Christian Perrier
+ [ David Kalnischkies ]
+ * apt-pkg/cdrom.cc:
+ - fix regression from 0.9.3 which dumped the main configuration
+ _config instead of the cdrom settings (Cnf) as identified and
+ tested by Milan Kupcevic, thanks! (Closes: #674100)
+ * cmdline/apt-get.cc:
+ - do not show 'list of broken packages' header if no package
+ is broken as it happens e.g. for external resolver errors
+ - print URIs for all changelogs in case of --print-uris,
+ thanks to Daniel Hartwig for the patch! (Closes: #674897)
+ - show 'bzr branch' as 'bzr get' is deprecated (LP: #1011032)
+ - check build-dep candidate if install is forbidden
+ * debian/apt-utils.links:
+ - the internal resolver 'apt' is now directly installed in
+ /usr/lib/apt/solvers, so don't instruct dh to create a broken link
+ * doc/apt-verbatim.ent:
+ - APT doesn't belong to the product 'Linux', so use 'APT' instead
+ as after all APT is a big suite of applications
+ * doc/examples/sources.list:
+ - use the codename instead of 'stable' in the examples sources.list
+ as we do in the manpage and as the debian-installer does
+ * doc/apt-get.8.xml:
+ - use apt-utils as package example instead of libc6
+ * apt-pkg/contrib/cmdline.cc:
+ - apply patch from Daniel Hartwig to fix a segfault in case
+ the LongOpt is empty (Closes: #676331)
+ - fix segfault with empty LongOpt in --no-* branch
+ * ftparchive/apt-ftparchive.cc:
+ - default to putting the Contents-* files below $(SECTION) as apt-file
+ expects them there - thanks Martin-Éric Racine! (Closes: #675827)
+ * apt-pkg/deb/deblistparser.cc:
+ - set pkgCacheGen::Essential to "all" again (Closes: #675449)
+ * apt-pkg/algorithms.cc:
+ - force install only for one essential package out of a group
+ * apt-pkg/aptconfiguration.cc:
+ - if APT::Languages=none save "none" in allCodes so that the detected
+ configuration is cached as intended (Closes: #674690, LP: #1004947)
+ * apt-pkg/cacheiterators.h:
+ - add an IsMultiArchImplicit() method for Dep- and PrvIterator
+
+ [ Justin B Rye ]
+ * doc/apt-cdrom.8.xml:
+ - replace CDROM with the proper CD-ROM in text
+ - correct disc vs. disk issues
+ * doc/apt-extracttemplates.1.xml:
+ - debconf is not DebConf
+ * doc/apt-get.8.xml:
+ - move dselect-upgrade below dist-upgrade
+ - review and fix spelling issues
+ * doc/apt-ftparchive.8.xml, doc/apt-config.8.xml,
+ doc/apt-key.8.xml, doc/apt-mark.8.xml,
+ doc/apt_preferences.5.xml, doc/apt-secure.8.xml,
+ doc/apt-sortpkgs.1.xml, sources.list.5.xml:
+ - review and fix typo, grammar and style issues
+ * doc/apt.conf.5.xml:
+ - review and fix typo, grammar and style issues
+ - rephrase APT::Immediate-Configuration and many others
- [ Translation of programs ]
- * Danish by Joe Hansen. Closes: #675605
- * French updated by Christian Perrier
-
[ Sebastian Heinlein ]
* cmdline/apt-key:
- do not hardcode /etc but use Dir::Etc instead
- -- Christian Perrier <bubulle@debian.org> Sat, 02 Jun 2012 18:25:18 +0200
+ [ Robert Luberda ]
+ * Polish manpage translation update (Closes: #675603)
+ * doc/apt-mark.8.xml:
+ - in hold, the option name is --file not --filename
+
+ [ Christian Perrier ]
+ * French program and manpage translation update
+ * Danish program translation by Joe Hansen. Closes: #675605
+
+ [ Thibaut Girka ]
+ * cmdline/apt-get.cc:
+ - complain correctly about :any build-dep on M-A:none packages
+ * apt-pkg/deb/deblistparser.cc:
+ - add support for arch-specific qualifiers in dependencies
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 06 Jun 2012 23:54:01 +0200
apt (0.9.5.1) unstable; urgency=low