diff --git a/debian/changelog b/debian/changelog index ad0b2166..07056ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +debian-cd (3.1.13-deb7u1) UNRELEASED; urgency=low + + * Fixes and changes backported from master for the wheezy build branch: + + Make sure that when we call apt, we tell it to *not* use localised + package descriptions; this causes issues during build. See #712435 in + apt. + + -- Steve McIntyre <93sam@debian.org> Mon, 17 June 2013 15:44:32 +0100 + debian-cd (3.1.13) unstable; urgency=medium * The traditional "last upload before the stable release" upload... diff --git a/tools/apt-selection b/tools/apt-selection index 364a6fbb..ea8ba331 100755 --- a/tools/apt-selection +++ b/tools/apt-selection @@ -33,7 +33,8 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \ -o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \ -o APT::Cache::AllVersions=0 \ -o APT::Cache::ShowVersion=1 \ - -o APT::Architecture=$ARCH " + -o APT::Architecture=$ARCH \ + -o Acquire::Languages=none" sections=main if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then