[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.2-1-3-g2e4d239

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 2e4d2391406cc2124cbe6c43398c44bcef73f151
Author: Ralf Treinen <treinen at debian.org>
Date:   Sat Sep 8 14:06:56 2012 +0200

    dropped another instance of is_source (let _name = ...)

diff --git a/debian/patches/multiarch-conflicts b/debian/patches/multiarch-conflicts
index 66bcb27..12188bd 100644
--- a/debian/patches/multiarch-conflicts
+++ b/debian/patches/multiarch-conflicts
@@ -1,8 +1,8 @@
-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,70 @@ let add_extra extras tables pkg =
+Index: dose3/deb/debcudf.ml
+===================================================================
+--- dose3.orig/deb/debcudf.ml	2012-09-08 14:06:46.000000000 +0200
++++ dose3/deb/debcudf.ml	2012-09-08 14:14:46.000000000 +0200
+@@ -320,27 +320,66 @@
  
  let tocudf tables ?(options=default_options) ?(inst=false) pkg =
    if options.native <> "" then begin
@@ -19,11 +19,7 @@ index cd83799..ecfd929 100644
 -      l@(add_arch_l options.native pkg.architecture (loadlp tables pkg.provides))
 +    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
-+       * architecture annotation. Nobody depends on it *)
-+      if is_source pkg then (CudfAdd.encode pkg.name) 
-+      else add_arch options.native pkgarch pkg.name 
++    let _name = add_arch options.native pkgarch pkg.name
 +    in
 +    let _version = get_cudf_version tables (pkg.name,pkg.version)  in
 +    let _provides = match pkg.multiarch with
@@ -67,11 +63,11 @@ index cd83799..ecfd929 100644
 +      (* self conflict *)
 +      let sc = (add_arch options.native pkgarch pkg.name,None) in
 +      let multiarchconstraints = match pkg.multiarch with
-+        |(`None|`Foreign|`Allowed) -> 
++        |(`None|`Foreign|`Allowed) ->
 +            (* conflict with all other packages with differents archs *)
 +            let mac = (CudfAdd.encode pkg.name,None) in
-+            [sc; mac] 
-+        |`Same -> 
++            [sc; mac]
++        |`Same ->
 +            (* conflict with packages of same name but different arch and version*)
 +            let masc =
 +              List.filter_map (function
@@ -79,7 +75,7 @@ index cd83799..ecfd929 100644
 +                |arch -> Some(add_arch options.native arch pkg.name,Some(`Neq,_version))
 +              ) (options.native::options.foreign)
 +            in
-+            sc :: masc 
++            sc :: masc
 +      in
 +      let multiarchconflicts =
 +        List.flatten (

-- 
dose3 packaging