Backport: disable apt translations

This commit is contained in:
Steve McIntyre 2013-06-17 15:47:03 +01:00
parent 7ddcf2d4fa
commit 5d56bf1797
2 changed files with 11 additions and 1 deletions

9
debian/changelog vendored
View File

@ -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 debian-cd (3.1.13) unstable; urgency=medium
* The traditional "last upload before the stable release" upload... * The traditional "last upload before the stable release" upload...

View File

@ -33,7 +33,8 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
-o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \ -o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \
-o APT::Cache::AllVersions=0 \ -o APT::Cache::AllVersions=0 \
-o APT::Cache::ShowVersion=1 \ -o APT::Cache::ShowVersion=1 \
-o APT::Architecture=$ARCH " -o APT::Architecture=$ARCH \
-o Acquire::Languages=none"
sections=main sections=main
if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then if [ "${NONFREE:-0}" != "0" ] || [ "${EXTRANONFREE:-0}" != "0" ] || [ "${FORCE_FIRMWARE:-0}" != "0" ]; then