[emacs21-non-dfsg commit] 56bb90c276b5bae035abc6150c0079c876c090a5

[Jérôme Marant]

commit 56bb90c276b5bae035abc6150c0079c876c090a5
Author: Jérôme Marant <jerome at marant.org>
Date:   Wed Oct 4 23:15:49 2006 +0200

    Make emacs21-common-non-dfsg replace previous emacs21-common in order
    to prevent dpkg from halting on upgrades

diff --git a/control b/control
index 8c970e7..62039e2 100644
--- a/control
+++ b/control
@@ -12,6 +12,7 @@ Priority: optional
 Architecture: all
 Depends: ${shlibs:Depends}
 Conflicts: emacs21-common (<< 21.4a+1)
+Replaces: 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
diff --git a/control.in b/control.in
index cda9169..da4a35c 100644
--- a/control.in
+++ b/control.in
@@ -12,6 +12,7 @@ Priority: optional
 Architecture: all
 Depends: ${shlibs:Depends}
 Conflicts: emacs21-common (<< 21.4a+1)
+Replaces: 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