The following commit has been merged in the master branch:
commit 22f6c7b4152d9f228e6a43ea2f1be3f1b2b5da26
Author: Enrico Tassi <ga...@fettunta.org>
Date: Mon Apr 12 17:55:23 2010 +0200
use quilt
diff --git a/debian/control b/debian/control
index 764e3a8..1f06c0c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
ocaml-nox (>= 3.11),
dh-ocaml,
ocaml-findlib,
- dpatch,
+ quilt,
cdbs,
camlp5 (>= 5.10)
Standards-Version: 3.8.0
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fe25dbc..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-install_destdir.dpatch
-meta_version.dpatch
-versioned_lib.dpatch
-camlp5.dpatch
diff --git a/debian/patches/camlp5.dpatch b/debian/patches/camlp5.patch
old mode 100755
new mode 100644
similarity index 64%
rename from debian/patches/camlp5.dpatch
rename to debian/patches/camlp5.patch
index 5dca45f..893b274
--- a/debian/patches/camlp5.dpatch
+++ b/debian/patches/camlp5.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## camlp5.dpatch by Stefano Zacchiroli <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: build (and install) using camlp5 instead of camlp4
-
-...@dpatch@
-diff -urNad trunk~/META trunk/META
---- trunk~/META 2007-08-09 15:43:51.000000000 -0400
-+++ trunk/META 2007-08-09 15:43:51.000000000 -0400
+Author: Stefano Zacchiroli <z...@debian.org>
+Description: build (and install) using camlp5 instead of camlp4
+--- ulex0.8.orig/META
++++ ulex0.8/META
@@ -1,5 +1,5 @@
version = "0.8"
-requires = "camlp4"
@@ -15,9 +9,8 @@ diff -urNad trunk~/META trunk/META
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:43:51.000000000 -0400
-+++ trunk/Makefile 2007-08-09 15:43:51.000000000 -0400
+--- ulex0.8.orig/Makefile
++++ ulex0.8/Makefile
@@ -20,7 +20,7 @@
ocamlopt -a -o ulexing.cmxa $(ULEXING)
@@ -45,9 +38,8 @@ diff -urNad trunk~/Makefile trunk/Makefile
doc:
-diff -urNad trunk~/README trunk/README
---- trunk~/README 2005-10-30 02:59:49.000000000 -0500
-+++ trunk/README 2007-08-09 15:43:51.000000000 -0400
+--- ulex0.8.orig/README
++++ ulex0.8/README
@@ -142,7 +142,7 @@
Compilation of OCaml files with lexer specifications:
@@ -57,9 +49,8 @@ diff -urNad trunk~/README trunk/README
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
+--- ulex0.8.orig/mk_pa_ulex.ml
++++ ulex0.8/mk_pa_ulex.ml
@@ -1,10 +1,4 @@
let s = float_of_string (String.sub (Sys.ocaml_version) 0 4) in
-if (s < 3.09) then (
@@ -71,9 +62,8 @@ diff -urNad trunk~/mk_pa_ulex.ml trunk/mk_pa_ulex.ml
- 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
+--- ulex0.8.orig/pa_ulex.ml.src
++++ ulex0.8/pa_ulex.ml.src
@@ -1,4 +1,4 @@
-let _loc = (Lexing.dummy_pos,Lexing.dummy_pos)
+let _loc = Stdpp.dummy_loc
diff --git a/debian/patches/install_destdir.dpatch
b/debian/patches/install_destdir.dpatch
deleted file mode 100755
index 4715541..0000000
--- a/debian/patches/install_destdir.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_build.dpatch by Stefano Zacchiroli <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable installing to a target directory passed from debian/rules
-
-...@dpatch@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile 2005-10-30 07:59:49.000000000 +0000
-+++ trunk/Makefile 2005-11-13 00:30:07.000000000 +0000
-@@ -4,8 +4,9 @@
- all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma
-
-
-+DESTDIR=
- install: all
-- ocamlfind install ulex META $(wildcard *.mli) $(wildcard *.cmi)
$(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli)
$(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-
- uninstall:
- ocamlfind remove ulex
diff --git a/debian/patches/install_destdir.patch
b/debian/patches/install_destdir.patch
new file mode 100644
index 0000000..64aac0e
--- /dev/null
+++ b/debian/patches/install_destdir.patch
@@ -0,0 +1,15 @@
+Author: Stefano Zacchiroli <z...@debian.org>
+Description: enable installing to a target directory passed from debian/rules
+--- ulex0.8.orig/Makefile
++++ ulex0.8/Makefile
+@@ -4,8 +4,9 @@
+ all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma
+
+
++DESTDIR=
+ install: all
+- ocamlfind install ulex META $(wildcard *.mli) $(wildcard *.cmi)
$(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
++ ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli)
$(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
+
+ uninstall:
+ ocamlfind remove ulex
diff --git a/debian/patches/meta_version.dpatch
b/debian/patches/meta_version.dpatch
deleted file mode 100755
index 0fb0120..0000000
--- a/debian/patches/meta_version.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 23_meta_version.dpatch by Stefano Zacchiroli <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix a typo in the findlib package version number specified in META
-
-...@dpatch@
-diff -urNad trunk~/META trunk/META
---- trunk~/META 2005-10-30 07:59:49.000000000 +0000
-+++ trunk/META 2005-11-13 00:32:27.000000000 +0000
-@@ -1,4 +1,4 @@
--version = "0.7"
-+version = "0.8"
- requires = "camlp4"
- description = "Runtime support for ulex"
- archive(byte) = "ulexing.cma"
diff --git a/debian/patches/meta_version.patch
b/debian/patches/meta_version.patch
new file mode 100644
index 0000000..7a39510
--- /dev/null
+++ b/debian/patches/meta_version.patch
@@ -0,0 +1,10 @@
+Author: Stefano Zacchiroli <z...@debian.org>
+Description: fix a typo in the findlib package version number specified in META
+--- ulex0.8.orig/META
++++ ulex0.8/META
+@@ -1,4 +1,4 @@
+-version = "0.7"
++version = "0.8"
+ requires = "camlp4"
+ description = "Runtime support for ulex"
+ archive(byte) = "ulexing.cma"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32197a9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+install_destdir.patch
+meta_version.patch
+versioned_lib.patch
+camlp5.patch
diff --git a/debian/patches/versioned_lib.dpatch
b/debian/patches/versioned_lib.dpatch
deleted file mode 100755
index a5372d5..0000000
--- a/debian/patches/versioned_lib.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## versioned_lib.dpatch by Stefano Zacchiroli <z...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: install with META name "ulex08"
-
-...@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
diff --git a/debian/patches/versioned_lib.patch
b/debian/patches/versioned_lib.patch
new file mode 100644
index 0000000..c294efc
--- /dev/null
+++ b/debian/patches/versioned_lib.patch
@@ -0,0 +1,13 @@
+Author: Stefano Zacchiroli <z...@debian.org>
+Description: install with META name "ulex08"
+--- ulex0.8.orig/Makefile
++++ ulex0.8/Makefile
+@@ -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
diff --git a/debian/rules b/debian/rules
index eb5a6c4..6a73b41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/ocaml.mk
--
ulex0.8 packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
