--- ./scripts/pkgorder 2006-05-18 00:09:50.134726080 +0300
+++ /pkgorder 2006-05-18 00:09:51.774762776 +0300
-@@ -156,27 +156,27 @@
+@@ -166,30 +166,30 @@
ds = PackageOrderer(arch=arch)
ds.setup(fn=config, excludes=options.excludeList, root = testpath)
-- addGroups(ds, ["Core", "Base", "Text-based Internet"])
--
-- addGroups(ds, ["X Window System", "Dialup Networking Support",
-- "Graphical Internet", "Editors",
-- "Graphics", "GNOME Desktop Environment", "Sound and Video",
-- "Printing Support", "Dialup Networking Support"])
--
-- addGroups(ds, ["Office/Productivity", "Engineering and Scientific",
-- "Authoring and Publishing", "Games and Entertainment"])
+- addGroups(ds, ["core", "base", "text-internet"])
++# addGroups(ds, ["core", "base", "text-internet"])
+
+ # hack, hack, hack... make sure iscsi ends up on disc1 (#208832)
+- printMatchingPkgs("iscsi-*")
++# printMatchingPkgs("iscsi-*")
+
+- addGroups(ds, ["base-x", "dial-up",
+- "graphical-internet", "editors",
+- "graphics", "gnome-desktop", "sound-and-video",
+- "printing"])
-
-- addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
-- "Server Configuration Tools", "DNS Name Server",
-- "Windows File Server", "Administration Tools"])
+- addGroups(ds, ["office", "engineering-and-scientific",
+- "authoring-and-publishing", "games"])
-
-- addGroups(ds, ["KDE (K Desktop Environment)", "Development Tools",
-- "GNOME Software Development", "Eclipse",
-- "Java Development", "KDE Software Development",
-- "PostgreSQL Database", "Mail Server",
-- "Legacy Network Server"])
+- addGroups(ds, ["web-server", "ftp-server", "sql-server",
+- "mysql", "server-cfg", "dns-server",
+- "smb-server", "admin-tools"])
-
-- addGroups(ds, ["News Server", "Legacy Software Development"])
-+# addGroups(ds, ["Base", "Networking"])
-+#
-+# addGroups(ds, ["X Window System", "Dialup Networking Support",
-+# "Graphical Internet", "Editors",
-+# "Graphics", "GNOME Desktop Environment", "Sound and Video",
-+# "Printing Support", "Dialup Networking Support"])
-+#
-+# addGroups(ds, ["Office/Productivity", "Engineering and Scientific",
-+# "Authoring and Publishing", "Games and Entertainment"])
-+#
-+# addGroups(ds, ["Web Server", "FTP Server", "MySQL Database",
-+# "Server Configuration Tools", "DNS Name Server",
-+# "Windows File Server", "Administration Tools"])
-+#
-+# addGroups(ds, ["KDE (K Desktop Environment)", "Development Tools",
-+# "GNOME Software Development", "Eclipse",
-+# "Java Development", "KDE Software Development",
-+# "PostgreSQL Database", "Mail Server",
-+# "Legacy Network Server"])
-+#
-+# addGroups(ds, ["News Server", "Legacy Software Development"])
+- addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
+- "gnome-software-development", "eclipse",
+- "x-software-development",
+- "java-development", "kde-software-development",
+- "mail-server", "network-server", "legacy-network-server"])
++# addGroups(ds, ["base-x", "dial-up",
++# "graphical-internet", "editors",
++# "graphics", "gnome-desktop", "sound-and-video",
++# "printing"])
++
++# addGroups(ds, ["office", "engineering-and-scientific",
++# "authoring-and-publishing", "games"])
++
++# addGroups(ds, ["web-server", "ftp-server", "sql-server",
++# "mysql", "server-cfg", "dns-server",
++# "smb-server", "admin-tools"])
++
++# addGroups(ds, ["kde-desktop", "development-tools", "development-libs",
++# "gnome-software-development", "eclipse",
++# "x-software-development",
++# "java-development", "kde-software-development",
++# "mail-server", "network-server", "legacy-network-server"])
+
+- addGroups(ds, ["news-server", "legacy-software-development"])
++# addGroups(ds, ["news-server", "legacy-software-development"])
- #Everthing else but kernels - don't depsolve
+ #Everthing else but kernels
for po in ds.pkgSack.returnPackages():