From 3a041e2a3ef3017db72fc373758d496f248333c2 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <jeremy@katzbox.net>
Date: Mon, 13 Mar 2006 18:33:21 +0000
Subject: [PATCH] merged

---
 comps-fe5.xml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/comps-fe5.xml b/comps-fe5.xml
index 38d3f1bd..371c9e8d 100644
--- a/comps-fe5.xml
+++ b/comps-fe5.xml
@@ -99,16 +99,22 @@
     <packagelist>
         <packagereq type="optional">blacs</packagereq>
         <packagereq type="optional">blas</packagereq>
+        <packagereq type="optional">cernlib-utils</packagereq>
         <packagereq type="optional">galculator</packagereq>
+        <packagereq type="optional">hmmer</packagereq>
+        <packagereq type="optional">kst</packagereq>
+        <packagereq type="optional">lagan</packagereq>
         <packagereq type="optional">lapack</packagereq>
         <packagereq type="optional">numpy</packagereq>
         <packagereq type="optional">octave</packagereq>
         <packagereq type="optional">qalculate-gtk</packagereq>
         <packagereq type="optional">qalculate-kde</packagereq>
         <packagereq type="optional">qcad</packagereq>
+	<packagereq type="optional">qucs</packagereq>
         <packagereq type="optional">R</packagereq>
         <packagereq type="optional">R-gnomeGUI</packagereq>
         <packagereq type="optional">scalapack</packagereq>
+        <packagereq type="optional">SIBsim4</packagereq>
     </packagelist>
   </group>
 
@@ -146,6 +152,8 @@
         <packagereq type="optional">gtweakui</packagereq>
         <packagereq type="optional">istanbul</packagereq>
         <packagereq type="optional">lock-keys-applet</packagereq>
+	<packagereq type="optional">nautilus-flac-converter</packagereq>
+	<packagereq type="optional">nautilus-image-converter</packagereq>
         <packagereq type="optional">sabayon</packagereq>
         <packagereq type="optional">seahorse</packagereq>
         <packagereq type="optional">smeg</packagereq>
@@ -205,6 +213,7 @@
         <packagereq type="optional">lacewing</packagereq>
         <packagereq type="optional">lincity-ng</packagereq>
         <packagereq type="optional">lmarbles</packagereq>
+		<packagereq type="optional">lucidlife</packagereq>
         <packagereq type="optional">Maelstrom</packagereq>
         <packagereq type="optional">nethack</packagereq>
         <packagereq type="optional">nethack-vultures</packagereq>
@@ -225,6 +234,7 @@
         <packagereq type="optional">uqm</packagereq>
         <packagereq type="optional">viruskiller</packagereq>
         <packagereq type="optional">wesnoth</packagereq>
+        <packagereq type="optional">worminator</packagereq>
         <packagereq type="optional">xboard</packagereq>
         <packagereq type="optional">xpilot-ng</packagereq>
         <packagereq type="optional">xplanet</packagereq>
@@ -240,6 +250,7 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="optional">drgeo</packagereq>
+	<packagereq type="optional">drgeo-doc</packagereq>
         <packagereq type="optional">gperiodic</packagereq>
         <packagereq type="optional">stellarium</packagereq>
         <packagereq type="optional">tuxtype2</packagereq>
@@ -307,6 +318,7 @@
         <packagereq type="optional">digikam</packagereq>
         <packagereq type="optional">fontforge</packagereq>
         <packagereq type="optional">fyre</packagereq>
+        <packagereq type="optional">grads</packagereq>
         <packagereq type="optional">gpp</packagereq>
         <packagereq type="optional">gqview</packagereq>
         <packagereq type="optional">graphviz</packagereq>
@@ -366,6 +378,7 @@
         <packagereq type="optional">gnotime</packagereq>
         <packagereq type="optional">gnumeric</packagereq>
         <packagereq type="optional">gourmet</packagereq>
+	<packagereq type="optional">gramps</packagereq>
         <packagereq type="optional">grisbi</packagereq>
         <packagereq type="optional">gsview</packagereq>
         <packagereq type="optional">koffice-suite</packagereq>
@@ -374,8 +387,8 @@
         <packagereq type="optional">notecase</packagereq>
         <packagereq type="optional">notemeister</packagereq>
         <packagereq type="optional">MagicPoint</packagereq>
+        <packagereq type="optional">pybliographer</packagereq>
         <packagereq type="optional">qcad</packagereq>
-        <packagereq type="optional">xfcalendar</packagereq>
     </packagelist>
   </group>
 
@@ -402,8 +415,11 @@
         <packagereq type="optional">graveman</packagereq>
         <packagereq type="optional">grip</packagereq>
         <packagereq type="optional">kover</packagereq>
+        <packagereq type="optional">libvisual-plugins</packagereq>
         <packagereq type="optional">soundconverter</packagereq>
         <packagereq type="optional">soundtracker</packagereq>
+	<packagereq type="optional">tagtool</packagereq>
+	<packagereq type="optional">ushare</packagereq>
         <packagereq type="optional">xmms</packagereq>
         <packagereq type="optional">xmms-cdread</packagereq>
         <packagereq type="optional">xmms-flac</packagereq>
@@ -423,6 +439,7 @@
         <packagereq type="optional">apt</packagereq>
         <packagereq type="optional">cfengine</packagereq>
 	<packagereq type="optional">cfs</packagereq>
+	<packagereq type="optional">crack</packagereq>
 	<packagereq type="optional">dkms</packagereq>
         <packagereq type="optional">epylog</packagereq>
         <packagereq type="optional">fuse</packagereq>
@@ -433,7 +450,9 @@
         <packagereq type="optional">ibmonitor</packagereq>
         <packagereq type="optional">lirc</packagereq>
         <packagereq type="optional">moodss</packagereq>
+        <packagereq type="optional">moomps</packagereq>
         <packagereq type="optional">nagios</packagereq>
+        <packagereq type="optional">nfswatch</packagereq>
         <packagereq type="optional">rdiff-backup</packagereq>
         <packagereq type="optional">sabayon</packagereq>
         <packagereq type="optional">shorewall</packagereq>
@@ -474,6 +493,7 @@
         <packagereq type="optional">ircd-hybrid</packagereq>
         <packagereq type="optional">jabberd</packagereq>
         <packagereq type="optional">kannel</packagereq>
+	<packagereq type="optional">ushare</packagereq>
     </packagelist>
   </group>
 
@@ -510,6 +530,7 @@
         <packagereq type="optional">apachetop</packagereq>
         <packagereq type="optional">awstats</packagereq>
         <packagereq type="optional">boa</packagereq>
+        <packagereq type="optional">dap-server-cgi</packagereq>
         <packagereq type="optional">lighttpd</packagereq>
         <packagereq type="optional">lighttpd-fastcgi</packagereq>
         <packagereq type="optional">mediawiki</packagereq>
@@ -564,6 +585,7 @@
         <packagereq type="optional">xfce4-toys</packagereq>
         <packagereq type="optional">xfwm4-themes</packagereq>
       <packagereq type="default">xfwm4-themes</packagereq>
+        <packagereq type="optional">xfcalendar</packagereq>
     </packagelist>
   </group>
 
@@ -629,6 +651,7 @@
       <packagereq type="optional">aterm</packagereq>
       <packagereq type="optional">fonttools</packagereq>
       <packagereq type="optional">rxvt</packagereq>
+      <packagereq type="optional">workrave</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
     </packagelist>
   </group>
@@ -663,6 +686,16 @@
     </packagelist>
   </group>
 
+  <group>
+    <id>web-development</id>
+    <name>Web Development</name>
+    <description>These packages are helpful when developing web applications or web pages.</description>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+    </packagelist>
+  </group>
+
   <group>
     <id>admin-tools</id>
     <name>Administration Tools</name>
@@ -739,6 +772,7 @@
     <display_order>70</display_order>
     <grouplist>
       <groupid>xfce-software-development</groupid>
+      <groupid>web-development</groupid>
     </grouplist>
   </category>
 
@@ -751,4 +785,4 @@
       <groupid>network-server</groupid>
     </grouplist>
   </category>
-</comps>
+</comps>
\ No newline at end of file