[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-11-gf7d8aed

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit f7d8aed0821703d28265f5a27441b4a02467cc72
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun Jul 15 11:49:28 2012 +0200

    Package list updates/modifications.

diff --git a/fai/config/package_config/DESKTOP b/fai/config/package_config/DESKTOP
index adcd2db..7734069 100644
--- a/fai/config/package_config/DESKTOP
+++ b/fai/config/package_config/DESKTOP
@@ -20,10 +20,14 @@ eog
 evince
 gcalctool
 gnome-screenshot
+
 iceweasel
+
 inkscape
 gimp
-openoffice.org  # FIXME libreoffice
+
+libreoffice
+
 anacron
 krb5-auth-dialog
 unattended-upgrades
diff --git a/fai/config/package_config/DISKLESS_CLIENT b/fai/config/package_config/DISKLESS_CLIENT
index 6f3002e..c390249 100644
--- a/fai/config/package_config/DISKLESS_CLIENT
+++ b/fai/config/package_config/DISKLESS_CLIENT
@@ -23,10 +23,14 @@ eog
 evince
 gcalctool
 gnome-screenshot
+
 iceweasel
+
 inkscape
 gimp
-openoffice.org  # FIXME libreoffice
+
+libreoffice
+
 krb5-auth-dialog
 
 ## From FAIBASE:
diff --git a/fai/config/package_config/EDU b/fai/config/package_config/EDU
index c713b23..4f15d58 100644
--- a/fai/config/package_config/EDU
+++ b/fai/config/package_config/EDU
@@ -19,6 +19,7 @@ arduino
 #fritzing
 scribus
 audacity
+viking
 
 ## High school (consider also the DEVTOOLS class):
 octave3.2
diff --git a/fai/config/package_config/FAIBASE b/fai/config/package_config/FAIBASE
index 7675831..d7ce82c 100644
--- a/fai/config/package_config/FAIBASE
+++ b/fai/config/package_config/FAIBASE
@@ -21,3 +21,4 @@ lvm2
 
 nscd
 bsd-mailx
+cfengine2

-- 
Debian-LAN development and packaging