diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/cron.daily | 24 | ||||
| -rw-r--r-- | debian/default | 2 |
3 files changed, 21 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index e615f8c..e2e4e3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +live-package (0.99.24-1) unstable; urgency=low + + * New upstream release: + - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by + Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325). + + -- Daniel Baumann <daniel@debian.org> Sun, 3 Mar 2007 12:25:00 +0100 + live-package (0.99.23-1) unstable; urgency=low * New upstream release. diff --git a/debian/cron.daily b/debian/cron.daily index 26bae00..db65e90 100644 --- a/debian/cron.daily +++ b/debian/cron.daily @@ -36,50 +36,50 @@ cd "${AUTOBUILD_DIRECTORY}" for AUTOBUILD_DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} do - for AUTOBUILD_FLAVOUR in ${AUTOBUILD_FLAVOURS} + for AUTOBUILD_PACKAGE_LIST in ${AUTOBUILD_PACKAGE_LISTS} do - if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-log.txt ] + if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] then # Generating images mkdir debian-live - make-live -t iso -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 + make-live -t iso -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 fi if [ -f debian-live/binary.iso ] && [ -f debian-live/source.iso ] then # Moving logs mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log - mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-log.txt - mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-iso-packages.txt + mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt + mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-packages.txt # Moving images mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE} - mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.iso + mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.iso mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source - mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_FLAVOUR}.iso + mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_PACKAGE_LIST}.iso fi # Cleanup rm -rf debian-live - if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-log.txt ] + if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt ] then # Generating images mkdir debian-live - make-live -t usb -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_FLAVOUR} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 + make-live -t usb -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 fi if [ -f debian-live/binary.img ] then # Moving logs mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log - mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-log.txt - mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}_${AUTOBUILD_DATE}-usb-packages.txt + mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt + mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-packages.txt # Moving images mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE} - mv debian-live/binary.img "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_FLAVOUR}.img + mv debian-live/binary.img "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.img fi # Cleanup diff --git a/debian/default b/debian/default index a829c3f..43d17d7 100644 --- a/debian/default +++ b/debian/default @@ -3,7 +3,7 @@ AUTOBUILD="false" AUTOBUILD_DISTRIBUTIONS="etch sid" -AUTOBUILD_FLAVOURS="standard kde-desktop gnome-desktop xfce-desktop" +AUTOBUILD_PACKAGE_LISTS="standard kde-desktop gnome-desktop xfce-desktop" AUTOBUILD_OPTIONS="--with-source" AUTOBUILD_DIRECTORY="/srv/tmp/make-live" |