Package: release.debian.org
User: release.debian@packages.debian.org
Usertags: pu
Tags: buster
Severity: normal
emacs (1:26.1+1-3.2+deb10u1) buster; urgency=medium
* Update the EPLA packaging key (previous key expires 2019-09-23) via
the upstream commit f16785d361097df9fddfcc0b60ae6f0d92e7e911. Add the
old and new keyrings to debian/ and debian/source/include-binaries
since debian/patches/ can't handle git binary diffs. Thanks to Stefan
Monnier for reporting the problem and providing the patch.
diff -Nru emacs-26.1+1/debian/.gitignore emacs-26.1+1/debian/.gitignore
--- emacs-26.1+1/debian/.gitignore 2019-02-03 08:42:30.0 -0600
+++ emacs-26.1+1/debian/.gitignore 1969-12-31 18:00:00.0 -0600
@@ -1,72 +0,0 @@
-*~
-.\#*
-/*-stamp
-/build-lucid
-/build-nox
-/build-x
-/emacs
-/emacs.debhelper.log
-/emacs.substvars
-/emacs-gtk
-/emacs-bin-common
-/emacs-bin-common.README.Debian
-/emacs-bin-common.debhelper.log
-/emacs-bin-common.lintian-overrides
-/emacs-bin-common.postinst
-/emacs-bin-common.postrm
-/emacs-bin-common.prerm
-/emacs-bin-common.substvars
-/emacs-common
-/emacs-common.README.Debian
-/emacs-common.debhelper.log
-/emacs-common.docs
-/emacs-common.links
-/emacs-common.lintian-overrides
-/emacs-common.postinst
-/emacs-common.prerm
-/emacs-common.substvars
-/emacs-el
-/emacs-el.debhelper.log
-/emacs-el.prerm
-/emacs-el.substvars
-/emacs-lucid
-/emacs-lucid.README.Debian
-/emacs-lucid.debhelper.log
-/emacs-lucid.desktop
-/emacs-lucid.lintian-overrides
-/emacs-lucid.menu
-/emacs-lucid.postinst
-/emacs-lucid.postinst.debhelper
-/emacs-lucid.postrm.debhelper
-/emacs-lucid.prerm
-/emacs-lucid.substvars
-/emacs-nox
-/emacs-nox.README.Debian
-/emacs-nox.debhelper.log
-/emacs-nox.desktop
-/emacs-nox.links
-/emacs-nox.lintian-overrides
-/emacs-nox.menu
-/emacs-nox.postinst
-/emacs-nox.postinst.debhelper
-/emacs-nox.postrm
-/emacs-nox.postrm.debhelper
-/emacs-nox.prerm
-/emacs-nox.substvars
-/emacs-gtk.README.Debian
-/emacs-gtk.debhelper.log
-/emacs-gtk.desktop
-/emacs-gtk.links
-/emacs-gtk.lintian-overrides
-/emacs-gtk.menu
-/emacs-gtk.postinst
-/emacs-gtk.postinst.debhelper
-/emacs-gtk.postrm
-/emacs-gtk.postrm.debhelper
-/emacs-gtk.prerm
-/emacs-gtk.substvars
-/emacs-common.README.00
-/emacs-common.README.01
-/files
-/tmp-alt-list
-\#*\#
diff -Nru emacs-26.1+1/debian/changelog emacs-26.1+1/debian/changelog
--- emacs-26.1+1/debian/changelog 2019-02-03 08:42:30.0 -0600
+++ emacs-26.1+1/debian/changelog 2019-09-04 21:35:24.0 -0500
@@ -1,3 +1,13 @@
+emacs (1:26.1+1-3.2+deb10u1) buster; urgency=medium
+
+ * Update the EPLA packaging key (previous key expires 2019-09-23) via
+the upstream commit f16785d361097df9fddfcc0b60ae6f0d92e7e911. Add the
+old and new keyrings to debian/ and debian/source/include-binaries
+since debian/patches/ can't handle git binary diffs. Thanks to Stefan
+Monnier for reporting the problem and providing the patch.
+
+ -- Rob Browning Wed, 04 Sep 2019 21:35:24 -0500
+
emacs (1:26.1+1-3.2) unstable; urgency=medium
* Non-maintainer upload.
Binary files /tmp/SPAXT75_oS/emacs-26.1+1/debian/etc-package-keyring-new.gpg and /tmp/SOba52Hexv/emacs-26.1+1/debian/etc-package-keyring-new.gpg differ
Binary files /tmp/SPAXT75_oS/emacs-26.1+1/debian/etc-package-keyring-old.gpg and /tmp/SOba52Hexv/emacs-26.1+1/debian/etc-package-keyring-old.gpg differ
diff -Nru emacs-26.1+1/debian/rules emacs-26.1+1/debian/rules
--- emacs-26.1+1/debian/rules 2019-02-03 08:42:30.0 -0600
+++ emacs-26.1+1/debian/rules 2019-09-04 21:27:51.0 -0500
@@ -314,7 +314,15 @@
override_dh_auto_configure:
debian/stamp-configured: $(autogen_build_files)
-# If the deps for this target change, start over
+# If the deps for this target change, start over.
+# When the "new" keyring is obsolete, update
+# debian/source/include-binaries.
+ if test "$$(sha1sum etc/package-keyring.gpg | cut -f 1 -d ' ')" \
+ != 5eda21f010a2d246359efc6450830ac3d500760e; then \
+ echo 'Unexpected keyring hash - is it obsolete?'; \
+ false; \
+ fi
+ cp -a debian/etc-package-keyring-new.gpg etc/package-keyring.gpg
rm -rf debian/build-src debian/build-gtk debian/build-lucid debian/build-nox
mkdir debian/build-src
cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src
@@ -559,6 +567,8 @@
override_dh_clean: $(persistent_autogen_files)
dh_clean
+ cp -a debian/etc-package-keyring-old.gpg \
+ etc/package-keyring.gpg
rm -rf \
debian/stamp-* \
debian/build-lucid \
diff -Nru emacs-26.1+1/debian/source/include-binaries emacs-26.1+1/debian/source/include-binaries
--- emacs-26.1+1/debian/source/include-binaries 1969-12-31 18:00:00.0 -0600
+++ emacs-26.1+1/debian/source/include-binaries 2019-09-04 21:26:12.0 -0500
@@ -0,0 +1,2 @@
+debian/etc-package-keyring-new.gpg
+debian/etc-package-keyring-old.gpg
Thanks
--
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011
