[Pkg-ocaml-maint-commits] r4140 - in /trunk/packages/ulex0.8/trunk/debian: patches/camlp5.dpatch rules

[zack at users.alioth.debian.org]

Author: zack
Date: Thu Aug  9 19:48:23 2007
New Revision: 4140

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4140
Log:
fix FTBFS due to wrong dir, ensure buildability against camlp5

Modified:
    trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch
    trunk/packages/ulex0.8/trunk/debian/rules

Modified: 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=4140&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch (original)
+++ trunk/packages/ulex0.8/trunk/debian/patches/camlp5.dpatch Thu Aug  9 19:48:23 2007
@@ -6,8 +6,8 @@
 
 @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
+--- trunk~/META	2007-08-09 15:43:51.000000000 -0400
++++ trunk/META	2007-08-09 15:43:51.000000000 -0400
 @@ -1,5 +1,5 @@
  version = "0.8"
 -requires = "camlp4"
@@ -16,8 +16,8 @@
  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
+--- trunk~/Makefile	2007-08-09 15:43:51.000000000 -0400
++++ trunk/Makefile	2007-08-09 15:43:51.000000000 -0400
 @@ -20,7 +20,7 @@
  	ocamlopt -a -o ulexing.cmxa $(ULEXING)
  
@@ -47,7 +47,7 @@
  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
++++ trunk/README	2007-08-09 15:43:51.000000000 -0400
 @@ -142,7 +142,7 @@
  
  Compilation of OCaml files with lexer specifications:
@@ -57,3 +57,26 @@
  
  When linking, you must also include the ulex package:
    ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo
+diff -urNad trunk~/mk_pa_ulex.ml trunk/mk_pa_ulex.ml
+--- trunk~/mk_pa_ulex.ml	2005-10-30 02:59:49.000000000 -0500
++++ trunk/mk_pa_ulex.ml	2007-08-09 15:43:51.000000000 -0400
+@@ -1,10 +1,4 @@
+ let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in
+-if (s < 3.09) then (
+   print_endline "Old camlp4 (loc)";
+   Sys.command "sed s/_loc/loc/ < pa_ulex.ml.src > pa_ulex.ml"
+-)
+-else  (
+-  print_endline "New camlp4 (_loc)";
+-  Sys.command "cp pa_ulex.ml.src pa_ulex.ml"
+-)
+ 
+diff -urNad trunk~/pa_ulex.ml.src trunk/pa_ulex.ml.src
+--- trunk~/pa_ulex.ml.src	2005-10-30 02:59:49.000000000 -0500
++++ trunk/pa_ulex.ml.src	2007-08-09 15:44:11.000000000 -0400
+@@ -1,4 +1,4 @@
+-let _loc = (Lexing.dummy_pos,Lexing.dummy_pos)
++let _loc = Stdpp.dummy_loc
+ 
+ (* Named regexp *)
+ 

Modified: trunk/packages/ulex0.8/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ulex0.8/trunk/debian/rules?rev=4140&op=diff
==============================================================================
--- trunk/packages/ulex0.8/trunk/debian/rules (original)
+++ trunk/packages/ulex0.8/trunk/debian/rules Thu Aug  9 19:48:23 2007
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/ocaml.mk
 
-PKGNAME = ocaml-ulex
+PKGNAME = ocaml-ulex08
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAML_STDLIB_DIR)