From 33e33cec7d89d97d0a04ff44a3a432dde696ee02 Mon Sep 17 00:00:00 2001
From: Chris Lamb <chris@chris-lamb.co.uk>
Date: Tue, 15 Jan 2008 22:43:51 +0000
Subject: Use C-style 'include' in lists (backwards compatible).

---
 functions/packageslists.sh | 2 +-
 lists/devel-live           | 2 +-
 lists/gnome                | 2 +-
 lists/gnome-core           | 2 +-
 lists/gnome-full           | 2 +-
 lists/gnome-junior         | 4 ++--
 lists/gnustep              | 2 +-
 lists/kde                  | 2 +-
 lists/kde-core             | 2 +-
 lists/kde-extra            | 2 +-
 lists/kde-full             | 2 +-
 lists/kde-junior           | 4 ++--
 lists/knoppix              | 2 +-
 lists/knoppix-dvd          | 2 +-
 lists/rescue               | 2 +-
 lists/standard             | 2 +-
 lists/standard-x11         | 2 +-
 lists/studio-gnome         | 4 ++--
 lists/studio-kde           | 4 ++--
 lists/studio-xfce          | 4 ++--
 lists/xfce                 | 2 +-
 lists/xfce-junior          | 4 ++--
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/functions/packageslists.sh b/functions/packageslists.sh
index cdec22c..36f46ca 100755
--- a/functions/packageslists.sh
+++ b/functions/packageslists.sh
@@ -34,7 +34,7 @@ Expand_packagelist_file ()
 	shift
 	shift
 
-	for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' "${FILE}");
+	for INCLUDE in $(sed -ne 's|^#<include> \(.*\)|\1|gp' -e 's|^#include <\(.*\)>|\1|gp' "${FILE}")
 	do
 		Expand_packagelist "${INCLUDE}" "${@}"
 	done
diff --git a/lists/devel-live b/lists/devel-live
index ea02768..f37ff53 100644
--- a/lists/devel-live
+++ b/lists/devel-live
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/devel-live - package list for live-helper(7)
 
 ## LH: Development (Debian Live)
-#<include> standard
+#include <standard>
 
 # live-helper
 cdebootstrap debootstrap
diff --git a/lists/gnome b/lists/gnome
index dfe7a0d..3e7cba5 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnome - package list for live-helper(7)
 
 ## LH: GNOME Desktop
-#<include> gnome-core
+#include <gnome-core>
 
 gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
 gnome-themes-extras
diff --git a/lists/gnome-core b/lists/gnome-core
index f4ccebc..20bdbbe 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnome-core - package list for live-helper(7)
 
 ## LH: GNOME Core
-#<include> standard-x11
+#include <standard-x11>
 
 gdm gnome-core
 desktop-base
diff --git a/lists/gnome-full b/lists/gnome-full
index a741247..42d5178 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnome-full - package list for live-helper(7)
 
 ## LH: GNOME full
-#<include> gnome
+#include <gnome>
 
 gdm gnome
 desktop-base
diff --git a/lists/gnome-junior b/lists/gnome-junior
index e7d8178..2597949 100644
--- a/lists/gnome-junior
+++ b/lists/gnome-junior
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnome-junior - package list for live-helper(7)
 
 ## LH: Debian Junior (Gnome)
-#<include> gnome
-#<include> junior-pkgs
+#include <gnome>
+#include <junior-pkgs>
 
 junior-gnome 
diff --git a/lists/gnustep b/lists/gnustep
index a952fbe..f0dcef7 100644
--- a/lists/gnustep
+++ b/lists/gnustep
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/gnustep - package list for live-helper(7)
 
 ## LH: GNUstep desktop
-#<include> standard-x11
+#include <standard-x11>
 
 wdm
 
diff --git a/lists/kde b/lists/kde
index e8224d6..13e40b1 100644
--- a/lists/kde
+++ b/lists/kde
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/kde - package list for live-helper(7)
 
 ## LH: KDE
-#<include> kde-core
+#include <kde-core>
 
 kde kdm
 desktop-base
diff --git a/lists/kde-core b/lists/kde-core
index 349ca2c..73f42c9 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/kde-core - package list for live-helper(7)
 
 ## LH: KDE Core
-#<include> standard-x11
+#include <standard-x11>
 
 kde-core kdm
 desktop-base
diff --git a/lists/kde-extra b/lists/kde-extra
index a36bca1..c23ff2f 100644
--- a/lists/kde-extra
+++ b/lists/kde-extra
@@ -1,6 +1,6 @@
 # /usr/share/live-helper/lists/kde-extra - package list for live-helper(7)
 
 ## LH: KDE Extra
-#<include> kde-full
+#include <kde-full>
 
 kde-extras
diff --git a/lists/kde-full b/lists/kde-full
index de28ebb..6af449e 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -1,6 +1,6 @@
 # /usr/share/live-helper/lists/kde-full - package list for live-helper(7)
 
 ## LH: KDE Full
-#<include> kde
+#include <kde>
 
 koffice
diff --git a/lists/kde-junior b/lists/kde-junior
index 559936e..9284a42 100644
--- a/lists/kde-junior
+++ b/lists/kde-junior
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/kde-junior - package list for live-helper(7)
 
 ## LH: KDE Junior
-#<include> kde
-#<include> junior-pkgs
+#include <kde>
+#include <junior-pkgs>
 
 junior-kde
diff --git a/lists/knoppix b/lists/knoppix
index f7d1dd5..e85fc4e 100644
--- a/lists/knoppix
+++ b/lists/knoppix
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/knoppix - package list for live-helper(7)
 
 ## LH: KNOPPIX (CD)
-#<include> standard
+#include <standard>
 
 # packagelist inspired from Knoppix 5.1.1.
 
diff --git a/lists/knoppix-dvd b/lists/knoppix-dvd
index b24fad7..8db0889 100644
--- a/lists/knoppix-dvd
+++ b/lists/knoppix-dvd
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/knoppix-dvd - package list for live-helper(7)
 
 ## LH: KNOPPIX (DVD)
-#<include> standard
+#include <standard>
 
 # packagelist inspired from Knoppix 5.1.1.
 
diff --git a/lists/rescue b/lists/rescue
index 299ccc4..df75c81 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/rescue - package list for live-helper(7)
 
 ## LH: Rescue
-#<include> standard
+#include <standard>
 
 # System
 gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units
diff --git a/lists/standard b/lists/standard
index 03c984d..a45e432 100644
--- a/lists/standard
+++ b/lists/standard
@@ -1,6 +1,6 @@
 # /usr/share/live-helper/lists/standard - package list for live-helper(7)
 
 ## LH: Standard
-#<include> minimal
+#include <minimal>
 
 console-common kbd locales
diff --git a/lists/standard-x11 b/lists/standard-x11
index f81f8cf..48aa6d3 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/standard-x11 - package list for live-helper(7)
 
 ## LH: Standard X11
-#<include> standard
+#include <standard>
 
 xorg xresprobe menu
 alsa-base alsa-oss alsa-utils
diff --git a/lists/studio-gnome b/lists/studio-gnome
index 767ae8c..c9c12cb 100644
--- a/lists/studio-gnome
+++ b/lists/studio-gnome
@@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-gnome - package list for live-helper(7)
 
 ## LH: Music Studio (Gnome)
-#<include> gnome
-#<include> studio
+#include <gnome>
+#include <studio>
diff --git a/lists/studio-kde b/lists/studio-kde
index 5b0c73f..0971a41 100644
--- a/lists/studio-kde
+++ b/lists/studio-kde
@@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-kde - package list for live-helper(7)
 
 ## LH: Music Studio (KDE)
-#<include> kde
-#<include> studio
+#include <kde>
+#include <studio>
diff --git a/lists/studio-xfce b/lists/studio-xfce
index ef98c97..0f5d492 100644
--- a/lists/studio-xfce
+++ b/lists/studio-xfce
@@ -1,5 +1,5 @@
 # /usr/share/live-helper/lists/studio-xfce - package list for live-helper(7)
 
 ## LH: Music Studio (Xfce)
-#<include> xfce
-#<include> studio
+#include <xfce>
+#include <studio>
diff --git a/lists/xfce b/lists/xfce
index 0307996..be5a4f4 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/xfce - package list for live-helper(7)
 
 ## LH: Xfce
-#<include> standard-x11
+#include <standard-x11>
 
 xfce4 gdm
 desktop-base
diff --git a/lists/xfce-junior b/lists/xfce-junior
index 93becb6..ca71ec5 100644
--- a/lists/xfce-junior
+++ b/lists/xfce-junior
@@ -1,7 +1,7 @@
 # /usr/share/live-helper/lists/xfce-junior - package list for live-helper(7)
 
 ## LH: Xfce Debian Junior
-#<include> xfce
-#<include> junior-pkgs
+#include <xfce>
+#include <junior-pkgs>
 
 junior-kde junior-gnome
-- 
cgit v1.0