The following commit has been merged in the master branch:
commit f7ffae599975a383420c70ee6f3fcfba935c99fc
Author: Stephane Glondu <st...@glondu.net>
Date:   Sat Mar 3 12:28:58 2012 +0100

    Switch patches to git-based patches

diff --git a/debian/patches/0001-Add-DESTDIR.patch 
b/debian/patches/0001-Add-DESTDIR.patch
new file mode 100644
index 0000000..ab9c45a
--- /dev/null
+++ b/debian/patches/0001-Add-DESTDIR.patch
@@ -0,0 +1,28 @@
+From: Stefano Zacchiroli <z...@debian.org>
+Date: Sat, 3 Mar 2012 12:22:03 +0100
+Subject: Add DESTDIR
+
+Enable installing to a target directory passed from debian/rules.
+
+Signed-off-by: Stefano Zacchiroli <z...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 44ddf92..b95ce09 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,9 @@ all: ulexing.cma pa_ulex.cma
+ 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/0002-Fix-version-in-META.patch 
b/debian/patches/0002-Fix-version-in-META.patch
new file mode 100644
index 0000000..3dc4b18
--- /dev/null
+++ b/debian/patches/0002-Fix-version-in-META.patch
@@ -0,0 +1,23 @@
+From: Stefano Zacchiroli <z...@debian.org>
+Date: Sat, 3 Mar 2012 12:23:28 +0100
+Subject: Fix version in META
+
+Fix a typo in the findlib package version number specified in META.
+
+Signed-off-by: Stefano Zacchiroli <z...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ META |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/META b/META
+index 1a3ce10..416de11 100644
+--- a/META
++++ b/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/0003-Install-with-META-name-ulex08.patch 
b/debian/patches/0003-Install-with-META-name-ulex08.patch
new file mode 100644
index 0000000..b722c09
--- /dev/null
+++ b/debian/patches/0003-Install-with-META-name-ulex08.patch
@@ -0,0 +1,24 @@
+From: Stefano Zacchiroli <z...@debian.org>
+Date: Sat, 3 Mar 2012 12:24:43 +0100
+Subject: Install with META name "ulex08"
+
+Signed-off-by: Stefano Zacchiroli <z...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b95ce09..aa29315 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma
+ 
+ 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/camlp5.patch b/debian/patches/0004-Use-camlp5.patch
similarity index 63%
rename from debian/patches/camlp5.patch
rename to debian/patches/0004-Use-camlp5.patch
index 893b274..c8a44cd 100644
--- a/debian/patches/camlp5.patch
+++ b/debian/patches/0004-Use-camlp5.patch
@@ -1,7 +1,23 @@
-Author: Stefano Zacchiroli <z...@debian.org>
-Description: build (and install) using camlp5 instead of camlp4
---- ulex0.8.orig/META
-+++ ulex0.8/META
+From: Stefano Zacchiroli <z...@debian.org>
+Date: Sat, 3 Mar 2012 12:25:40 +0100
+Subject: Use camlp5
+
+Build (and install) using camlp5 instead of camlp4.
+
+Signed-off-by: Stefano Zacchiroli <z...@debian.org>
+Signed-off-by: Stephane Glondu <st...@glondu.net>
+---
+ META           |    2 +-
+ Makefile       |    8 ++++----
+ README         |    2 +-
+ mk_pa_ulex.ml  |    6 ------
+ pa_ulex.ml.src |    2 +-
+ 5 files changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/META b/META
+index 416de11..b2f25ef 100644
+--- a/META
++++ b/META
 @@ -1,5 +1,5 @@
  version = "0.8"
 -requires = "camlp4"
@@ -9,9 +25,11 @@ Description: build (and install) using camlp5 instead of 
camlp4
  description = "Runtime support for ulex"
  archive(byte) = "ulexing.cma"
  archive(native) = "ulexing.cmxa"
---- ulex0.8.orig/Makefile
-+++ ulex0.8/Makefile
-@@ -20,7 +20,7 @@
+diff --git a/Makefile b/Makefile
+index aa29315..86c5e43 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ ulexing.cmxa: $(ULEXING)
        ocamlopt -a -o ulexing.cmxa $(ULEXING)
  
  pa_ulex.cma: $(ULEX)
@@ -20,7 +38,7 @@ Description: build (and install) using camlp5 instead of 
camlp4
  
  pa_ulex.ml: pa_ulex.ml.src
        ocaml mk_pa_ulex.ml
-@@ -29,14 +29,14 @@
+@@ -29,14 +29,14 @@ clean:
        rm -f *.cm* *~ test custom_ulexing *.o *.a *.html *.css pa_ulex.ml
  
  view_test: pa_ulex.cma
@@ -38,9 +56,11 @@ Description: build (and install) using camlp5 instead of 
camlp4
  
  
  doc:
---- ulex0.8.orig/README
-+++ ulex0.8/README
-@@ -142,7 +142,7 @@
+diff --git a/README b/README
+index f5eee7b..52080e0 100644
+--- a/README
++++ b/README
+@@ -142,7 +142,7 @@ Installation:
  
  Compilation of OCaml files with lexer specifications:
  
@@ -49,8 +69,10 @@ Description: build (and install) using camlp5 instead of 
camlp4
  
  When linking, you must also include the ulex package:
    ocamlfind ocamlc -o my_prog -linkpkg -package ulex my_file.cmo
---- ulex0.8.orig/mk_pa_ulex.ml
-+++ ulex0.8/mk_pa_ulex.ml
+diff --git a/mk_pa_ulex.ml b/mk_pa_ulex.ml
+index e9d7159..c36c84c 100644
+--- a/mk_pa_ulex.ml
++++ b/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 (
@@ -62,11 +84,14 @@ Description: build (and install) using camlp5 instead of 
camlp4
 -  Sys.command "cp pa_ulex.ml.src pa_ulex.ml"
 -)
  
---- ulex0.8.orig/pa_ulex.ml.src
-+++ ulex0.8/pa_ulex.ml.src
+diff --git a/pa_ulex.ml.src b/pa_ulex.ml.src
+index a56bd01..b8e1cd6 100644
+--- a/pa_ulex.ml.src
++++ b/pa_ulex.ml.src
 @@ -1,4 +1,4 @@
 -let _loc = (Lexing.dummy_pos,Lexing.dummy_pos)
 +let _loc = Stdpp.dummy_loc
  
  (* Named regexp *)
  
+-- 
diff --git a/debian/patches/install_destdir.patch 
b/debian/patches/install_destdir.patch
deleted file mode 100644
index 64aac0e..0000000
--- a/debian/patches/install_destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.patch 
b/debian/patches/meta_version.patch
deleted file mode 100644
index 7a39510..0000000
--- a/debian/patches/meta_version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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
index 32197a9..39565f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-install_destdir.patch
-meta_version.patch
-versioned_lib.patch
-camlp5.patch
+0001-Add-DESTDIR.patch
+0002-Fix-version-in-META.patch
+0003-Install-with-META-name-ulex08.patch
+0004-Use-camlp5.patch
diff --git a/debian/patches/versioned_lib.patch 
b/debian/patches/versioned_lib.patch
deleted file mode 100644
index c294efc..0000000
--- a/debian/patches/versioned_lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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

-- 
ulex0.8 packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to