Merge lp:~wookey/xdeb/xdeb-allow-null-cross into lp:xdeb

[Wookey]

    Don't fail if null dpkg-cross packages are found LP: #731079

    This is a very simple-minded fix for the problem but in fact works
    pretty well, allowing many more packages to build OK. I an also
    testing a more sophisticated approach, but this is definitely better
    than just bailing, which often needlessly causes a build to fail.

[Colin Watson (cjwatson)]

Makes sense for now at least, yes.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-14 15:36:22 +0000
+++ debian/changelog	2011-09-15 16:10:32 +0000
@@ -21,6 +21,7 @@
   * Depend on multiarch-capable dpkg-cross and invoke it with
     --convert-multiarch
   * Fix lintian test whinge
+  * Don't fail if null dpkg-cross packages are found LP: #731079
 
   [ Steve McIntyre ]
   * Add initial support for armhf

=== modified file 'xdeb.py'
--- xdeb.py	2011-06-23 00:12:49 +0000
+++ xdeb.py	2011-09-15 16:10:32 +0000
@@ -473,7 +473,7 @@
 
     crossed_debs = []
     if crossable_debs:
-        convert = ['dpkg-cross', '-a', options.architecture, '-M', '-b']
+        convert = ['dpkg-cross', '-a', options.architecture, '-A', '-M', '-b']
         for dep in exclude_deps:
             convert.extend(('-X', dep))
         convert.extend(crossable_debs)