From 03c8a20c280c6888b4d274a3095013064b94e99b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 10:04:35 +0200 Subject: Adding live-package 0.99.13-1. --- ChangeLog | 18 ++++++++++++++++++ debian/changelog | 6 ++++++ src/lists/gnome | 4 ++-- src/lists/gnome-core | 4 ++-- src/lists/gnome-full | 4 ++-- src/lists/gnustep | 29 +++++++++++++++++++++++++++++ src/lists/kde | 4 ++-- src/lists/kde-core | 4 ++-- src/lists/kde-core-i18n | 4 ++-- src/lists/kde-extra | 4 ++-- src/lists/kde-extra-i18n | 4 ++-- src/lists/kde-full | 4 ++-- src/lists/kde-full-i18n | 4 ++-- src/lists/kde-i18n | 4 ++-- src/lists/minimal | 2 +- src/lists/minimal-net | 8 ++++++++ src/lists/standard | 4 ++-- src/lists/standard-i18n | 4 ++-- src/lists/x11 | 4 ++-- src/lists/x11-core | 4 ++-- src/lists/xfce | 4 ++-- src/main.sh | 2 +- src/scripts/14chroot.sh | 7 ++++++- 23 files changed, 101 insertions(+), 35 deletions(-) create mode 100644 src/lists/gnustep create mode 100644 src/lists/minimal-net diff --git a/ChangeLog b/ChangeLog index f017bc2..4580293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-10-29 Daniel Baumann + + * Added minimal-net flavour. + +2006-10-28 Daniel Baumann + + * Added console-common to standard selection. + +2006-10-27 Daniel Baumann + + * Added patch from Otavio Salvador : + - fixing preseeding error-handling. + +2006-10-26 Daniel Baumann + + * Added gnustep package selection based on the suggestion of + Guerkan Senguen . + 2006-10-25 Daniel Baumann * Applied patch from Marcelo D. Re : diff --git a/debian/changelog b/debian/changelog index 6b7c60e..ab3a683 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-package (0.99.13-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann Mon, 30 Oct 2006 00:00:00 +0200 + live-package (0.99.12-1) unstable; urgency=medium * New upstream release. diff --git a/src/lists/gnome b/src/lists/gnome index 1f8eb58..791dc64 100644 --- a/src/lists/gnome +++ b/src/lists/gnome @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/gnome - package list for make-live(8) +# /usr/share/make-live/lists/gnome - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common 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 13af34e..9ccaa6e 100644 --- a/src/lists/gnome-core +++ b/src/lists/gnome-core @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/gnome-core - package list for make-live(8) +# /usr/share/make-live/lists/gnome-core - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # GNOME Core gdm gnome-core diff --git a/src/lists/gnome-full b/src/lists/gnome-full index 8f685df..2d4982c 100644 --- a/src/lists/gnome-full +++ b/src/lists/gnome-full @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/gnome-full - package list for make-live(8) +# /usr/share/make-live/lists/gnome-full - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # GNOME Full gdm gnome diff --git a/src/lists/gnustep b/src/lists/gnustep new file mode 100644 index 0000000..8dbcb0a --- /dev/null +++ b/src/lists/gnustep @@ -0,0 +1,29 @@ +# /usr/share/make-live/lists/x11-core - package list for make-live(1) + +# Minimal +eject sudo + +# Standard +console-common locales + +# X11 +wdm x-window-system-core + +# GNUstep +gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons +gnustep-examples gnumail-doc aclock.app biococoa.app timemon.app cenon.app wmnd +bubblefishymon wmmixer wmpinboard gworkspace.app clipbook.app poe.app +plopfolio.app mpdcon.app lusernet.app helpviewer.app gnuwash.app easydiff.app +displaycalibrator.app cynthiune.app agenda.app stepulator.app edenmath.app +price.app volumecontrol.app latex.service wildmenus.bundle innerspace.app + +gnustep-core + +gnustep-core-devel gnustep-base-examples + +gnustep-core-doc gnustep-tutorial-html gnustep-tutorial-pdf + +gnustep-games gridlock.app + +gnustep-devel librenaissance0-dev steptalk libpantomime1-dev +popplerkit.framework gnustep-netclasses diff --git a/src/lists/kde b/src/lists/kde index 884d06d..3c2a1b3 100644 --- a/src/lists/kde +++ b/src/lists/kde @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde - package list for make-live(8) +# /usr/share/make-live/lists/kde - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # KDE kde kdm diff --git a/src/lists/kde-core b/src/lists/kde-core index 514f4f2..b25a7da 100644 --- a/src/lists/kde-core +++ b/src/lists/kde-core @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-core - package list for make-live(8) +# /usr/share/make-live/lists/kde-core - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # KDE Core kde-core kdm diff --git a/src/lists/kde-core-i18n b/src/lists/kde-core-i18n index bd697be..09be8cf 100644 --- a/src/lists/kde-core-i18n +++ b/src/lists/kde-core-i18n @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(8) +# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common 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 ad08e3c..b9bcece 100644 --- a/src/lists/kde-extra +++ b/src/lists/kde-extra @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-extra - package list for make-live(8) +# /usr/share/make-live/lists/kde-extra - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # KDE kde kdm diff --git a/src/lists/kde-extra-i18n b/src/lists/kde-extra-i18n index 22eded3..f0e701a 100644 --- a/src/lists/kde-extra-i18n +++ b/src/lists/kde-extra-i18n @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(8) +# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common 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 b174915..9365d2e 100644 --- a/src/lists/kde-full +++ b/src/lists/kde-full @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-full - package list for make-live(8) +# /usr/share/make-live/lists/kde-full - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # KDE kde kdm diff --git a/src/lists/kde-full-i18n b/src/lists/kde-full-i18n index 08d4cea..e7aa0dc 100644 --- a/src/lists/kde-full-i18n +++ b/src/lists/kde-full-i18n @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(8) +# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common 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 039b6f7..7429b1f 100644 --- a/src/lists/kde-i18n +++ b/src/lists/kde-i18n @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/kde-i18n - package list for make-live(8) +# /usr/share/make-live/lists/kde-i18n - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # Standard i18n manpages manpages-dev manpages-de manpages-de-dev manpages-es manpages-es-extra diff --git a/src/lists/minimal b/src/lists/minimal index b6c29c0..63d30a8 100644 --- a/src/lists/minimal +++ b/src/lists/minimal @@ -1,4 +1,4 @@ -# /usr/share/make-live/lists/minimal - package list for make-live(8) +# /usr/share/make-live/lists/minimal - package list for make-live(1) # Minimal eject vim-tiny sudo diff --git a/src/lists/minimal-net b/src/lists/minimal-net new file mode 100644 index 0000000..fb883c5 --- /dev/null +++ b/src/lists/minimal-net @@ -0,0 +1,8 @@ +# /usr/share/make-live/lists/minimal-net - package list for make-live(1) + +# Minimal +eject vim-tiny sudo + +# Network +bind9-host dhcp-client dnsutils ftp ifupdown iptables iputils-ping mtr-tiny +net-tools netbase netcat openssh-client telnet traceroute wget whois diff --git a/src/lists/standard b/src/lists/standard index 75df57f..e394b57 100644 --- a/src/lists/standard +++ b/src/lists/standard @@ -1,7 +1,7 @@ -# /usr/share/make-live/lists/standard - package list for make-live(8) +# /usr/share/make-live/lists/standard - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales diff --git a/src/lists/standard-i18n b/src/lists/standard-i18n index c0ef5ca..9d1e3fc 100644 --- a/src/lists/standard-i18n +++ b/src/lists/standard-i18n @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/standard-i18n - package list for make-live(8) +# /usr/share/make-live/lists/standard-i18n - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common 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 12143f1..f738b32 100644 --- a/src/lists/x11 +++ b/src/lists/x11 @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/x11 - package list for make-live(8) +# /usr/share/make-live/lists/x11 - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # X11 xdm x-window-system diff --git a/src/lists/x11-core b/src/lists/x11-core index cadd3bb..ef0560f 100644 --- a/src/lists/x11-core +++ b/src/lists/x11-core @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/x11-core - package list for make-live(8) +# /usr/share/make-live/lists/x11-core - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # X11 xdm x-window-system-core diff --git a/src/lists/xfce b/src/lists/xfce index cbd9259..d04e671 100644 --- a/src/lists/xfce +++ b/src/lists/xfce @@ -1,10 +1,10 @@ -# /usr/share/make-live/lists/xfce - package list for make-live(8) +# /usr/share/make-live/lists/xfce - package list for make-live(1) # Minimal eject sudo # Standard -locales +console-common locales # Xfce gdm xfce4 diff --git a/src/main.sh b/src/main.sh index 1c97680..0e3cb03 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.12" +VERSION="0.99.13" CODENAME_OLDSTABLE="woody" CODENAME_STABLE="sarge" diff --git a/src/scripts/14chroot.sh b/src/scripts/14chroot.sh index 5b226e1..45d214d 100644 --- a/src/scripts/14chroot.sh +++ b/src/scripts/14chroot.sh @@ -95,10 +95,15 @@ Chroot () # Restore preseed configuration if [ -f "${LIVE_PRESEED}" ] then - Chroot_exec "apt-get install --yes debconf-utils" + Chroot_exec "apt-get install --yes --force-yes debconf-utils" cp "${LIVE_PRESEED}" "${LIVE_CHROOT}"/root/preseed Chroot_exec "debconf-set-selections /root/preseed" rm -f "${LIVE_CHROOT}"/root/preseed + else + if [ -n "${LIVE_PRESEED}" ]; then + echo "'${LIVE_PRESEED}' file doesn't exists. Exiting..." + exit 1 + fi fi # Restore cloned package selection -- cgit v1.0