[Pkg-ocaml-maint-commits] r2309 - in trunk/packages/cameleon/trunk/debian: . patches

[Sylvain Le Gall]

Author: gildor
Date: 2005-12-19 22:20:09 +0000 (Mon, 19 Dec 2005)
New Revision: 2309

Added:
   trunk/packages/cameleon/trunk/debian/patches/byte_compilation.dpatch
Modified:
   trunk/packages/cameleon/trunk/debian/changelog
   trunk/packages/cameleon/trunk/debian/control
   trunk/packages/cameleon/trunk/debian/control.in
   trunk/packages/cameleon/trunk/debian/patches/00list
Log:
Fix FTBFS for cameleon -- SLG


Modified: trunk/packages/cameleon/trunk/debian/changelog
===================================================================
--- trunk/packages/cameleon/trunk/debian/changelog	2005-12-19 21:33:12 UTC (rev 2308)
+++ trunk/packages/cameleon/trunk/debian/changelog	2005-12-19 22:20:09 UTC (rev 2309)
@@ -1,3 +1,11 @@
+cameleon (1.9.9.cvs20051129-2) unstable; urgency=low
+
+  * Add dependency on imagemagick (Closes: #343360)
+  * Apply patche byte_compilation to fix compilation on non-opt platform
+    (Closes: #343873)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org>  Mon, 19 Dec 2005 22:30:25 +0100
+
 cameleon (1.9.9.cvs20051129-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/cameleon/trunk/debian/control
===================================================================
--- trunk/packages/cameleon/trunk/debian/control	2005-12-19 21:33:12 UTC (rev 2308)
+++ trunk/packages/cameleon/trunk/debian/control	2005-12-19 22:20:09 UTC (rev 2309)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= 3.09.0), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12)
+Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= 3.09.0), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick
 Standards-Version: 3.6.2.0
 
 Package: cameleon

Modified: trunk/packages/cameleon/trunk/debian/control.in
===================================================================
--- trunk/packages/cameleon/trunk/debian/control.in	2005-12-19 21:33:12 UTC (rev 2308)
+++ trunk/packages/cameleon/trunk/debian/control.in	2005-12-19 22:20:09 UTC (rev 2309)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
 Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= #OCamlABI#), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12)
+Build-Depends: debhelper (>> 4.0.0), dpatch, ocaml-nox (>= #OCamlABI#), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick
 Standards-Version: 3.6.2.0
 
 Package: cameleon

Modified: trunk/packages/cameleon/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list	2005-12-19 21:33:12 UTC (rev 2308)
+++ trunk/packages/cameleon/trunk/debian/patches/00list	2005-12-19 22:20:09 UTC (rev 2309)
@@ -1,3 +1,4 @@
 xml_light
 ocamldoc_best
 make_3_81
+byte_compilation

Added: trunk/packages/cameleon/trunk/debian/patches/byte_compilation.dpatch
===================================================================
--- trunk/packages/cameleon/trunk/debian/patches/byte_compilation.dpatch	2005-12-19 21:33:12 UTC (rev 2308)
+++ trunk/packages/cameleon/trunk/debian/patches/byte_compilation.dpatch	2005-12-19 22:20:09 UTC (rev 2309)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## byte_compilation.dpatch by Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cameleon-1.9.9.cvs20051129~/src/Makefile cameleon-1.9.9.cvs20051129/src/Makefile
+--- cameleon-1.9.9.cvs20051129~/src/Makefile	2005-12-19 23:06:28.000000000 +0100
++++ cameleon-1.9.9.cvs20051129/src/Makefile	2005-12-19 23:07:10.000000000 +0100
+@@ -336,7 +336,7 @@
+ OCAMLCVS_LIB_CMOFILES=$(OCAMLCVS_COMMON_CMOFILES) \
+ 	ocamlcvs/ocamlcvs.cmo
+ OCAMLCVS_LIB_CMXFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmx)
+-OCAMLCVS_LIB_CMIFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmx)
++OCAMLCVS_LIB_CMIFILES= $(OCAMLCVS_LIB_CMOFILES:.cmo=.cmi)
+ 
+ LIBOCAMLCVS=ocamlcvs/ocamlcvs.cmxa
+ LIBOCAMLCVS_BYTE=$(LIBOCAMLCVS:.cmxa=.cma)
+@@ -357,7 +357,11 @@
+ tools: libs $(TOOLS)
+ tools_byte: libs_byte $(TOOLS_BYTE)
+ 
++ifeq ($(OCAMLBEST),opt)
+ all: byte plugins opt
++else
++all: byte plugins
++endif
+ 
+ libcf: $(LIBCF_INT) $(LIBCF)
+ libcf_byte: $(LIBCF_INT) $(LIBCF_BYTE)


Property changes on: trunk/packages/cameleon/trunk/debian/patches/byte_compilation.dpatch
___________________________________________________________________
Name: svn:executable
   + *