Processed: Re: Bug#979749: buster-pu: package emacs/1:26.1+1-3.2+deb10u1

2021-01-23 Thread Debian Bug Tracking System 
Processing control commands:

> tags -1 + confirmed
Bug #979749 [release.debian.org] buster-pu: package emacs/1:26.1+1-3.2+deb10u1
Added tag(s) confirmed.

-- 
979749: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=979749
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#979749: buster-pu: package emacs/1:26.1+1-3.2+deb10u1

2021-01-23 Thread Adam D. Barratt 
Control: tags -1 + confirmed

On Tue, 2021-01-19 at 19:59 -0600, Rob Browning wrote:
> "Adam D. Barratt"  writes:
> 
> > The metadata for that bug implies that it still affects the package
> > in
> > unstable (hence the lack of any green on the version graph). I
> > suspect
> > this is simply because the "fixed" version doesn't correspond to an
> > actual Debian package version. Please could you add a fixed version
> > that indicates the earliest upload to Debian that included the fix.
> 
> Done, I think.

That looks better, thanks.

> > Also, while it's possibly slightly picky:
> > 
> > +emacs (1:26.1+1-3.2+deb10u2~1.gbp7c5887) UNRELEASED;
> > urgency=medium
> > +
> > +  ** SNAPSHOT build @7c5887c8ae064398fafa38b8fea4c5d500830d5f **
> > +
> > +  * UNRELEASED
> > +
> > + -- Rob Browning   Sun, 10 Jan 2021 19:22:48
> > -0600
> > 
> > could we have a finalised version of that, please? :-)
> 
> Oh, no, certainly.  I just submitted the UNRELEASED version for the
> pre-approval.  I'll of course finalize that before the actual upload.

Sorry for being unclear - I meant "could we have _before the upload_".

> If that all sounds fine, I'll proceed with a real upload.

Please go ahead, but attaching a final copy of the diff to this bug
report would also be appreciated.

Regards,

Adam

Bug#979749: buster-pu: package emacs/1:26.1+1-3.2+deb10u1

2021-01-19 Thread Rob Browning 
"Adam D. Barratt"  writes:

> The metadata for that bug implies that it still affects the package in
> unstable (hence the lack of any green on the version graph). I suspect
> this is simply because the "fixed" version doesn't correspond to an
> actual Debian package version. Please could you add a fixed version
> that indicates the earliest upload to Debian that included the fix.

Done, I think.

> Also, while it's possibly slightly picky:
>
> +emacs (1:26.1+1-3.2+deb10u2~1.gbp7c5887) UNRELEASED; urgency=medium
> +
> +  ** SNAPSHOT build @7c5887c8ae064398fafa38b8fea4c5d500830d5f **
> +
> +  * UNRELEASED
> +
> + -- Rob Browning   Sun, 10 Jan 2021 19:22:48 -0600
>
> could we have a finalised version of that, please? :-)

Oh, no, certainly.  I just submitted the UNRELEASED version for the
pre-approval.  I'll of course finalize that before the actual upload.

If that all sounds fine, I'll proceed with a real upload.

Thanks
-- 
Rob Browning
rlb @defaultvalue.org and @debian.org
GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A
GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4

Bug#979749: buster-pu: package emacs/1:26.1+1-3.2+deb10u1

2021-01-16 Thread Adam D. Barratt 
On Sun, 2021-01-10 at 20:08 -0600, Rob Browning wrote:
> dkg has requested that we consider fixing this bug in buster:
> 
>   Debian: https://bugs.debian.org/919642
>   Upstream: https://debbugs.gnu.org/34121
> 
> which is fairly straightforward (just the new patch at the end,
> cherry-picked directly from the upstream fix):

The metadata for that bug implies that it still affects the package in
unstable (hence the lack of any green on the version graph). I suspect
this is simply because the "fixed" version doesn't correspond to an
actual Debian package version. Please could you add a fixed version
that indicates the earliest upload to Debian that included the fix.

Also, while it's possibly slightly picky:

+emacs (1:26.1+1-3.2+deb10u2~1.gbp7c5887) UNRELEASED; urgency=medium
+
+  ** SNAPSHOT build @7c5887c8ae064398fafa38b8fea4c5d500830d5f **
+
+  * UNRELEASED
+
+ -- Rob Browning   Sun, 10 Jan 2021 19:22:48 -0600

could we have a finalised version of that, please? :-)

Assuming the above small points get resolved, the patch looks fine to
me; thanks.

Regards,

Adam

Bug#979749: buster-pu: package emacs/1:26.1+1-3.2+deb10u1

2021-01-10 Thread Rob Browning 

Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu

dkg has requested that we consider fixing this bug in buster:

  Debian: https://bugs.debian.org/919642
  Upstream: https://debbugs.gnu.org/34121

which is fairly straightforward (just the new patch at the end,
cherry-picked directly from the upstream fix):

diff -Nru emacs-26.1+1/debian/.git-dpm emacs-26.1+1/debian/.git-dpm
--- emacs-26.1+1/debian/.git-dpm	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/.git-dpm	2021-01-10 19:22:48.0 -0600
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-face2676a9d5a13b40eaeecfb09a16e81364e916
-face2676a9d5a13b40eaeecfb09a16e81364e916
+7812b00398e73156c07be2ea2abe1dbf0153ccfe
+7812b00398e73156c07be2ea2abe1dbf0153ccfe
 511a2cebd6df0f71ec24b5939564fb58726ead84
 511a2cebd6df0f71ec24b5939564fb58726ead84
 emacs_26.1+1.orig.tar.xz
diff -Nru emacs-26.1+1/debian/changelog emacs-26.1+1/debian/changelog
--- emacs-26.1+1/debian/changelog	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/changelog	2021-01-10 19:22:48.0 -0600
@@ -1,3 +1,11 @@
+emacs (1:26.1+1-3.2+deb10u2~1.gbp7c5887) UNRELEASED; urgency=medium
+
+  ** SNAPSHOT build @7c5887c8ae064398fafa38b8fea4c5d500830d5f **
+
+  * UNRELEASED
+
+ -- Rob Browning   Sun, 10 Jan 2021 19:22:48 -0600
+
 emacs (1:26.1+1-3.2+deb10u1) buster; urgency=high
 
   * Update the EPLA packaging key (previous key expires 2019-09-23) via
diff -Nru emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch
--- emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/patches/0001-Prefer-usr-share-info-emacs.patch	2021-01-10 19:22:48.0 -0600
@@ -15,7 +15,7 @@
 index 8743b449976..14d62f7f1cb 100644
 --- a/lisp/info.el
 +++ b/lisp/info.el
-@@ -213,7 +213,8 @@ A header-line does not scroll with the rest of the buffer."
+@@ -213,7 +213,8 @@ Info-default-directory-list
  	  (nconc standard-info-dirs (list config-dir))
  	(cons config-dir standard-info-dirs
  (if (not (eq system-type 'windows-nt))
diff -Nru emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
--- emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch	2021-01-10 19:22:48.0 -0600
@@ -19,7 +19,7 @@
 index 9d16b59defd..d20431492a7 100644
 --- a/lisp/startup.el
 +++ b/lisp/startup.el
-@@ -434,6 +434,10 @@ Warning Warning!!!  Pure space overflow!!!Warning Warning
+@@ -434,6 +434,10 @@ tutorial-directory
:type 'directory
:initialize #'custom-initialize-delay)
  
@@ -30,7 +30,7 @@
  (defun normal-top-level-add-subdirs-to-load-path ()
"Recursively add all subdirectories of `default-directory' to `load-path'.
  More precisely, this uses only the subdirectories whose names
-@@ -1121,8 +1125,21 @@ please check its value")
+@@ -1121,8 +1125,21 @@ command-line
  ;; be loaded from site-run-file and wants to test if -q was given
  ;; should check init-file-user instead, since that is already set.
  ;; See cus-edit.el for an example.
diff -Nru emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
--- emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch	2021-01-10 19:22:48.0 -0600
@@ -253,7 +253,7 @@
 index 77e32848318..22516310692 100644
 --- a/lisp/help.el
 +++ b/lisp/help.el
-@@ -292,6 +292,14 @@ If that doesn't give a function, return nil."
+@@ -292,6 +292,14 @@ view-help-file
(goto-address-mode 1)
(goto-char (point-min)))
  
diff -Nru emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
--- emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2019-09-04 21:35:24.0 -0500
+++ emacs-26.1+1/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch	2021-01-10 19:22:48.0 -0600
@@ -15,7 +15,7 @@
 index 3a38b1d83c8..5d1248ac581 100644
 --- a/lisp/version.el
 +++ b/lisp/version.el
-@@ -62,7 +62,7 @@ Don't use this function in programs to choose actions according
+@@ -62,7 +62,7 @@ emacs-version
  to the system configuration; look at `system-configuration' instead."
(interactive "P")
(let ((version-string
diff -Nru emacs-26.1+1/debian/patches/0007-Kill-gpg-age