Merge lp:~logan/ubuntu/raring/emacs-goodies-el/debian-merge into lp:ubuntu/raring/emacs-goodies-el

[Logan Rosen]

[Daniel Holbach (dholbach)]

Uploaded, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-22 10:36:14 +0000
+++ debian/changelog	2012-11-20 02:20:26 +0000
@@ -1,3 +1,26 @@
+emacs-goodies-el (35.2+nmu1ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add {hardy,jaunty,karmic,lucid,maverick,oneiric,precise}-proposed
+      distribution targets to dpkg-dev-el.
+    - Add precise{,-proposed} distribution targets; drop out the oneieric
+      non-proposed target, since uploads to the release pocket are not
+      permitted for stable releases.
+    - Teach emacs-goodies-el about quantal and quantal-proposed.
+    - Teach debian-changelog-mode.el about raring and raring-proposed.
+
+ -- Logan Rosen <[e-mail]>  Mon, 19 Nov 2012 21:16:17 -0500
+
+emacs-goodies-el (35.2+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * No longer create /root/.gnupg during installation of gnus-bonus-el.
+    This is achieved by binding epg-gpg-home-directory to a temporary
+    directory during bytecode compilation (implementation in
+    debian/emacsen-install.template). (Closes: #689807)
+
+ -- Sébastien Villemot <[e-mail]>  Sun, 21 Oct 2012 11:30:47 +0200
+
 emacs-goodies-el (35.2ubuntu3) raring; urgency=low
 
   * Teach debian-changelog-mode.el about raring and raring-proposed.

=== modified file 'debian/emacsen-install.template'
--- debian/emacsen-install.template	2011-06-24 12:37:31 +0000
+++ debian/emacsen-install.template	2012-11-20 02:20:26 +0000
@@ -101,10 +101,22 @@
 EOF
 fi
 
+# Prevent epg from manipulating /root/.gnupg (#689807)
+if [ ${PACKAGE} = gnus-bonus-el ]; then
+	TMPGNUPGHOME=`mktemp -d --tmpdir gnupg.XXXXXXXXXX`
+	cat << EOF >> path.el
+(setq epg-gpg-home-directory "${TMPGNUPGHOME}")
+EOF
+fi
+
 echo ${FLAVOR} ${FLAGS} ${FILES} >> ${LOG}
 "${FLAVOR}" ${FLAGS} ${FILES} >> ${LOG} 2>&1
 egrep -s -e "While compiling|\*\*" ${LOG} || /bin/true
 echo install/${PACKAGE}: Deleting ${LOG}
 rm -f path.el ${LOG}
 
+if [ ${PACKAGE} = gnus-bonus-el ]; then
+	rm -rf ${TMPGNUPGHOME}
+fi
+
 exit 0