From d004436dc848800c9d65b90e39c39836c4d44cdf Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 1 Jan 2000 17:09:26 +0000
Subject: no_comment

---
 perl-install/share/compssList  |  6 +++---
 perl-install/share/compssUsers | 42 +++++++++++++++++++++---------------------
 perl-install/share/list        |  2 ++
 perl-install/share/po/Makefile |  2 +-
 4 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'perl-install/share')

diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index e0a058fca..384ad650a 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -789,9 +789,9 @@ xtrojka                                       51     0    45
 xv                                            33     0    27
 xwpick                                        55     0    49
 xxgdb                                         53     0    47
-ypbind                                         0    35     0
-ypserv                                         0    80    13
-yp-tools                                       0    70    13
+ypbind                                         0    10     0
+ypserv                                         0    10     0
+yp-tools                                       0    10     0
 ytalk                                         21     0    18
 yudit                                         50     0    38
 zgv                                           15     0    13
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index be0bc6a93..5b8b28b2d 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -4,20 +4,20 @@ Graphics Manipulation
 
 KDE
 	kde
-	XFree86
-	XFree86-75dpi-fonts	
+	+XFree86
+	+XFree86-75dpi-fonts	
 
 Gnome
 	gnome
-	enlightenment
-	gmc
-	XFree86
-	XFree86-75dpi-fonts
+	+enlightenment
+	+gmc
+	+XFree86
+	+XFree86-75dpi-fonts
 
 Other window managers
 	window-managers:window-managers
-	XFree86
-	XFree86-75dpi-fonts	
+	+XFree86
+	+XFree86-75dpi-fonts	
 
 Mail/WWW/News Tools
 	network:web
@@ -26,8 +26,8 @@ Mail/WWW/News Tools
 
 Communication facilities
 	communications
-	network:ftp:x11
-	network:irc&co:x11
+	network:ftp
+	network:irc&co
 
 Office
 	daemons:database
@@ -36,7 +36,7 @@ Office
 	productivity
 
 Multimedia Support
-	configuration:sound:console
+	configuration:sound
 	multimedia
 	daemons:sound
 
@@ -48,27 +48,27 @@ System configuration
 	kde:administration:utilities
 
 Web Server
- 	apache
- 	mod_perl
- 	mod_php3
+ 	+apache
+ 	+mod_perl
+ 	+mod_php3
 
-Network Management Workstation	
+Network Management Workstation
 	network:tools
 # above is daemons:network *without* sendmail and http
 	daemons:network:base
 	daemons:network:ftp
 	daemons:network:nfs
 	daemons:network:telnet
-	BeroList
-	comsat
-	postfix
-	imap
+	+BeroList
+	+comsat
+	+postfix
+	+imap
 
 Documentation
 	documentation:languages:en
 	documentation:misc
-	documentation:tools:console
-	documentation:tools:x11
+	documentation:tools
+	documentation:tools
 
 Databases
 	database
diff --git a/perl-install/share/list b/perl-install/share/list
index d9329a80d..a878a847c 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -6,6 +6,7 @@
 /lib/libresolv.so.2
 /etc/protocols
 /sbin/fdisk
+/sbin/ifport
 /sbin/insmod
 /sbin/mkraid
 /sbin/rmmod
@@ -67,5 +68,6 @@
 /usr/X11R6/bin/XF86_FBDev
 /usr/X11R6/bin/XF86_VGA16
 /usr/X11R6/bin/xmodmap
+/usr/X11R6/lib/modules/xf86Wacom.so
 /usr/sbin/ext2resize
 /usr/sbin/rescuept
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 091a87d6a..f2e1ef2c9 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -24,5 +24,5 @@ DrakX.pot: $(PMSFILES)
 	rm $(PMSCFILES)
 
 $(PMSCFILES): %_.c: %
-	perl -pe 's|^(__?\()| $$1|; s|#(.*)|/*\1*\/|; s|$$|\\n\\|' $< > $@
+	perl -pe 's|^(__?\()| $$1|; s|#([^+].*)|/*\1*\/|; s|$$|\\n\\|' $< > $@
 
-- 
cgit v1.2.1