diff options
| author | Barak A. Pearlmutter <barak+git@cs.nuim.ie> | 2012-11-30 12:46:40 +0000 |
|---|---|---|
| committer | Barak A. Pearlmutter <barak+git@cs.nuim.ie> | 2012-11-30 12:46:40 +0000 |
| commit | d9cbd8f4a284af5978f863c0d506b4fa43a6b53a (patch) | |
| tree | e3f5ff7aaba36f094b2d578fdc9d01f54d4ea584 | |
| parent | 0eca0f59b2bef9af326bd75487fcb476383fc360 (diff) | |
| parent | 7e57863710b516d0a76c0802b7f87448ba6b961c (diff) | |
Merge tag 'fix-root-file'
| -rwxr-xr-x | debian/bbdb.emacsen-install | 7 | ||||
| -rw-r--r-- | debian/changelog | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/debian/bbdb.emacsen-install b/debian/bbdb.emacsen-install index ba90185..bbe45fe 100755 --- a/debian/bbdb.emacsen-install +++ b/debian/bbdb.emacsen-install @@ -74,6 +74,11 @@ case "${FLAVOR}" in # at ELCDIR ( cd ${ELCDIR} + + # Prevent epg from manipulating /root/.gnupg (#694417) + TMPGNUPGHOME=`mktemp -d --tmpdir gnupg.XXXXXXXXXX` + export GNUPGHOME=${TMPGNUPGHOME} + echo "Generating bbdb-autoloads..." echo "Generating bbdb-autoloads" >> $LOG make autoloads >> $LOG 2>&1 @@ -86,7 +91,7 @@ case "${FLAVOR}" in GNUSDIR=${GNUSDIR} \ MHEDIR=${MHEDIR} >> $LOG 2>&1 mv lisp/*.elc utils/*.el . - rm -rf tex utils lisp Makefile + rm -rf tex utils lisp Makefile ${TMPGNUPGHOME} ${FLAVOR} ${COMPILE} *.el >> $LOG 2>&1 ) cat > ${ELCDIR}/load-path.el <<EOF diff --git a/debian/changelog b/debian/changelog index b89388e..2632124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -bbdb (2.36-3) unstable; urgency=low +bbdb (2.36-4) unstable; urgency=low * dh autoreconf -- Barak A. Pearlmutter <bap@debian.org> Mon, 21 Nov 2011 15:46:29 +0000 +bbdb (2.36-3) unstable; urgency=low + + [ Sébastien Villemot ] + * debian/bbdb.emacsen-install: no longer create /root/.gnupg during + installation of the package. This is achieved by binding GNUPGHOME to a + temporary directory during bytecode compilation (Closes: #694417) + + -- Barak A. Pearlmutter <bap@debian.org> Fri, 30 Nov 2012 11:52:46 +0000 + bbdb (2.36-2) unstable; urgency=low * Update to bbdb-vcard 0.3, which better parses birthdays |