From: Ulrich Dangel <mru@grml.org>
Date: Mon, 18 Apr 2011 21:11:35 +0000 (+0200)
Subject: Revert "Depend on grml-scripts-core instead of grml-scripts."
X-Git-Tag: v0.3.89~5
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=6ab101453ca329e468e904b87852a5bd83f0b712;hp=72b956de5d656488e7c5841e11242e6faf6483e2;p=grml-etc-core.git

Revert "Depend on grml-scripts-core instead of grml-scripts."

This reverts commit 72b956de5d656488e7c5841e11242e6faf6483e2.
---

diff --git a/debian/control b/debian/control
index d33f5a7..848884d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.grml.org/?p=grml-etc-core.git
 
 Package: grml-etc-core
 Architecture: all
-Conflicts: grml-etc (<< 0.8-11), grml-autoconfig (<< 0.5-7), grml-scripts-core (<< 0.8-27)
+Conflicts: grml-etc (<< 0.8-11), grml-autoconfig (<< 0.5-7), grml-scripts (<< 0.8-27)
 Depends: vim | nvi | editor
 Pre-Depends: zsh
 Description: core ecetera files for the grml system