merge patch from Daniel Hartwig

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index e3c74a0994dd5a720eae1570bfc121699f418db8..64b062ea4ef16c86d8e48ca26ad486ac9a869a79 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2714,7 +2714,7 @@ bool DoSource(CommandLine &CmdL)
         {
            string buildopts = _config->Find("APT::Get::Host-Architecture");
            if (buildopts.empty() == false)
         {
            string buildopts = _config->Find("APT::Get::Host-Architecture");
            if (buildopts.empty() == false)

-              buildopts = "-a " + buildopts + " ";
+              buildopts = "-a" + buildopts + " ";

            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage
            buildopts.append(_config->Find("DPkg::Build-Options","-b -uc"));
 
            // Call dpkg-buildpackage

diff --git a/debian/changelog b/debian/changelog
index cf04c1dd23836eeaa6b7fdcb7fe55da648d06123..fbc6009a1379a7e8bb29a686cdd0b3cba3ebdedd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ apt (0.9.7.9~exp2) UNRELEASED; urgency=low
   [ Programs translations ]
   * Update all PO files and apt-all.pot
   * French translation completed (Christian Perrier)
   [ Programs translations ]
   * Update all PO files and apt-all.pot
   * French translation completed (Christian Perrier)

+  
+  [ Daniel Hartwig ]
+  * cmdline/apt-get.cc:
+    - do not have space between "-a" and option when cross building
+      (closes: #703792)

 
  -- Christian Perrier <bubulle@debian.org>  Sun, 24 Mar 2013 08:57:45 +0100
 
 
  -- Christian Perrier <bubulle@debian.org>  Sun, 24 Mar 2013 08:57:45 +0100