CVS: lunar/var/lib/lunar excluded,1.8,1.9

[sofar at lunar-linux.org]

Update of /var/cvs/lunar/lunar/var/lib/lunar
In directory dbguin.lunar-linux.org:/tmp/cvs-serv2543/var/lib/lunar

Modified Files:
	excluded 
Log Message:
Bugfix merge... including several bugfixes from theedge that needed to be merged back into lunar


Index: excluded
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/excluded,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- excluded	26 Jun 2003 15:23:20 -0000	1.8
+++ excluded	14 Sep 2003 14:31:19 -0000	1.9
@@ -1,11 +1,10 @@
 /boot/grub/menu.1st
 /dev
-/etc/X11/xdm/Xsession
 /etc/cron.daily
 /etc/cron.hourly
 /etc/cron.monthly
-/etc/cron.weekly
 /etc/crontab
+/etc/cron.weekly
 /etc/cups/certs
 /etc/cups/classes.conf
 /etc/cups/client.conf
@@ -18,18 +17,19 @@
 /etc/group
 /etc/group-
 /etc/hostname
-/etc/httpd/httpd.conf
 /etc/httpd/conf/httpd.conf
+/etc/httpd/httpd.conf
 /etc/inittab
 /etc/ld.so.cache
 /etc/ld.so.conf
 /etc/lftp.conf
 /etc/lilo.conf
 /etc/localtime
-/etc/named.conf
+/etc/lunar/local
 /etc/modules
 /etc/modules.conf
 /etc/mtab
+/etc/named.conf
 /etc/nsswitch.conf
 /etc/passwd
 /etc/passwd-
@@ -38,42 +38,53 @@
 /etc/procmailrc
 /etc/proftpd.conf
 /etc/protocols
-/etc/samba/SMBPASSWD
+/etc/samba/lmhosts
 /etc/samba/secrets.tdb
-/etc/samba/smbusers
 /etc/samba/smb.conf
-/etc/samba/lmhosts
-/etc/squid/squid.conf
+/etc/samba/SMBPASSWD
+/etc/samba/smbusers
 /etc/services
 /etc/shadow
 /etc/shadow-
+/etc/squid/squid.conf
 /etc/ssh
 /etc/ssl
 /etc/sudoers
 /etc/sysctl.conf
 /etc/syslog.conf
-/etc/lunar/local
 /etc/vsftpd.conf
-/etc/X11/xinit/xinitrc
+/etc/X11/fs/config
+/etc/X11/gdm/gdm.conf
+/etc/X11/xdm/Xsession
 /etc/X11/XF86Config
 /etc/X11/XftConfig
-/etc/X11/fs/config
+/etc/X11/xinit/xinitrc
 /etc/xinetd.conf
 /etc/yp.conf
 /home
 /lib/ld-linux.so.2
+/opt/lunar/gnome/2/share
+/opt/lunar/kde/2/share
 /proc
+/root/.distcc
 /tmp
-/usr/X11R6/lib/X11/xinit/xinitrc
-/usr/share/info/dir
-/var/lib/lunar/excluded
-/var/lib/lunar/protected
 /usr/lib/perl5/5.6.1/i586-linux-thread-multi/perllocal.pod
 /usr/lib/perl5/5.8.0/i686-linux-thread-multi/perllocal.pod
+/usr/share/fonts/truetype/fonts.dir
+/usr/share/info/dir
 /usr/src
-/opt/lunar/gnome/2/share
-/opt/lunar/kde/2/share
+/usr/X11R6/lib/X11/fonts/100dpi/fonts.dir
+/usr/X11R6/lib/X11/fonts/75dpi/fonts.dir
+/usr/X11R6/lib/X11/fonts/CID/fonts.dir
+/usr/X11R6/lib/X11/fonts/local/fonts.dir
+/usr/X11R6/lib/X11/fonts/misc/fonts.dir
+/usr/X11R6/lib/X11/fonts/Speedo/fonts.dir
+/usr/X11R6/lib/X11/fonts/TTF/fonts.dir
+/usr/X11R6/lib/X11/fonts/Type1/fonts.dir
+/usr/X11R6/lib/X11/xinit/xinitrc
 /var/cache
+/var/lib/lunar/excluded
+/var/lib/lunar/protected
 /var/lib/mysql
 /var/lock
 /var/log
@@ -87,13 +98,3 @@
 /var/state/dhcpd.leases~
 /var/tmp
 /var/yp
-/usr/share/fonts/truetype/fonts.dir
-/usr/X11R6/lib/X11/fonts/100dpi/fonts.dir
-/usr/X11R6/lib/X11/fonts/75dpi/fonts.dir
-/usr/X11R6/lib/X11/fonts/CID/fonts.dir
-/usr/X11R6/lib/X11/fonts/local/fonts.dir
-/usr/X11R6/lib/X11/fonts/misc/fonts.dir
-/usr/X11R6/lib/X11/fonts/Speedo/fonts.dir
-/usr/X11R6/lib/X11/fonts/TTF/fonts.dir
-/usr/X11R6/lib/X11/fonts/Type1/fonts.dir
-/etc/X11/gdm/gdm.conf