From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 7 Nov 2020 21:11:22 +0000 (-0600)
Subject: Strip parent path from package descriptions for reprodcibility
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~124
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2564748643ed9c6261e71edf6ef093715d73e39c;p=emacs.git

Strip parent path from package descriptions for reprodcibility

Add 0012-Strip-parent-path-from-package-descriptions-for-repr.patch to
incorporate the changes.

Thanks to Chris Lamb for reporting the problem and tracking down the
cause.

Closes: 972861
---

2564748643ed9c6261e71edf6ef093715d73e39c
diff --cc debian/.git-dpm
index a7d8b5f67a3,00000000000..1d7c4aa1cf6
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- eeeed459bbcad847b83a9687156f24cb4d370880
- eeeed459bbcad847b83a9687156f24cb4d370880
++a64353ba297f114e47c5e22d4a522d95bd400b58
++a64353ba297f114e47c5e22d4a522d95bd400b58
 +d429af9a70839a40bba83ebeaa33ad8d7219fbcd
 +d429af9a70839a40bba83ebeaa33ad8d7219fbcd
 +emacs_27.1+1.orig.tar.xz
 +fa38330a1a57cf7a01ee8128f0faf2dd0117f703
 +25483548
diff --cc debian/patches/0012-Strip-parent-path-from-package-descriptions-for-repr.patch
index 00000000000,00000000000..9cf2a01c1ee
new file mode 100644
--- /dev/null
+++ b/debian/patches/0012-Strip-parent-path-from-package-descriptions-for-repr.patch
@@@ -1,0 -1,0 +1,34 @@@
++From a64353ba297f114e47c5e22d4a522d95bd400b58 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sat, 7 Nov 2020 15:05:52 -0600
++Subject: Strip parent path from package descriptions for reproducibility
++
++Previously, the package description would include the full build tree
++path which varies.  Instead, remove any duplicate slashes and any
++components other than the immediate parent.
++
++Thanks to Chris Lamb for reporting the problem and tracking down the
++cause.
++
++Bug-Debian: https://bugs.debian.org/972861
++---
++ lisp/emacs-lisp/package.el | 6 +++++-
++ 1 file changed, 5 insertions(+), 1 deletion(-)
++
++diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
++index 7d6be3cf4e2..60561fdb678 100644
++--- a/lisp/emacs-lisp/package.el
+++++ b/lisp/emacs-lisp/package.el
++@@ -963,7 +963,11 @@ package-generate-description-file
++       (write-region
++        (concat
++         ";;; Generated package description from "
++-        (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file)
+++        (replace-regexp-in-string ;; just the final y.el or x/y.el
+++         "^.*?\\([^/]+/\\)?\\([^/]+\\)$" "\\1\\2"
+++         (replace-regexp-in-string
+++          "/+" "/"
+++          (replace-regexp-in-string "-pkg\\.el\\'" ".el" pkg-file)))
++         "  -*- no-byte-compile: t -*-\n"
++         (prin1-to-string
++          (nconc
diff --cc debian/patches/series
index c02bc450a52,00000000000..d9a70efa092
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,12 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
 +0009-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch
 +0010-Mark-echo-server-with-dns-test-as-unstable-for-now.patch
 +0011-emacs-module-tests-fix-VPATH-builds.patch
++0012-Strip-parent-path-from-package-descriptions-for-repr.patch