From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 25 Aug 2018 19:22:53 +0000 (-0500)
Subject: Add (>= 1:25) restriction to emacs metapackage dependencies
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~190
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f1a32b3f6f31ba93cf7ed05421547d9850f808e6;p=emacs.git

Add (>= 1:25) restriction to emacs metapackage dependencies

Without this it was possible to end up with two empty metapackages
installed instead of the expected metapackage and actual package.

Thanks to Shin Yoshida for reporting the problem and Sven Joachim for
noting the solution.

Closes: 906534
---

diff --git a/debian/control b/debian/control
index 1b8049f67f4..6d4a533ea20 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,9 @@ Standards-Version: 3.7.2
 
 Package: emacs
 Architecture: all
-Depends: emacs-gtk | emacs-lucid | emacs-nox, ${misc:Depends}
+Depends:
+  emacs-gtk (>= 1:25) | emacs-lucid (>= 1:25) | emacs-nox (>= 1:25),
+  ${misc:Depends}
 Description: GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
  This is a metapackage that will always depend on the latest
@@ -146,7 +148,7 @@ Package: emacs23
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-gtk
+Depends: emacs-gtk (>= 1:25)
 Description: GNU Emacs transitional package to emacs-gtk
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs23
@@ -157,7 +159,7 @@ Package: emacs23-lucid
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-lucid
+Depends: emacs-lucid (>= 1:25)
 Description: GNU Emacs transitional package to emacs-lucid
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs23
@@ -168,7 +170,7 @@ Package: emacs23-nox
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-nox
+Depends: emacs-nox (>= 1:25)
 Description: GNU Emacs transitional package to emacs-nox
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs23
@@ -179,7 +181,7 @@ Package: emacs24
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-gtk
+Depends: emacs-gtk (>= 1:25)
 Description: GNU Emacs transitional package to emacs-gtk
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs24
@@ -190,7 +192,7 @@ Package: emacs24-lucid
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-lucid
+Depends: emacs-lucid (>= 1:25)
 Description: GNU Emacs transitional package to emacs-lucid
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs24
@@ -201,7 +203,7 @@ Package: emacs24-nox
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-nox
+Depends: emacs-nox (>= 1:25)
 Description: GNU Emacs transitional package to emacs-nox
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs24
@@ -212,7 +214,7 @@ Package: emacs25
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-gtk
+Depends: emacs-gtk (>= 1:25)
 Description: GNU Emacs transitional package to emacs-gtk
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs25
@@ -223,7 +225,7 @@ Package: emacs25-lucid
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-lucid
+Depends: emacs-lucid (>= 1:25)
 Description: GNU Emacs transitional package to emacs-lucid
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs25
@@ -234,7 +236,7 @@ Package: emacs25-nox
 Section: oldlibs
 Priority: optional
 Architecture: all
-Depends: emacs-nox
+Depends: emacs-nox (>= 1:25)
 Description: GNU Emacs transitional package to emacs-nox
  GNU Emacs is the extensible self-documenting text editor.  This
  package is a transitional package to ensure that systems with emacs25