r793 - in /crosshurd/trunk: debian/changelog functions

[sthibault]

Author: sthibault
Date: Thu May  1 21:23:19 2014
New Revision: 793

URL: http://svn.debian.org/wsvn/pkg-hurd/crosshurd/?sc=1&rev=793
Log:
Also set APT::Architectures, to fix installation from a multiarch system.

Modified:
    crosshurd/trunk/debian/changelog
    crosshurd/trunk/functions

Modified: crosshurd/trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/debian/changelog?rev=793&op=diff
==============================================================================
--- crosshurd/trunk/debian/changelog    (original)
+++ crosshurd/trunk/debian/changelog    Thu May  1 21:23:19 2014
@@ -1,5 +1,6 @@
 crosshurd (1.7.45) UNRELEASED; urgency=medium
 
+  * Also set APT::Architectures, to fix installation from a multiarch system.
   * Bump kfreebsd kernel to 10 (Closes: Bug#746603).
 
  -- Samuel Thibault <address@hidden>  Thu, 01 May 2014 23:07:01 +0200

Modified: crosshurd/trunk/functions
URL: 
http://svn.debian.org/wsvn/pkg-hurd/crosshurd/crosshurd/trunk/functions?rev=793&op=diff
==============================================================================
--- crosshurd/trunk/functions   (original)
+++ crosshurd/trunk/functions   Thu May  1 21:23:19 2014
@@ -5,7 +5,7 @@
 esac
 DEB_TARGET_ARCH=`dpkg-architecture -t$DEB_TARGET_GNU_TYPE -qDEB_HOST_ARCH`
 
-apt_options="--option 
Dir::Etc::SourceList=/etc/crosshurd/sources.list/$DEB_TARGET_GNU_SYSTEM 
--option Dir::State::Lists=$TARGET/var/cache/apt/lists --option 
Debug::Nolocking=true --option APT::Architecture=$DEB_TARGET_ARCH --option 
Dir::Cache::archives=$TARGET/var/cache/apt/archives --option 
APT::Get::Force-Yes=true --option APT::Get::Download-Only=true --option 
Dir::State::status=$TARGET/var/lib/dpkg/status --option 
Dir::Etc::Preferences=/etc/crosshurd/preferences --option 
debug::pkgproblemresolver=1 --option Dir::Etc::Sourceparts=/nonexistant"
+apt_options="--option 
Dir::Etc::SourceList=/etc/crosshurd/sources.list/$DEB_TARGET_GNU_SYSTEM 
--option Dir::State::Lists=$TARGET/var/cache/apt/lists --option 
Debug::Nolocking=true --option APT::Architecture=$DEB_TARGET_ARCH --option 
APT::Architectures=$DEB_TARGET_ARCH --option 
Dir::Cache::archives=$TARGET/var/cache/apt/archives --option 
APT::Get::Force-Yes=true --option APT::Get::Download-Only=true --option 
Dir::State::status=$TARGET/var/lib/dpkg/status --option 
Dir::Etc::Preferences=/etc/crosshurd/preferences --option 
debug::pkgproblemresolver=1 --option Dir::Etc::Sourceparts=/nonexistant"
 
 DEBFOR=apt_debfor