From 4925b24069a493cecce0a5ce3e44c13b68271e89 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 15 Jul 2010 11:19:54 +0200 Subject: [PATCH] Import patches-unapplied version 1.132 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: 97e8d4f2f53292a8538424430528a6cb2c7e8112 New changelog entries: * BuildLiveCD: revert change from revno 284 that adds subarch to the logfile names as it breaks mailing of the logs from the cdimage buildlive script --- BuildLiveCD | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index 985340ce..96e68d95 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -125,7 +125,7 @@ for STE in $SUITES; do NOW=${NOW}.$n fi NOW=${NOW} - LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}${SUBARCH:+-$SUBARCH}.out + LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out rm -f ${PUBDIR}latest ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest diff --git a/debian/changelog b/debian/changelog index cdab4974..de6e4c9b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.132) maverick; urgency=low + + * BuildLiveCD: revert change from revno 284 that adds subarch to the logfile + names as it breaks mailing of the logs from the cdimage buildlive script + + -- Oliver Grawert Thu, 15 Jul 2010 11:19:54 +0200 + livecd-rootfs (1.131) maverick; urgency=low * add support for omap4 images