From: Ulrich Dangel <mru@grml.org>
Date: Sun, 11 Dec 2011 16:43:52 +0000 (+0100)
Subject: Update grml-etc conflict due to configfile move
X-Git-Tag: v0.3.12~5
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;ds=inline;h=b001ef62c19bcc1f89b502ba2535dcb319e4e8c9;p=grml-desktop.git

Update grml-etc conflict due to configfile move
---

diff --git a/debian/control b/debian/control
index 0705c0c..bab9b05 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, hsetroot
 Recommends: fluxbox
 Suggests: idesk, fvwm | fvwm2 | fvwm-crystal, awesome, pekwm
-Conflicts: grml-etc (<< 0.9.14)
+Conflicts: grml-etc (<= 1.3.4)
 Description: configuration files for the X desktop at grml
  This package provides several configuration files for
  different tools and window managers used at Grml. The