[Pkg-ocaml-maint-commits] r4482 - in /trunk/packages/missinglib/trunk/debian: changelog control patches/00list patches/camlp5.dpatch patches/loc.dpatch rules

smimram at users.alioth.debian.org smimram at users.alioth.debian.org
Sun Sep 9 15:48:33 UTC 2007 

Author: smimram
Date: Sun Sep  9 15:48:32 2007
New Revision: 4482

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4482
Log:
Rebuild with OCaml 3.10.

Added:
    trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch   (with props)
Removed:
    trunk/packages/missinglib/trunk/debian/patches/loc.dpatch
Modified:
    trunk/packages/missinglib/trunk/debian/changelog
    trunk/packages/missinglib/trunk/debian/control
    trunk/packages/missinglib/trunk/debian/patches/00list
    trunk/packages/missinglib/trunk/debian/rules

Modified: trunk/packages/missinglib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/debian/changelog?rev=4482&op=diff
==============================================================================
--- trunk/packages/missinglib/trunk/debian/changelog (original)
+++ trunk/packages/missinglib/trunk/debian/changelog Sun Sep  9 15:48:32 2007
@@ -1,3 +1,11 @@
+missinglib (0.4.10.debian-4) unstable; urgency=low
+
+  * Rebuild with OCaml 3.10.
+  * Added camlp5.dpatch and removed loc.dpatch in order to use camlp5 as
+    preprocessor.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 09 Sep 2007 14:58:31 +0200
+
 missinglib (0.4.10.debian-3) unstable; urgency=low
 
   * Replaced dependency on ocmal-tools by ocamlmakefile [Ralf Treinen].

Modified: trunk/packages/missinglib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/debian/control?rev=4482&op=diff
==============================================================================
--- trunk/packages/missinglib/trunk/debian/control (original)
+++ trunk/packages/missinglib/trunk/debian/control Sun Sep  9 15:48:32 2007
@@ -3,7 +3,7 @@
 Section: devel
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), ocamlmakefile, ocaml-findlib (>= 1.0.4-1), libounit-ocaml-dev (>= 1.0.1-2), dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.10), camlp5, ocamlmakefile, ocaml-findlib (>= 1.0.4-1), libounit-ocaml-dev (>= 1.0.1-2), dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/missinglib
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/

Modified: trunk/packages/missinglib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/debian/patches/00list?rev=4482&op=diff
==============================================================================
--- trunk/packages/missinglib/trunk/debian/patches/00list (original)
+++ trunk/packages/missinglib/trunk/debian/patches/00list Sun Sep  9 15:48:32 2007
@@ -1,2 +1,2 @@
-loc
+camlp5
 no_warn-error

Added: trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch?rev=4482&op=file
==============================================================================
--- trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch (added)
+++ trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch Sun Sep  9 15:48:32 2007
@@ -1,0 +1,154 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp5.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use camlp5 as preprocessor.
+
+ at DPATCH@
+diff -urNad missinglib-0.4.10.debian~/libsrc/META missinglib-0.4.10.debian/libsrc/META
+--- missinglib-0.4.10.debian~/libsrc/META	2004-09-01 01:49:20.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/META	2007-09-09 14:52:27.000000000 +0200
+@@ -8,7 +8,7 @@
+ package "pa_bparser" (
+   version = "0.5.0"
+   description = "Backtracking Parser Extension for Camlp4"
+-  requires = "camlp4 missinglib"
++  requires = "camlp5 missinglib"
+   archive(syntax,preprocessor) = "pa_bparser.cmo"
+   archive(syntax,toploop) = "pa_bparser.cmo"
+ )
+diff -urNad missinglib-0.4.10.debian~/libsrc/Makefile missinglib-0.4.10.debian/libsrc/Makefile
+--- missinglib-0.4.10.debian~/libsrc/Makefile	2004-12-13 15:30:53.000000000 +0100
++++ missinglib-0.4.10.debian/libsrc/Makefile	2007-09-09 14:53:08.000000000 +0200
+@@ -54,7 +54,7 @@
+ 	   -I anyDBM \
+ 	    -I configParser -I fileutil -I unixutil -I streamutil -I bnf
+ 	    
+-OCAMLDOC = ocamldoc -pp camlp4o -stars -sort $(INCLDIRS)
++OCAMLDOC = ocamldoc -pp camlp5o -stars -sort $(INCLDIRS)
+ #LIBS = str
+ RESULT = missinglib
+ OCAMLYACC := ocamlyacc -v
+@@ -91,7 +91,7 @@
+ endif
+ 
+ camlp4/%.cmo: camlp4/%.ml 
+-	ocamlc -pp "camlp4r pa_extend.cmo q_MLast.cmo" -c -o $@ -I +camlp4 $<
++	ocamlc -pp "camlp5r pa_extend.cmo q_MLast.cmo" -c -o $@ -I +camlp5 $<
+ 
+ interact: all
+ 	ocaml $(INCLDIRS) unix.cma str.cma missinglib.cma
+diff -urNad missinglib-0.4.10.debian~/libsrc/bnf/aBNF_core.ml missinglib-0.4.10.debian/libsrc/bnf/aBNF_core.ml
+--- missinglib-0.4.10.debian~/libsrc/bnf/aBNF_core.ml	2004-09-02 01:05:17.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/bnf/aBNF_core.ml	2007-09-09 14:52:17.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4 -I . -I ./camlp4 -I ../camlp4 pa_o.cmo pa_bparser.cmo pr_dump.cmo *)
++(*pp camlp5 -I . -I ./camlp4 -I ../camlp4 pa_o.cmo pa_bparser.cmo pr_dump.cmo *)
+ (* arch-tag: ABNF core rules
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/bnf/aBNF_def.ml missinglib-0.4.10.debian/libsrc/bnf/aBNF_def.ml
+--- missinglib-0.4.10.debian~/libsrc/bnf/aBNF_def.ml	2004-09-02 01:05:22.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/bnf/aBNF_def.ml	2007-09-09 14:52:07.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4 -I . -I ./camlp4 -I ../camlp4 pa_o.cmo pa_bparser.cmo pr_dump.cmo *)
++(*pp camlp5 -I . -I ./camlp4 -I ../camlp4 pa_o.cmo pa_bparser.cmo pr_dump.cmo *)
+ (* arch-tag: ABNF Defintion
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/bnf/bNF_boot.ml missinglib-0.4.10.debian/libsrc/bnf/bNF_boot.ml
+--- missinglib-0.4.10.debian~/libsrc/bnf/bNF_boot.ml	2004-09-02 01:04:57.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/bnf/bNF_boot.ml	2007-09-09 14:51:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: ABNF bootstrap code
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/bnf/bNFparseutil.ml missinglib-0.4.10.debian/libsrc/bnf/bNFparseutil.ml
+--- missinglib-0.4.10.debian~/libsrc/bnf/bNFparseutil.ml	2004-09-02 01:05:22.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/bnf/bNFparseutil.ml	2007-09-09 14:51:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: BNF parser utilities
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/bnf/bNFsupport.ml missinglib-0.4.10.debian/libsrc/bnf/bNFsupport.ml
+--- missinglib-0.4.10.debian~/libsrc/bnf/bNFsupport.ml	2004-09-01 01:49:19.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/bnf/bNFsupport.ml	2007-09-09 14:51:39.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: BNF support code
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml
+--- missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml	2007-09-09 14:51:21.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml	2007-09-09 14:53:29.000000000 +0200
+@@ -1,4 +1,4 @@
+-(* camlp4r pa_extend.cmo q_MLast.cmo *)
++(* camlp5r pa_extend.cmo q_MLast.cmo *)
+ (***********************************************************************)
+ (*                                                                     *)
+ (*                             Camlp4                                  *)
+diff -urNad missinglib-0.4.10.debian~/libsrc/camlp4/pa_op.ml.ocaml-orig missinglib-0.4.10.debian/libsrc/camlp4/pa_op.ml.ocaml-orig
+--- missinglib-0.4.10.debian~/libsrc/camlp4/pa_op.ml.ocaml-orig	2004-09-01 01:49:19.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/camlp4/pa_op.ml.ocaml-orig	2007-09-09 14:53:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-(* camlp4r pa_extend.cmo q_MLast.cmo *)
++(* camlp5r pa_extend.cmo q_MLast.cmo *)
+ (***********************************************************************)
+ (*                                                                     *)
+ (*                             Camlp4                                  *)
+diff -urNad missinglib-0.4.10.debian~/libsrc/camlp4doc/pa_bparser.mli missinglib-0.4.10.debian/libsrc/camlp4doc/pa_bparser.mli
+--- missinglib-0.4.10.debian~/libsrc/camlp4doc/pa_bparser.mli	2004-09-01 01:49:20.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/camlp4doc/pa_bparser.mli	2007-09-09 14:54:05.000000000 +0200
+@@ -21,10 +21,10 @@
+ 
+ (** {1 Introduction}
+ 
+-NOTE: THIS MODULE IS ONLY USABLE AS A CAMLP4 EXTENSION; SEE BELOW FOR
++NOTE: THIS MODULE IS ONLY USABLE AS A CAMLP5 EXTENSION; SEE BELOW FOR
+ DETAILS.
+ 
+-The standard camlp4 system comes with the syntax extension [pa_op.cmo] which
++The standard camlp5 system comes with the syntax extension [pa_op.cmo] which
+ adds support for the [parser] keyword to the OCaml language.
+ 
+ This is nice, but it lacks backtracking.  Here is an illustration of
+@@ -59,6 +59,6 @@
+ This module defines the [ocamlfind] module [missinglib.pa_bparser].  You can
+ use it like this:
+ 
+-{[ocamlfind ocamlc -linkpkg -o test -package missinglib.pa_bparser -syntax camlp4o test.ml]}
++{[ocamlfind ocamlc -linkpkg -o test -package missinglib.pa_bparser -syntax camlp5o test.ml]}
+ 
+ *)
+diff -urNad missinglib-0.4.10.debian~/libsrc/streamutil/streamutil.ml missinglib-0.4.10.debian/libsrc/streamutil/streamutil.ml
+--- missinglib-0.4.10.debian~/libsrc/streamutil/streamutil.ml	2004-07-21 23:22:52.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/streamutil/streamutil.ml	2007-09-09 14:53:42.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: Stream parser-related utilities
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 
+diff -urNad missinglib-0.4.10.debian~/libsrc/unixutil/unixutil.ml missinglib-0.4.10.debian/libsrc/unixutil/unixutil.ml
+--- missinglib-0.4.10.debian~/libsrc/unixutil/unixutil.ml	2004-08-06 23:52:44.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/unixutil/unixutil.ml	2007-09-09 14:53:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: Unix module utilities
+ * Copyright (c) 2004 John Goerzen
+ *)
+diff -urNad missinglib-0.4.10.debian~/test/teststreamutil.ml missinglib-0.4.10.debian/test/teststreamutil.ml
+--- missinglib-0.4.10.debian~/test/teststreamutil.ml	2004-12-13 15:32:19.000000000 +0100
++++ missinglib-0.4.10.debian/test/teststreamutil.ml	2007-09-09 14:54:16.000000000 +0200
+@@ -1,4 +1,4 @@
+-(*pp camlp4o *)
++(*pp camlp5o *)
+ (* arch-tag: tests for streamutil
+ Copyright (C) 2004 John Goerzen <jgoerzen at complete.org>
+ 

Propchange: trunk/packages/missinglib/trunk/debian/patches/camlp5.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/missinglib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/missinglib/trunk/debian/rules?rev=4482&op=diff
==============================================================================
--- trunk/packages/missinglib/trunk/debian/rules (original)
+++ trunk/packages/missinglib/trunk/debian/rules Sun Sep  9 15:48:32 2007
@@ -48,7 +48,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	-$(MAKE) distclean
+	$(MAKE) distclean
 
 	dh_clean

More information about the Pkg-ocaml-maint-commits mailing list