[emacs-debian commit] 65ef24a05058e0e14cc041cc4319b1f0c671f88b

[Jérôme Marant]

commit 65ef24a05058e0e14cc041cc4319b1f0c671f88b
Author: Jérôme Marant <jerome at marant.org>
Date:   Wed Oct 4 14:50:06 2006 +0200

    Make emacs21-common-non-dfsg conflict with emacs21-common (<< 21.4a+1)
    since non-dfsg files from previous emacs21-common are moved to
    emacs21-common-non-dfsg

diff --git a/control.in b/control.in
index 10c09dc..0a8778c 100644
--- a/control.in
+++ b/control.in
@@ -11,6 +11,7 @@ Section: editors
 Priority: optional
 Architecture: all
 Depends: ${shlibs:Depends}
+Conflicts: emacs21-common (<< 21.4a+1)
 Description: GNU Emacs shared, architecture independent, non-DFSG items
  GNU Emacs is the extensible self-documenting text editor.  This
  package contains the architecture independent infrastructure that is