aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--mandrake_desk.spec8
-rwxr-xr-xsbin/kdeDesktopCleanup2
-rw-r--r--window-managers37
4 files changed, 49 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index be2faae..acbfb92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-12-24 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+
+ * window-managers: various change from jerome.
+
1999-12-23 Pablo Saratxga <pablo@mandrakesoft.com>
* gnome/mandrake.links,gnome/mandrake.links.sh,mandrake_desk.spec:
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index cdfb1cc..8ef2970 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,7 +1,7 @@
# DO NOT MODIFY THE VERSION HERE, modify in the CVS
%define version 1.0.1
#
-%define release 2mdk
+%define release 3mdk
%define name mandrake_desk
Summary: The Desktop configuration files for Linux Mandrake.
@@ -66,10 +66,16 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/desktop-links/mandrake.links
%changelog
+* Fri Dec 24 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+- window-managers: various change from (jerome).
+- kdelnk/Kppp.kdlnk: (new).
+- icons/user-*: added user icons for kdm (pixel).
+- gnome/*: sync with kde desktop. (pablo).
* Tue Dec 23 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
- included the mandrake.links* files formerly in gmc package
+>>>>>>> 1.11
* Wed Dec 22 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com>
- sbin/fndSession: new script with the new chksession.
- sbin/chksession: a new greatest hit.
diff --git a/sbin/kdeDesktopCleanup b/sbin/kdeDesktopCleanup
index 0f6051b..866c5ec 100755
--- a/sbin/kdeDesktopCleanup
+++ b/sbin/kdeDesktopCleanup
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# (c) MandrakeSoft, Pixel <pixel@mandrakesoft.com>
+# Copyright under GPL
@dirs = (qw(/etc/skel /root), glob("/home/*"));
@path = split ":", "/sbin:/usr/sbin:/usr/X11R6/bin:/bin:/usr/bin";
diff --git a/window-managers b/window-managers
index 7c7d62d..ef3bf30 100644
--- a/window-managers
+++ b/window-managers
@@ -15,7 +15,7 @@ exec gnome-session
--@@--
NAME=WindowMaker
ICON=WindowMaker.xpm
-EXEC=/usr/bin/wmaker
+EXEC=/usr/X11R6/bin/wmaker
DESC=Another NeXt like Window-Manager
SCRIPT:
[ -f $HOME/GNUstep/Defaults/WindowMaker ] || {
@@ -23,6 +23,22 @@ SCRIPT:
}
exec /usr/X11R6/bin/wmaker
--@@--
+NAME=Enligntenment
+DESC=The enlightened window manager
+EXEC=/usr/bin/enlightenment
+SCRIPT:
+[ -f $HOME ] || {
+/usr/bin/enlightenment.install
+}
+exec /usr/bin/enlightenment
+--@@--
+NAME=BlackBox
+ICON=BlackBox.xpm
+EXEC=/usr/X11R6/bin/blackbox
+DESC=A Light but nice looking window manager
+SCRIPT:
+exec /usr/X11R6/bin/blackbox
+--@@--
NAME=AfterStep
ICON=AfterStep.xpm
EXEC=/usr/X11R6/bin/afterstep
@@ -30,6 +46,12 @@ DESC=A NeXt like Window-Manager
SCRIPT:
exec /usr/X11R6/bin/afterstep
--@@--
+NAME=Fvwm2
+EXEC=/usr/X11R6/bin/fvwm2
+DESC=A popular window manager
+SCRIPT:
+exec /usr/X11R6/bin/fvwm2
+--@@--
NAME=Icewm
ICON=icewm.xpm
EXEC=/usr/X11R6/bin/icewm
@@ -37,6 +59,19 @@ DESC=A Light Window-Manager
SCRIPT:
exec /usr/X11R6/bin/icewm
--@@--
+NAME=Fvwm1
+EXEC=/usr/X11R6/bin/fvwm
+DESC=A very stable and light window manager
+SCRIPT:
+exec /usr/X11R6/bin/fvwm
+--@@--
+NAME=Xfce
+EXEC=/usr/bin/xfwm
+DESC=A CDE like window manager
+SCRIPT:
+[ "x$XFCE_DATA" = "x" ] && XFCE_DATA=/usr/share/xfce
+exec /usr/bin/xfwm
+--@@--
NAME=AnotherLevel
ICON=AnotherLevel.xpm
DESC=The AnotherLevel desktop