projects
/
grml-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
d3b417c
)
Update grml-etc conflict due to configfile move
author
Ulrich Dangel
<mru@grml.org>
Sun, 11 Dec 2011 16:43:52 +0000
(17:43 +0100)
committer
Ulrich Dangel
<mru@grml.org>
Sun, 11 Dec 2011 16:43:52 +0000
(17:43 +0100)
debian/control
patch
|
blob
|
history
diff --git
a/debian/control
b/debian/control
index
0705c0c
..
bab9b05
100644
(file)
--- 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.1
4)
+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