From: Sean Whitton <spwhitton@spwhitton.name>
Date: Thu, 6 Mar 2025 10:44:44 +0000 (+0800)
Subject: Add "Breaks: dh-elpa-helper (<< 2.1.7)" to flavour binary packages
X-Git-Tag: archive/raspbian/1%30.1+1-4+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5aa5e5fc7f2093abf4922efb1379494f31d9962;p=emacs.git

Add "Breaks: dh-elpa-helper (<< 2.1.7)" to flavour binary packages
---

diff --git a/debian/changelog b/debian/changelog
index ad3bc27fa18..5c850a2e14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+emacs (1:30.1+1-4) unstable; urgency=medium
+
+  * Add "Breaks: dh-elpa-helper (<< 2.1.7)" to flavour binary packages.
+    Certain addons fail to byte-compile against Emacs 30 unless the
+    newer dh-elpa-helper is made available first.
+    It is believed, but not confirmed, that this is due to how the
+    latest dh-elpa-helper compiles addons using byte-recompile-directory
+    instead of batch-byte-compile.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 06 Mar 2025 18:44:41 +0800
+
 emacs (1:30.1+1-3) unstable; urgency=high
 
   * Disable server-tests/server-force-stop/keeps-frames on riscv64.
diff --git a/debian/control b/debian/control
index b6e9c094ce6..86cd8976b46 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Recommends: fonts-noto-color-emoji
 Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-gtk, emacs-pgtk, emacs-nox
 Replaces: emacs-gtk, emacs-pgtk, emacs-nox, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2), dh-elpa-helper (<< 2.1.7)
 Description: GNU Emacs editor (with Lucid GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with support for a graphical user
@@ -99,7 +99,7 @@ Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-gtk, emacs-pgtk, emacs-lucid
 Replaces: emacs-gtk, emacs-pgtk, emacs-lucid, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2), dh-elpa-helper (<< 2.1.7)
 Description: GNU Emacs editor (without GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs compiled without support for X,
@@ -117,7 +117,7 @@ Recommends: fonts-noto-color-emoji
 Suggests: emacs-common-non-dfsg, emacs-editing-major-modes
 Conflicts: emacs-pgtk, emacs-lucid, emacs-nox
 Replaces: emacs-pgtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2)
-Breaks: emacs-bin-common (<< 1:29.2)
+Breaks: emacs-bin-common (<< 1:29.2), dh-elpa-helper (<< 2.1.7)
 Description: GNU Emacs editor (with GTK+ GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with a graphical user interface
@@ -146,6 +146,7 @@ Replaces:
 Breaks:
  emacs-bin-common (<< 1:29.2),
  emacs-common (<< 1:29.3+1-3~),
+ dh-elpa-helper (<< 2.1.7)
 Description: GNU Emacs editor (with GTK+ Wayland GUI support)
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains a version of Emacs with a graphical user interface