The following commit has been merged in the master branch:
commit 90221214c5cdf1e29ac87fe29562541cd0681b33
Author: Ralf Treinen <trei...@debian.org>
Date:   Sat Sep 8 13:57:48 2012 +0200

    multiarch-patch: drop check of the options.host and is_source, since these
    fields do not exist in the current version of debcudf.ml.

diff --git a/debian/patches/multiarch-conflicts 
b/debian/patches/multiarch-conflicts
index 34ec158..66bcb27 100644
--- a/debian/patches/multiarch-conflicts
+++ b/debian/patches/multiarch-conflicts
@@ -2,7 +2,7 @@ diff --git a/deb/debcudf.ml b/deb/debcudf.ml
 index cd83799..ecfd929 100644
 --- a/deb/debcudf.ml
 +++ b/deb/debcudf.ml
-@@ -320,27 +320,74 @@ let add_extra extras tables pkg =
+@@ -320,27 +320,70 @@ let add_extra extras tables pkg =
  
  let tocudf tables ?(options=default_options) ?(inst=false) pkg =
    if options.native <> "" then begin
@@ -17,11 +17,7 @@ index cd83799..ecfd929 100644
 -        |`Same -> []
 -      in
 -      l@(add_arch_l options.native pkg.architecture (loadlp tables 
pkg.provides))
-+    let pkgarch =
-+      match options.host,is_source pkg with
-+      |"",true -> options.native   (* source package : build deps on the 
native arch *)
-+      |_,true -> options.host      (* source package : build deps on the 
cross arch *)
-+      |_,false -> pkg.architecture (* binary package : dependencies are 
package specific *)
++    let pkgarch = pkg.architecture (* binary package : dependencies are 
package specific *)
 +    in
 +    let _name = 
 +      (* if the package is a source package the name does not need an

-- 
dose3 packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to