Adding live-package 0.99.25-1.

26 files changed, 42 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index bdc1dc5de..44f779183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-09 Daniel Baumann <daniel@debian.org>
+
+	* Added kbd to all !minimal lists.
+
+2007-03-08 Otavio Salvador <otavio@debian.org>
+
+	* helpers/lh_configapt: Fix aptitude configuration to really avoid
+	  recommended packages to get installed.
+	* src/scripts/02defaults.sh: Export LIVE_ISOLINUX_SPLASH.
+
 2007-03-04 Daniel Baumann <daniel@debian.org>
 
 	* Replaced removal of kernel on minimal flavours with excludes on the
diff --git a/debian/changelog b/debian/changelog
index e2e4e3ec9..dee101900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-package (0.99.25-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri,  9 Mar 2007 01:49:00 +0100
+
 live-package (0.99.24-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/helpers/lh_configapt b/helpers/lh_configapt
index cf8a91f91..971d02e71 100755
--- a/helpers/lh_configapt
+++ b/helpers/lh_configapt
@@ -26,9 +26,9 @@ case "${1}" in
 
 		if [ "${LIVE_RECOMMENDS}" = "yes" ]
 		then
-			echo "Aptitude::Recommends-Important \"true\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/00make-live_recommends.conf
+			echo "Aptitude::Recommends-Important \"true\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf
 		else
-			echo "Aptitude::Recommends-Important \"false\";" > "${LIVE_CHROOT}"/etc/apt/apt.conf.d/00make-live_recommends.conf
+			echo "Aptitude::Recommends-Important \"false\";" >> "${LIVE_CHROOT}"/etc/apt/apt.conf
 		fi
 		;;
 
diff --git a/src/lists/gnome b/src/lists/gnome
index 2c0e90171..3e831cf2a 100644
--- a/src/lists/gnome
+++ b/src/lists/gnome
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # GNOME
 gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
diff --git a/src/lists/gnome-core b/src/lists/gnome-core
index f60ad4c20..f51a2efe4 100644
--- a/src/lists/gnome-core
+++ b/src/lists/gnome-core
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # GNOME Core
 gdm gnome-core
diff --git a/src/lists/gnome-full b/src/lists/gnome-full
index 2256d3f99..d049e151d 100644
--- a/src/lists/gnome-full
+++ b/src/lists/gnome-full
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # GNOME Full
 gdm gnome
diff --git a/src/lists/gnome-junior b/src/lists/gnome-junior
index 67fa88f85..e05a96968 100644
--- a/src/lists/gnome-junior
+++ b/src/lists/gnome-junior
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # GNOME
 gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
diff --git a/src/lists/gnustep b/src/lists/gnustep
index 1c0c841bb..89623b0e2 100644
--- a/src/lists/gnustep
+++ b/src/lists/gnustep
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # X11
 wdm x-window-system-core
diff --git a/src/lists/kde b/src/lists/kde
index cb88c9a58..0dedbf654 100644
--- a/src/lists/kde
+++ b/src/lists/kde
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # KDE
 kde kdm
diff --git a/src/lists/kde-core b/src/lists/kde-core
index 74ad015a4..9e85cf477 100644
--- a/src/lists/kde-core
+++ b/src/lists/kde-core
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # KDE Core
 kde-core kdm
diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n
index 1a2619e6e..cdb15013f 100644
--- a/src/lists/kde-core-i18n
+++ b/src/lists/kde-core-i18n
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Standard i18n
 manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra
diff --git a/src/lists/kde-extra b/src/lists/kde-extra
index bd8e17f26..cd7c01a1c 100644
--- a/src/lists/kde-extra
+++ b/src/lists/kde-extra
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # KDE
 kde kdm
diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n
index 4210c17f2..7a25a58c2 100644
--- a/src/lists/kde-extra-i18n
+++ b/src/lists/kde-extra-i18n
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Standard i18n
 manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra
diff --git a/src/lists/kde-full b/src/lists/kde-full
index 83c784895..ec74bece7 100644
--- a/src/lists/kde-full
+++ b/src/lists/kde-full
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # KDE
 kde kdm
diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n
index ecc4614d9..d40cd74d8 100644
--- a/src/lists/kde-full-i18n
+++ b/src/lists/kde-full-i18n
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Standard i18n
 manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra
diff --git a/src/lists/kde-i18n b/src/lists/kde-i18n
index 5576b20b0..55469a509 100644
--- a/src/lists/kde-i18n
+++ b/src/lists/kde-i18n
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Standard i18n
 manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra
diff --git a/src/lists/kde-junior b/src/lists/kde-junior
index 1b067a50e..53cdf2aba 100644
--- a/src/lists/kde-junior
+++ b/src/lists/kde-junior
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # KDE
 kde kdm
diff --git a/src/lists/rescue b/src/lists/rescue
index a68503c4b..256b6ea2f 100644
--- a/src/lists/rescue
+++ b/src/lists/rescue
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Rescue
 
@@ -54,3 +54,4 @@ clamav
 clamav-data
 wipe
 secure-delete
+minicom
diff --git a/src/lists/standard b/src/lists/standard
index 22a81acff..4da4dd219 100644
--- a/src/lists/standard
+++ b/src/lists/standard
@@ -4,4 +4,4 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
diff --git a/src/lists/standard-i18n b/src/lists/standard-i18n
index 077a1c085..b7c739181 100644
--- a/src/lists/standard-i18n
+++ b/src/lists/standard-i18n
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Standard i18n
 manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra
diff --git a/src/lists/x11 b/src/lists/x11
index 65600a03e..8928ee446 100644
--- a/src/lists/x11
+++ b/src/lists/x11
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # X11
 xdm x-window-system
diff --git a/src/lists/x11-core b/src/lists/x11-core
index fe6ab32f2..89182c14b 100644
--- a/src/lists/x11-core
+++ b/src/lists/x11-core
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # X11
 xdm x-window-system-core
diff --git a/src/lists/xfce b/src/lists/xfce
index 8d27123ef..0390a394a 100644
--- a/src/lists/xfce
+++ b/src/lists/xfce
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Xfce
 gdm xfce4
diff --git a/src/lists/xfce-junior b/src/lists/xfce-junior
index 0ad7887ef..56184e767 100644
--- a/src/lists/xfce-junior
+++ b/src/lists/xfce-junior
@@ -4,7 +4,7 @@
 eject file sudo vim-tiny
 
 # Standard
-console-common locales
+console-common kbd locales
 
 # Xfce
 gdm xfce4
diff --git a/src/main.sh b/src/main.sh
index b56c91a45..e50fe9074 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -28,7 +28,7 @@ set -e
 BASE=${LIVE_BASE:-"/usr/share/make-live"}
 CONFIG="/etc/make-live.conf"
 PROGRAM="`basename ${0}`"
-VERSION="0.99.24"
+VERSION="0.99.25"
 
 export VERSION
 
diff --git a/src/scripts/02defaults.sh b/src/scripts/02defaults.sh
index a59735b7b..06e7c969c 100644
--- a/src/scripts/02defaults.sh
+++ b/src/scripts/02defaults.sh
@@ -372,5 +372,5 @@ Defaults ()
 
 	# Variables that do not have defaults but need to be exported to
 	# allow other helpers to use their values
-	export LIVE_BOOTAPPEND LIVE_BOOTSTRAP_CONFIG LIVE_INCLUDE_CHROOT LIVE_PRESEED
+	export LIVE_BOOTAPPEND LIVE_BOOTSTRAP_CONFIG LIVE_INCLUDE_CHROOT LIVE_PRESEED LIVE_ISOLINUX_SPLASH
 }