[Pkg-ocaml-maint-commits] r3107 - in /trunk/packages/cameleon/trunk/debian: changelog control control.in patches/00list patches/checkocaml.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Mon Sep 11 16:52:07 2006
New Revision: 3107

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3107
Log:
Build on archs without ocamlopt.

Added:
    trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch   (with props)
Removed:
    trunk/packages/cameleon/trunk/debian/control.in
Modified:
    trunk/packages/cameleon/trunk/debian/changelog
    trunk/packages/cameleon/trunk/debian/control
    trunk/packages/cameleon/trunk/debian/patches/00list
    trunk/packages/cameleon/trunk/debian/rules

Modified: trunk/packages/cameleon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/changelog?rev=3107&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/changelog (original)
+++ trunk/packages/cameleon/trunk/debian/changelog Mon Sep 11 16:52:07 2006
@@ -1,3 +1,12 @@
+cameleon (1.9.13-2) unstable; urgency=low
+
+  * Added checkocaml.dpatch in order to be able to build on architectures
+    without ocamlopt, closes: #373830.
+  * Removed control.in as per new ocaml policy.
+  * Added myself to uploaders.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 11 Sep 2006 12:24:24 +0000
+
 cameleon (1.9.13-1) unstable; urgency=high
 
   * New upstream version,

Modified: trunk/packages/cameleon/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/control?rev=3107&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/control (original)
+++ trunk/packages/cameleon/trunk/debian/control Mon Sep 11 16:52:07 2006
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.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>
+Uploaders: Samuel Mimram <smimram at debian.org>, 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.2), liblablgtk2-ocaml-dev (>= 2.4.0), libxml-light-ocaml-dev, libxml2-utils, xsltproc, docbook-xsl (>= 1.64.1), docbook-xml (>= 4.2-12), imagemagick, ocaml-findlib
 Standards-Version: 3.7.2.0
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/cameleon
@@ -97,4 +97,3 @@
   - Gpattern, a library containing convenient classes to use with LablGtk. 
  .
  You can find more information about cameleon at http://home.gna.org/cameleon/
-

Modified: trunk/packages/cameleon/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/00list?rev=3107&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/00list (original)
+++ trunk/packages/cameleon/trunk/debian/patches/00list Mon Sep 11 16:52:07 2006
@@ -1,3 +1,4 @@
 xml_light
 ocamldoc_best
 byte_compilation
+checkocaml

Added: trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch?rev=3107&op=file
==============================================================================
--- trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch (added)
+++ trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch Mon Sep 11 16:52:07 2006
@@ -1,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## checkocaml.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: ocamlopt is not mandatory to build cameleon.
+
+ at DPATCH@
+diff -urNad cameleon-1.9.13~/utils/checkocaml.ml cameleon-1.9.13/utils/checkocaml.ml
+--- cameleon-1.9.13~/utils/checkocaml.ml	2006-05-10 09:15:35.000000000 +0000
++++ cameleon-1.9.13/utils/checkocaml.ml	2006-09-11 12:22:37.000000000 +0000
+@@ -859,7 +859,7 @@
+ (*/c==v=[OCaml_conf.detect_xml_light]=0.1====*)
+ 
+ let ocaml_required = [3;9;1]
+-let conf = ocaml_conf ~withopt: true  ();;
++let conf = ocaml_conf ~withopt:false  ();;
+ print_conf conf;;
+ 
+ let _ =
+@@ -871,12 +871,12 @@
+ 
+ let _ = !print "\n### checking required tools and libraries ###\n"
+ let _ =
+-  match detect_xml_light conf with
++  match detect_xml_light ~modes:[`Byte] conf with
+     "", [] -> !fatal_error "Could not link with Xml-light"
+   | s, _ -> add_subst "XMLLIGHT_INCLUDES" s
+ 
+ let _ =
+-  match detect_lablgtk2 conf with
++  match detect_lablgtk2 ~modes:[`Byte] conf with
+     "", [] -> !fatal_error "Could not link with LablGtk2"
+   | s, _ -> add_subst "LABLGTK2_INCLUDES" s
+ 

Propchange: trunk/packages/cameleon/trunk/debian/patches/checkocaml.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/cameleon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cameleon/trunk/debian/rules?rev=3107&op=diff
==============================================================================
--- trunk/packages/cameleon/trunk/debian/rules (original)
+++ trunk/packages/cameleon/trunk/debian/rules Mon Sep 11 16:52:07 2006
@@ -17,8 +17,6 @@
 REPORT=$(CURDIR)/debian/ocaml-report
 OCAMLABI=$(shell ocamlc -version)
 
-debian/control: debian/control.in
-	 sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
 
 configure: configure-stamp
 configure-stamp: patch-stamp