X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fcontrol;h=12574923704af3873f6c3620ae67998c66da6f9c;hb=f3cf1fd97d0ca213b7630ef5140da7fad26fd610;hp=8ca8e590970f9c5909d2238daa11eaabbd6cc6f6;hpb=59f49927fd6d7bd826ccc5dd4b2a0718fde67c0e;p=grml-etc-core.git

diff --git a/debian/control b/debian/control
index 8ca8e59..1257492 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: grml-etc-core
 Section: grml
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
-Build-Depends: debhelper (>= 5), txt2tags
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 5),
+               txt2tags
+Standards-Version: 3.9.6
 Homepage: http://git.grml.org/?p=grml-etc-core.git
 Vcs-git: git://git.grml.org/grml-etc-core.git
 Vcs-Browser: http://git.grml.org/?p=grml-etc-core.git
@@ -12,13 +13,16 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-etc-core
 Architecture: all
-Conflicts: grml-etc (<< 0.8-11), grml-autoconfig (<< 0.5-7), grml-scripts (<< 0.8-27)
+Conflicts: grml-autoconfig (<< 0.5-7),
+           grml-etc (<< 0.8-11),
+           grml-scripts (<< 0.8-27)
+Replaces: vim-common
 Depends: vim | nvi | editor
 Recommends: grml-scripts-core
 Pre-Depends: zsh
-Description: core ecetera files for the grml system
+Description: core etcetera files for the Grml system
  This package includes some /etc files for the
- grml system. Whereas the main grml-etc package is
- meant for use on grml systems this package can be
+ Grml system. Whereas the main grml-etc package is
+ meant for use on Grml systems this package can be
  used on plain Debian (stable/testing/unstable)
  systems as well.