[emacs21-non-dfsg commit] 7458664146220bb40410eca2a9080e40db379273

[Jérôme Marant]

commit 7458664146220bb40410eca2a9080e40db379273
Author: Jérôme Marant <jerome at marant.org>
Date:   Wed Oct 4 16:05:06 2006 +0200

    Re-generate control file after modifying control.in

diff --git a/control b/control
index f23e9a9..8c970e7 100644
--- a/control
+++ b/control
@@ -4,13 +4,14 @@ Priority: optional
 Maintainer: Rob Browning <rlb at defaultvalue.org>
 Uploaders: Jerome Marant <jerome at debian.org>
 Build-Depends: texinfo, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 4)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 
 Package: emacs21-common-non-dfsg
 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