[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.4-1-1-gca29d33

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit ca29d330300c598b226dd8a5de6b3c442564d72a
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sat Feb 28 23:37:18 2009 +0100

    Revert "Simplify site_lib_metas.dpatch"
    
    Add back "directory" directive to site_lib_metas patch, fixes FTBFS of
    reverse dependent packages which need the "num" findlib package
    (revert "simplify site_lib_metas" change in -1)
    
    This reverts commit af639b9087026dc7b6bfc9c95a52cd91c6c43c3f.

diff --git a/debian/changelog b/debian/changelog
index 073fa74..e57813b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+findlib (1.2.4-2) unstable; urgency=low
+
+  * add back "directory" directive to site_lib_metas patch, fixes FTBFS of
+    reverse dependent packages which need the "num" findlib package
+    (revert "simplify site_lib_metas" change in -1)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sat, 28 Feb 2009 23:33:44 +0100
+
 findlib (1.2.4-1) unstable; urgency=low
 
   [ Stephane Glondu ]
diff --git a/debian/patches/site_lib_metas.dpatch b/debian/patches/site_lib_metas.dpatch
index 7d56dd1..a83c04e 100755
--- a/debian/patches/site_lib_metas.dpatch
+++ b/debian/patches/site_lib_metas.dpatch
@@ -2,9 +2,22 @@
 ## site_lib_metas.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add directory to META.num-top
+## DP: META.num*: bugfix, moved "directory" directive outside "core" subpackage
 
 @DPATCH@
+diff -urNad trunk~/site-lib-src/num/META.in trunk/site-lib-src/num/META.in
+--- trunk~/site-lib-src/num/META.in	2004-01-11 16:05:51.000000000 +0100
++++ trunk/site-lib-src/num/META.in	2004-01-11 16:05:52.000000000 +0100
+@@ -4,8 +4,8 @@
+ `requires(toploop) = "num.core,num-top"'
+ `version = "[distributed with Ocaml]"'
+ `description = "Arbitrary-precision rational arithmetic"'
++`directory = "^"'
+ `package "core" ('
+-`  directory = "^"'
+ `  version = "[internal]"'
+ `  browse_interfaces = "'interfaces`"'
+ `  archive(byte) = "nums.cma"'
 diff -urNad trunk~/site-lib-src/num-top/META.in trunk/site-lib-src/num-top/META.in
 --- trunk~/site-lib-src/num-top/META.in	2004-01-11 16:05:51.000000000 +0100
 +++ trunk/site-lib-src/num-top/META.in	2004-01-11 16:05:52.000000000 +0100

-- 
findlib packaging