[Pkg-ocaml-maint-commits] r2311 - in trunk/packages/camomile/trunk/debian: . patches

[Sylvain Le Gall]

Author: gildor
Date: 2005-12-19 22:45:49 +0000 (Mon, 19 Dec 2005)
New Revision: 2311

Modified:
   trunk/packages/camomile/trunk/debian/changelog
   trunk/packages/camomile/trunk/debian/patches/makefile.dpatch
Log:
Fix FTBFS on non-opt platform -- SLG


Modified: trunk/packages/camomile/trunk/debian/changelog
===================================================================
--- trunk/packages/camomile/trunk/debian/changelog	2005-12-19 22:24:46 UTC (rev 2310)
+++ trunk/packages/camomile/trunk/debian/changelog	2005-12-19 22:45:49 UTC (rev 2311)
@@ -1,3 +1,10 @@
+camomile (0.6.3-2) unstable; urgency=low
+
+  * Update patch makefile to support compilation on non-opt platform
+    (Closes: #343874)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 19 Dec 2005 23:45:08 +0100
+
 camomile (0.6.3-1) unstable; urgency=low
 
   * Initial upload ( closes: #211991 )

Modified: trunk/packages/camomile/trunk/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/camomile/trunk/debian/patches/makefile.dpatch	2005-12-19 22:24:46 UTC (rev 2310)
+++ trunk/packages/camomile/trunk/debian/patches/makefile.dpatch	2005-12-19 22:45:49 UTC (rev 2311)
@@ -24,8 +24,23 @@
 
 @DPATCH@
 diff -urNad camomile-0.6.3~/Makefile.in camomile-0.6.3/Makefile.in
---- camomile-0.6.3~/Makefile.in	2005-11-09 16:15:08.000000000 +0100
-+++ camomile-0.6.3/Makefile.in	2005-11-09 16:18:37.000000000 +0100
+--- camomile-0.6.3~/Makefile.in	2005-12-19 23:38:43.000000000 +0100
++++ camomile-0.6.3/Makefile.in	2005-12-19 23:39:27.000000000 +0100
+@@ -60,12 +60,12 @@
+ # Generic targets
+ #################
+ 
+-all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
++all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data
+ 
+ # Build the library
+ ###################
+ 
+-lib : byte $(OCAMLBEST) opt
++lib : byte $(OCAMLBEST)
+ 
+ INT =\
+ public/xArray.cmi public/oOChannel.cmi\
 @@ -382,7 +382,7 @@
  	if [ -f camomile.cma ]; then files="camomile.* $$files"; fi&&\
  	if [ -f libcamomile.a ]; then files="libcamomile.a $$files"; fi &&\