[Pkg-ocaml-maint-commits] r2589 - in trunk/packages/extlib/trunk/debian: . patches

[Stefano Zacchiroli]

Author: zack
Date: 2006-02-20 17:37:05 +0000 (Mon, 20 Feb 2006)
New Revision: 2589

Modified:
   trunk/packages/extlib/trunk/debian/changelog
   trunk/packages/extlib/trunk/debian/patches/03_install.dpatch
Log:
bugfix: ready for 1.5-2


Modified: trunk/packages/extlib/trunk/debian/changelog
===================================================================
--- trunk/packages/extlib/trunk/debian/changelog	2006-02-20 17:15:08 UTC (rev 2588)
+++ trunk/packages/extlib/trunk/debian/changelog	2006-02-20 17:37:05 UTC (rev 2589)
@@ -1,3 +1,10 @@
+extlib (1.5-2) unstable; urgency=low
+
+  * debian/patches/03_install.dpatch
+    - bugfix: invoke ocamldoc to generate html documentation
+
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 20 Feb 2006 12:33:04 -0500
+
 extlib (1.5-1) unstable; urgency=low
 
   * New upstream release (closes: #353734)

Modified: trunk/packages/extlib/trunk/debian/patches/03_install.dpatch
===================================================================
--- trunk/packages/extlib/trunk/debian/patches/03_install.dpatch	2006-02-20 17:15:08 UTC (rev 2588)
+++ trunk/packages/extlib/trunk/debian/patches/03_install.dpatch	2006-02-20 17:37:05 UTC (rev 2589)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2006-02-20 11:52:49.000000000 -0500
-+++ trunk/Makefile	2006-02-20 11:52:49.000000000 -0500
+--- trunk~/Makefile	2006-02-20 12:32:37.000000000 -0500
++++ trunk/Makefile	2006-02-20 12:32:37.000000000 -0500
 @@ -17,7 +17,7 @@
  	ocamlc -c $(MODULES:=.mli)
  	mkdir -p doc/
@@ -18,8 +18,8 @@
  install:
  	cp META.txt META
 diff -urNad trunk~/install.ml trunk/install.ml
---- trunk~/install.ml	2006-02-20 11:52:49.000000000 -0500
-+++ trunk/install.ml	2006-02-20 11:53:02.000000000 -0500
+--- trunk~/install.ml	2006-02-20 12:32:37.000000000 -0500
++++ trunk/install.ml	2006-02-20 12:32:58.000000000 -0500
 @@ -171,12 +171,12 @@
  		List.iter (fun m -> remove (m ^ obj_ext)) modules;
  		remove ("extLib" ^ obj_ext);
@@ -30,12 +30,12 @@
 -				| PathDos -> sprintf "%s odoc_style.css %s\\style.css";
 -				| PathUnix -> sprintf "%s odoc_style.css %s/style.css") cp_cmd doc_dir);
 -	end;
-+(*         if !autodoc then begin
++        if !autodoc then begin
 +                run (sprintf "ocamldoc -sort -html -d %s %s" doc_dir (m_list ".mli"));
-+                run ((match path_type with
++(*                 run ((match path_type with
 +                                | PathDos -> sprintf "%s odoc_style.css %s\\style.css";
-+                                | PathUnix -> sprintf "%s odoc_style.css %s/style.css") cp_cmd doc_dir);
-+        end; *)
++                                | PathUnix -> sprintf "%s odoc_style.css %s/style.css") cp_cmd doc_dir); *)
++        end;
  	match install_dir with
  	  Findlib ->
  	    let files = Buffer.create 0 in