From 8b59b61bb25e43766add1f601404224d33cde727 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Tue, 15 Jan 2008 22:43:51 +0000 Subject: [PATCH] Use C-style 'include' in lists (backwards compatible). Signed-off-by: Chris Lamb --- 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 cdec22c5d..36f46ca64 100755 --- a/functions/packageslists.sh +++ b/functions/packageslists.sh @@ -34,7 +34,7 @@ Expand_packagelist_file () shift shift - for INCLUDE in $(sed -ne 's|^# \(.*\)|\1|gp' "${FILE}"); + for INCLUDE in $(sed -ne 's|^# \(.*\)|\1|gp' -e 's|^#include <\(.*\)>|\1|gp' "${FILE}") do Expand_packagelist "${INCLUDE}" "${@}" done diff --git a/lists/devel-live b/lists/devel-live index ea027687b..f37ff53b2 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) -# standard +#include # live-helper cdebootstrap debootstrap diff --git a/lists/gnome b/lists/gnome index dfe7a0d7d..3e7cba5f7 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 -# gnome-core +#include gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver gnome-themes-extras diff --git a/lists/gnome-core b/lists/gnome-core index f4ccebcef..20bdbbec3 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 -# standard-x11 +#include gdm gnome-core desktop-base diff --git a/lists/gnome-full b/lists/gnome-full index a74124764..42d5178a6 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 -# gnome +#include gdm gnome desktop-base diff --git a/lists/gnome-junior b/lists/gnome-junior index e7d8178b2..25979491d 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) -# gnome -# junior-pkgs +#include +#include junior-gnome diff --git a/lists/gnustep b/lists/gnustep index a952fbe1f..f0dcef7bb 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 -# standard-x11 +#include wdm diff --git a/lists/kde b/lists/kde index e8224d6c6..13e40b174 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 -# kde-core +#include kde kdm desktop-base diff --git a/lists/kde-core b/lists/kde-core index 349ca2c16..73f42c977 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 -# standard-x11 +#include kde-core kdm desktop-base diff --git a/lists/kde-extra b/lists/kde-extra index a36bca110..c23ff2f1e 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 -# kde-full +#include kde-extras diff --git a/lists/kde-full b/lists/kde-full index de28ebbff..6af449e63 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 -# kde +#include koffice diff --git a/lists/kde-junior b/lists/kde-junior index 559936eab..9284a427e 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 -# kde -# junior-pkgs +#include +#include junior-kde diff --git a/lists/knoppix b/lists/knoppix index f7d1dd58b..e85fc4e9e 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) -# standard +#include # packagelist inspired from Knoppix 5.1.1. diff --git a/lists/knoppix-dvd b/lists/knoppix-dvd index b24fad72c..8db088971 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) -# standard +#include # packagelist inspired from Knoppix 5.1.1. diff --git a/lists/rescue b/lists/rescue index 299ccc49c..df75c814c 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 -# standard +#include # System gnupg dash discover gawk grub htop lilo ltrace pstack screen strace units diff --git a/lists/standard b/lists/standard index 03c984d96..a45e432ad 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 -# minimal +#include console-common kbd locales diff --git a/lists/standard-x11 b/lists/standard-x11 index f81f8cf48..48aa6d391 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 -# standard +#include xorg xresprobe menu alsa-base alsa-oss alsa-utils diff --git a/lists/studio-gnome b/lists/studio-gnome index 767ae8c54..c9c12cb62 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) -# gnome -# studio +#include +#include diff --git a/lists/studio-kde b/lists/studio-kde index 5b0c73f2f..0971a4145 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) -# kde -# studio +#include +#include diff --git a/lists/studio-xfce b/lists/studio-xfce index ef98c97db..0f5d49258 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) -# xfce -# studio +#include +#include diff --git a/lists/xfce b/lists/xfce index 030799673..be5a4f4fa 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 -# standard-x11 +#include xfce4 gdm desktop-base diff --git a/lists/xfce-junior b/lists/xfce-junior index 93becb62b..ca71ec519 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 -# xfce -# junior-pkgs +#include +#include junior-kde junior-gnome