Adding live-package 0.99.23-1.

10 files changed, 83 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e214b0..a28053e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-21 Daniel Baumann <daniel@debian.org>
+
+	* Added gnome-junior, kde-junior and xfce-junior lists.
+
+2007-02-19 Daniel Baumann <daniel@debian.org>
+
+	* Fixed manifest.
+
 2007-02-15 Daniel Baumann <daniel@debian.org>
 
 	* Applied patch from Sebastian Raveau <sebastien.raveau@epita.fr> to
diff --git a/debian/changelog b/debian/changelog
index db40649..e615f8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-package (0.99.23-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 21 Feb 2007 22:08:00 +0100
+
 live-package (0.99.22-1) unstable; urgency=low
 
   * New upstream release:
diff --git a/helpers/lh_installapt b/helpers/lh_installapt
index 5324402..024303d 100755
--- a/helpers/lh_installapt
+++ b/helpers/lh_installapt
@@ -5,6 +5,9 @@
 # Install aptitude
 lh_chroot "apt-get install --yes --force-yes aptitude"
 
+# FIXME
+lh_chroot "apt-key update"
+
 # Install secure apt
 if [ "${LIVE_DISTRIBUTION}" = "unstable" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_UNSTABLE}" ] || \
 [ "${LIVE_DISTRIBUTION}" = "testing" ] || [ "${LIVE_DISTRIBUTION}" = "${CODENAME_TESTING}" ]
diff --git a/helpers/lh_installsyslinux b/helpers/lh_installsyslinux
index 76a7ad7..641f7db 100755
--- a/helpers/lh_installsyslinux
+++ b/helpers/lh_installsyslinux
@@ -6,7 +6,7 @@ if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
 then
 	if [ -n "${LIVE_ENCRYPTION}" ]
 	then
-		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} live-media-encryption=${LIVE_ENCRYPTION}"
+		LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} encryption=${LIVE_ENCRYPTION}"
 	fi
 
 	case "${1}" in
diff --git a/helpers/lh_losetup b/helpers/lh_losetup
index e99f9e0..e2b3c0d 100755
--- a/helpers/lh_losetup
+++ b/helpers/lh_losetup
@@ -12,7 +12,7 @@ losetup -d "${DEVICE}"
 
 LOOPDEVICE="`echo ${DEVICE}p${PARTITION:=1}`"
 CYL="`echo ${FDISK_OUT} | sed -ne "s_^${LOOPDEVICE}[ *]*\([0-9]*\).*_\1_p" `"
-#OFFSET="`expr ${CYL}*512`"
+#OFFSET="`expr 512 '*' ${CYL}`"
 OFFSET="$((CYL*512))"
 
 echo loop $DEVICE at offset $OFFSET
diff --git a/helpers/lh_manifest b/helpers/lh_manifest
index 9979552..d755335 100755
--- a/helpers/lh_manifest
+++ b/helpers/lh_manifest
@@ -3,10 +3,11 @@
 # lh_manifest
 
 # Add filesystem.manifest
-lh_chroot "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest
+lh_chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > "${LIVE_ROOT}"/filesystem.manifest
 
-if [ ! -z "${LIVE_MANIFEST}" ]
+if [ -n "${LIVE_MANIFEST}" ]
 then
+	# FIXME; what should that be good for anyway?
 	lh_chroot "aptitude install --assume-yes ${LIVE_MANIFEST}"
 	lh_chroot "dpkg-query -W \*" | awk '$2 ~ /./ {print $1 " " $2 }' > "${LIVE_ROOT}"/filesystem.manifest-desktop
 fi
diff --git a/src/lists/gnome-junior b/src/lists/gnome-junior
new file mode 100644
index 0000000..1644456
--- /dev/null
+++ b/src/lists/gnome-junior
@@ -0,0 +1,22 @@
+# /usr/share/make-live/lists/gnome - package list for make-live(1)
+
+# Minimal
+eject file sudo vim-tiny
+
+# Standard
+console-common locales
+
+# GNOME
+gdm gdm-themes gnome-desktop-environment gnome-cups-manager gnome-screensaver
+gnome-themes-extras
+desktop-base
+
+rhythmbox synaptic
+
+x-window-system-core
+
+# Debian Junior
+junior-sound junior-typing junior-internet junior-gnome junior-toys
+junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
+junior-math junior-writing junior-games-card junior-programming junior-system
+junior-art junior-doc junior-games-text
diff --git a/src/lists/kde-junior b/src/lists/kde-junior
new file mode 100644
index 0000000..d2afa1b
--- /dev/null
+++ b/src/lists/kde-junior
@@ -0,0 +1,19 @@
+# /usr/share/make-live/lists/kde - package list for make-live(1)
+
+# Minimal
+eject file sudo vim-tiny
+
+# Standard
+console-common locales
+
+# KDE
+kde kdm
+desktop-base
+
+x-window-system-core
+
+# Debian Junior
+junior-sound junior-typing junior-internet junior-toys junior-games-net
+junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
+junior-writing junior-games-card junior-programming junior-system junior-art
+junior-doc junior-games-text junior-kde
diff --git a/src/lists/xfce-junior b/src/lists/xfce-junior
new file mode 100644
index 0000000..5643fc2
--- /dev/null
+++ b/src/lists/xfce-junior
@@ -0,0 +1,19 @@
+# /usr/share/make-live/lists/xfce - package list for make-live(1)
+
+# Minimal
+eject file sudo vim-tiny
+
+# Standard
+console-common locales
+
+# Xfce
+gdm xfce4
+desktop-base
+
+x-window-system-core
+
+# Debian Junior
+junior-sound junior-typing junior-internet junior-gnome junior-toys
+junior-games-net junior-games-sim junior-games-gl junior-puzzle junior-arcade
+junior-math junior-writing junior-games-card junior-programming junior-system
+junior-art junior-doc junior-games-text junior-kde
diff --git a/src/main.sh b/src/main.sh
index b858a3e..3403d44 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.22"
+VERSION="0.99.23"
 
 export VERSION