diff options
| -rwxr-xr-x | cmdline/apt-key | 3 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 97d6e0323..c184e3e75 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -11,7 +11,8 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k if [ "$(id -u)" -eq 0 ]; then # we could use a tmpfile here too, but creation of this tends to be time-consuming - GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg" + eval $(apt-config shell TRUSTDBDIR Dir::Etc/d) + GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg" fi GPG="$GPG_CMD" diff --git a/configure.in b/configure.in index 486b7a773..c1cdd3d5f 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="0.9.5.1" +PACKAGE_VERSION="0.9.5.2~20120611" PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff --git a/debian/changelog b/debian/changelog index a89f78de9..f5a764185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,10 @@ apt (0.9.5.2) UNRELEASED; urgency=low - review and fix typo, grammar and style issues - rephrase APT::Immediate-Configuration and many others + [ Sebastian Heinlein ] + * cmdline/apt-key: + - do not hardcode /etc but use Dir::Etc instead + [ Robert Luberda ] * Polish manpage translation update (Closes: #675603) * doc/apt-mark.8.xml: diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 32ed2f678..9aec81e04 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -213,7 +213,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.5.1"> +<!ENTITY apt-product-version "0.9.5.2~20120611"> <!-- Codenames for debian releases --> <!ENTITY oldstable-codename "lenny"> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 905bbb997..292b01971 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.9.5.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-06-09 23:05+0300\n" +"POT-Creation-Date: 2012-06-11 14:45+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |