Bug#1036037: unblock: emacs/1:28.2+1-15

[Rob Browning <rlb@defaultvalue.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: emacs@packages.debian.org
Control: affects -1 + src:emacs

Please unblock package emacs

The only changes are two bug fixes, one for a file conflict with
bullseye emacs-bin-common and one for a conflict with older elpa-cider:

  https://bugs.debian.org/1034941
  https://bugs.debian.org/1035781

diff -Nru emacs-28.2+1/debian/changelog emacs-28.2+1/debian/changelog
--- emacs-28.2+1/debian/changelog	2023-04-01 22:38:56.000000000 -0500
+++ emacs-28.2+1/debian/changelog	2023-05-13 15:17:27.000000000 -0500
@@ -1,3 +1,16 @@
+emacs (1:28.2+1-15) unstable; urgency=medium
+
+  * emacs-common: add breaks/replaces emacs-bin-common (<< 1:28) since the
+    emacs.service file moved from emacs-bin-common to emacs-common.
+    Thanks to Helmut Grohne for reporting the problem and Andreas Beckmann
+    for providing and testing the fix. (Closes: 1034941)
+
+  * emacs-common: add breaks elpa-cider (<< 0.19.0+dfsg-4~).  Thanks to
+    Andreas Beckmann for reporting the problem and providing and testing
+    the fix. (Closes: 1035781)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 13 May 2023 15:17:27 -0500
+
 emacs (1:28.2+1-14) unstable; urgency=medium
 
   * Fix gnus nnml crash on some invalid headers.  Add
diff -Nru emacs-28.2+1/debian/control emacs-28.2+1/debian/control
--- emacs-28.2+1/debian/control	2023-03-31 13:22:31.000000000 -0500
+++ emacs-28.2+1/debian/control	2023-05-13 14:31:35.000000000 -0500
@@ -142,7 +142,9 @@
  apel (<< 10.8+0.20120427-4),
  edb (<< 1.32),
  egg (<< 4.2.0-2),
+ elpa-cider (<< 0.19.0+dfsg-4~),
  emacs (<< 1:25),
+ emacs-bin-common (<< 1:28),
  emacs-gtk (<< 1:25),
  emacs-lucid (<< 1:25),
  emacs-nox (<< 1:25),
@@ -159,7 +161,9 @@
  emacs24-nox,
  emacs25,
  emacs25-lucid,
- emacs25-nox,
+ emacs25-nox
+Replaces:
+ emacs-bin-common (<< 1:28)
 Description: GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

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