From c540a0d13ef44630b76e75e2db9c6e09ed3f25d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Sep 2005 19:18:41 +0000 Subject: [PATCH] * Now build etch CDs by default. * Remove DH_CODENAME unset from CONF.sh, to allow it to be passed in via the environemtn. Closes: #326814 --- CONF.sh | 1 - debian/changelog | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONF.sh b/CONF.sh index 41719344..92bd21dc 100644 --- a/CONF.sh +++ b/CONF.sh @@ -40,7 +40,6 @@ unset UDEB_EXCLUDE || true unset BASE_INCLUDE || true unset BASE_EXCLUDE || true unset INSTALLER_CD || true -unset DI_CODENAME || true unset MAXCDS || true unset SPLASHPNG || true unset OMIT_MANUAL || true diff --git a/debian/changelog b/debian/changelog index e8864819..a5902261 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ debian-cd (2.2.24) UNRELEASED; urgency=low * Remove contrib/testingcds. For now the entire setup directory used to build Debian CDs is in svn at svn+ssh://svn.debian.org/svn/debian-cd/setup * Point sid symlinks at etch. - * Now build etch CDs by default. Closes: #326814 (except the unset bit - possibly) + * Now build etch CDs by default. + * Remove DH_CODENAME unset from CONF.sh, to allow it to be passed in + via the environemtn. Closes: #326814 -- Joey Hess Wed, 7 Sep 2005 15:13:46 -0400