Update grml-etc conflict due to configfile move

[grml-desktop.git] / debian / control

diff --git a/debian/control b/debian/control
index 7f42549..bab9b05 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-desktop
 Architecture: all
-Depends: grml-scripts (>= 1.1.18), moblin-icon-theme
+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