Have emacs-{gtk,lucid,nox} replace all the related emacs25 packages

Add "emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25)"
to the "Replaces:" for emacs-gtk, emacs-lucid, and emacs-nox to avoid
conflicts over /usr/share/emacs/25.2/etc/DOC while unpacking.

Thanks to Axel Beckert for reporting the problem and Adrian Bunk and
Sven Joachim for help with the solution.

Closes: 904957

diff --git a/debian/control b/debian/control
index c324890996570ccb539d27501d587111822debac..1b8049f67f49e90c79eb82026b7c662b2a28b091 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,8 @@ Depends:
 Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs-common-non-dfsg
 Conflicts: emacs-gtk, emacs-nox
-Replaces: emacs-gtk, emacs-nox
+Replaces: emacs-gtk, emacs-nox,
+  emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25)
 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
@@ -70,7 +71,8 @@ Depends:
 Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs-common-non-dfsg
 Conflicts: emacs-gtk, emacs-lucid
-Replaces: emacs-gtk, emacs-lucid
+Replaces: emacs-gtk, emacs-lucid,
+  emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25)
 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,
@@ -95,7 +97,8 @@ Depends:
 Provides: emacs, emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs-common-non-dfsg
 Conflicts: emacs-lucid, emacs-nox
-Replaces: emacs-lucid, emacs-nox
+Replaces: emacs-lucid, emacs-nox,
+  emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), emacs-nox (<< 1:25)
 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