[emacs21 commit] 8b7a1d2ba588096d9e7b55149632425b691c3f31

[Jérôme Marant]

commit 8b7a1d2ba588096d9e7b55149632425b691c3f31
Author: Jérôme Marant <jerome at marant.org>
Date:   Thu Oct 26 22:42:31 2006 +0200

    * Fix suggests non-DFSG package in emacs21-common package section
    
    * Add suggests on emacs21-common-non-dfsg to both emacs21 and emacs21-nox

diff --git a/changelog b/changelog
index f851440..5e77647 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+emacs21 (21.4a+1-2) unstable; urgency=low
+
+  * Make both emacs21 and emacs21-nox packages suggest non-DFSG
+    packages and fix erroneous emacs21-common dependency on it
+    [Jérôme Marant]
+    - debian/control.in
+    - debian/control
+
+ -- Jerome Marant <jerome at debian.org>  Thu, 26 Oct 2006 22:36:33 +0200
+
 emacs21 (21.4a+1-1) unstable; urgency=low
 
   * In accordance with the recent General Resolution
diff --git a/control b/control
index d80c9f1..1a02468 100644
--- a/control
+++ b/control
@@ -23,6 +23,7 @@ Priority: optional
 Architecture: any
 Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs21-common-non-dfsg
 Conflicts: emacs21-nox, w3-el
 Replaces: emacs21-nox
 Description: The GNU Emacs editor
@@ -34,6 +35,7 @@ Priority: optional
 Architecture: any
 Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: emacs21, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs21-common-non-dfsg
 Conflicts: emacs21, w3-el
 Replaces: emacs21
 Description: The GNU Emacs editor (without X support)
@@ -56,7 +58,7 @@ Section: editors
 Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
-Suggests: emacs21-el, emacs21-non-dfsg
+Suggests: emacs21-el, emacs21-common-non-dfsg
 Conflicts: emacs21-el (<< ${Source-Version}), w3-el
 Replaces: emacs21 (<< 21.2-4)
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
diff --git a/control.in b/control.in
index 0ba3b32..b12bdae 100644
--- a/control.in
+++ b/control.in
@@ -23,6 +23,7 @@ Priority: optional
 Architecture: any
 Depends: emacs at MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs at MAJOR_VERSION@-common-non-dfsg
 Conflicts: emacs at MAJOR_VERSION@-nox, w3-el
 Replaces: emacs at MAJOR_VERSION@-nox
 Description: The GNU Emacs editor
@@ -34,6 +35,7 @@ Priority: optional
 Architecture: any
 Depends: emacs at MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: emacs at MAJOR_VERSION@, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs at MAJOR_VERSION@-common-non-dfsg
 Conflicts: emacs at MAJOR_VERSION@, w3-el
 Replaces: emacs at MAJOR_VERSION@
 Description: The GNU Emacs editor (without X support)
@@ -56,7 +58,7 @@ Section: editors
 Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
-Suggests: emacs at MAJOR_VERSION@-el, emacs at MAJOR_VERSION@-non-dfsg
+Suggests: emacs at MAJOR_VERSION@-el, emacs at MAJOR_VERSION@-common-non-dfsg
 Conflicts: emacs at MAJOR_VERSION@-el (<< ${Source-Version}), w3-el
 Replaces: emacs21 (<< 21.2-4)
 Description: The GNU Emacs editor's shared, architecture independent infrastructure