[Pkg-ocaml-maint-commits] r4139 - in /trunk/packages/ulex0.8/trunk/debian: changelog control patches/00list patches/camlp5.dpatch patches/install_destdir.dpatch patches/meta_version.dpatch patches/versioned_lib.dpatch svn-deblayout

zack at users.alioth.debian.org zack at users.alioth.debian.org
Thu Aug 9 19:14:02 UTC 2007 

Author: zack
Date: Thu Aug  9 19:14:02 2007
New Revision: 4139

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4139
Log:
build against camlp5

Added:
    trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch   (with props)
    trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch   (with props)
Modified:
    trunk/packages/ulex0.8/trunk/debian/changelog
    trunk/packages/ulex0.8/trunk/debian/control
    trunk/packages/ulex0.8/trunk/debian/patches/00list
    trunk/packages/ulex0.8/trunk/debian/patches/install_destdir.dpatch   (props changed)
    trunk/packages/ulex0.8/trunk/debian/patches/meta_version.dpatch   (props changed)
    trunk/packages/ulex0.8/trunk/debian/svn-deblayout

Modified: trunk/packages/ulex0.8/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/changelog?rev=4139&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/changelog (original)
+++ trunk/packages/ulex0.8/trunk/debian/changelog Thu Aug  9 19:14:02 2007
@@ -1,5 +1,5 @@
-ulex (0.8-1) unstable; urgency=low
+ulex0.8 (0.8-1) unstable; urgency=low
 
   * First release (Closes: #xxxx).
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat,  4 Nov 2006 09:30:45 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 09 Aug 2007 15:12:41 -0400

Modified: trunk/packages/ulex0.8/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/control?rev=4139&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/control (original)
+++ trunk/packages/ulex0.8/trunk/debian/control Thu Aug  9 19:14:02 2007
@@ -2,13 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5.0.0), ocaml-nox (>= 3.10.0), ocaml-findlib, dpatch, cdbs
+Build-Depends: debhelper (>= 5.0.0), ocaml-nox (>= 3.10.0), ocaml-findlib, dpatch, cdbs, camlp5
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ulex0.8
 
 Package: ocaml-ulex08
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, camlp5, ocaml-findlib, ${misc:Depends}
 Description: OCaml lexer generator with Unicode support - CamlP5 version
  ulex is a lexer generator for the Objective Caml (OCaml) programming
  language.

Modified: trunk/packages/ulex0.8/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/patches/00list?rev=4139&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/patches/00list (original)
+++ trunk/packages/ulex0.8/trunk/debian/patches/00list Thu Aug  9 19:14:02 2007
@@ -1,2 +1,4 @@
 install_destdir.dpatch
 meta_version.dpatch
+versioned_lib.dpatch
+camlp5.dpatch

Added: trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch?rev=4139&op=file
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch (added)
+++ trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch Thu Aug  9 19:14:02 2007
@@ -1,0 +1,59 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp5.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: build (and install) using camlp5 instead of camlp4
+
+ at DPATCH@
+diff -urNad trunk~/META trunk/META
+--- trunk~/META	2007-08-09 15:10:12.000000000 -0400
++++ trunk/META	2007-08-09 15:11:31.000000000 -0400
+@@ -1,5 +1,5 @@
+ version = "0.8"
+-requires = "camlp4"
++requires = "camlp5"
+ description = "Runtime support for ulex"
+ archive(byte) = "ulexing.cma"
+ archive(native) = "ulexing.cmxa"
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-08-09 15:10:12.000000000 -0400
++++ trunk/Makefile	2007-08-09 15:11:31.000000000 -0400
+@@ -20,7 +20,7 @@
+ 	ocamlopt -a -o ulexing.cmxa $(ULEXING)
+ 
+ pa_ulex.cma: $(ULEX)
+-	ocamlc -a -o pa_ulex.cma -pp 'camlp4o pa_extend.cmo q_MLast.cmo' -I +camlp4 $(ULEX)
++	ocamlc -a -o pa_ulex.cma -pp 'camlp5o pa_extend.cmo q_MLast.cmo' -I +camlp5 $(ULEX)
+ 
+ pa_ulex.ml: pa_ulex.ml.src
+ 	ocaml mk_pa_ulex.ml
+@@ -29,14 +29,14 @@
+ 	rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml
+ 
+ view_test: pa_ulex.cma
+-	camlp4o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml
++	camlp5o ./pa_ulex.cma pr_o.cmo -sep "\n" test.ml
+ 
+ run_test: ulexing.cma pa_ulex.cma
+-	ocamlc -o test -pp 'camlp4o ./pa_ulex.cma' ulexing.cma test.ml
++	ocamlc -o test -pp 'camlp5o ./pa_ulex.cma' ulexing.cma test.ml
+ 	./test
+ 
+ custom_ulexing: ulexing.cma pa_ulex.cma
+-	ocamlc -o custom_ulexing -pp 'camlp4o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml
++	ocamlc -o custom_ulexing -pp 'camlp5o ./pa_ulex.cma' ulexing.cma custom_ulexing.ml
+ 
+ 
+ doc:
+diff -urNad trunk~/README trunk/README
+--- trunk~/README	2005-10-30 02:59:49.000000000 -0500
++++ trunk/README	2007-08-09 15:11:31.000000000 -0400
+@@ -142,7 +142,7 @@
+ 
+ Compilation of OCaml files with lexer specifications:
+ 
+-  ocamlfind ocamlc -c -package ulex -syntax camlp4o my_file.ml
++  ocamlfind ocamlc -c -package ulex -syntax camlp5o my_file.ml
+ 
+ When linking, you must also include the ulex package:
+   ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo

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

Propchange: trunk/packages/ulex0.8/trunk/debian/patches/install_destdir.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Propchange: trunk/packages/ulex0.8/trunk/debian/patches/meta_version.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch?rev=4139&op=file
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch (added)
+++ trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch Thu Aug  9 19:14:02 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## versioned_lib.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: install with META name "ulex08"
+
+ at DPATCH@
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile	2007-08-09 15:06:48.000000000 -0400
++++ trunk/Makefile	2007-08-09 15:08:25.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ DESTDIR=
+ install: all
+-	ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
++	ocamlfind install -destdir $(DESTDIR) ulex08 META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
+ 
+ uninstall:
+ 	ocamlfind remove ulex

Propchange: trunk/packages/ulex0.8/trunk/debian/patches/versioned_lib.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ulex0.8/trunk/debian/svn-deblayout
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/svn-deblayout?rev=4139&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/svn-deblayout (original)
+++ trunk/packages/ulex0.8/trunk/debian/svn-deblayout Thu Aug  9 19:14:02 2007
@@ -1,3 +1,1 @@
-origDir=../upstream
-origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ulex/upstream
-tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ulex
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ulex0.8

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