[Pkg-ocaml-maint-commits] [SCM] camomile packaging branch, master, updated. debian/0.7.2-2-17-gb2e6e45

Fri Jul 29 18:22:14 UTC 2011

The following commit has been merged in the master branch:
commit 52f6e63fb723a3bcdc436cb5184664dcd106ae8b
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jul 29 19:03:01 2011 +0200

    Refresh patches (and switch to quilt)

diff --git a/debian/patches/0001-Makefile.patch b/debian/patches/0001-Makefile.patch
new file mode 100644
index 0000000..400d194
--- /dev/null
+++ b/debian/patches/0001-Makefile.patch
@@ -0,0 +1,37 @@
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Fri, 29 Jul 2011 19:01:30 +0200
+Subject: Makefile
+
+---
+ Makefile.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 28ca896..e1fc579 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -70,12 +70,12 @@ OFLAGS =  $(OOPTIONS) $(INCLUDES)
+ # Generic targets
+ #################
+ 
+-all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
++all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data
+ 
+ # Build the library
+ ###################
+ 
+-lib : byte $(OCAMLBEST) opt
++lib : byte $(OCAMLBEST)
+ 
+ NOOBJ_INT= \
+ public/unicodeString.cmi configInt.cmi internal/uReStrParserType.cmi
+@@ -412,7 +412,7 @@ install-with-ocamlfind:
+ 	if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
+ 	if [ -f camomile.cmxa ]; then files="camomile.cmxa $$files"; fi&& \
+ 	if [ -f camomile.a ]; then files="camomile.a $$files"; fi && \
+-	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
++	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
+ 
+ install-data:
+ 	mkdir -p '$(DATADIR)'
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index f0be4dd..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-makefile
diff --git a/debian/patches/fix_bigarray.dpatch b/debian/patches/fix_bigarray.dpatch
deleted file mode 100644
index a37b409..0000000
--- a/debian/patches/fix_bigarray.dpatch
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh -e
-## fix_bigarray.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/META camomile-0.4.1/META
---- /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/META	2003-09-21 18:33:12.000000000 +0200
-+++ camomile-0.4.1/META	2003-09-21 18:52:21.000000000 +0200
-@@ -1,6 +1,6 @@
- name="camomile"
- version="0.4.1"
- description="Unicode library for ocaml"
--requires=""
-+requires="bigarray"
- archive(byte)="camomile.cma"
- archive(native)="camomile.cmxa"
-diff -urNad /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/public/camomile.ml camomile-0.4.1/public/camomile.ml
---- /mnt/nfs0/gildor/deb/cvs-package/camomile/camomile-0.4.1/public/camomile.ml	2003-09-21 18:33:54.000000000 +0200
-+++ camomile-0.4.1/public/camomile.ml	2003-09-21 18:52:36.000000000 +0200
-@@ -100,7 +100,7 @@
- 
-     let add_array x a =
-       expand x (x.len + Array.length a);
--      Array.blit a 0 x.buf 0 (Array.length a);
-+      Array.blit a 0 x.buf x.len (Array.length a);
-       x.len <- x.len + Array.length a
- 
-     let add_xarray x1 x2 =
diff --git a/debian/patches/makefile.dpatch b/debian/patches/makefile.dpatch
deleted file mode 100755
index 862d57d..0000000
--- a/debian/patches/makefile.dpatch
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-## makefile.dpatch by Sylvain Le Gall <gildor at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad camomile-0.7.1~/Makefile.in camomile-0.7.1/Makefile.in
---- camomile-0.7.1~/Makefile.in	2006-08-14 13:35:01.000000000 +0200
-+++ camomile-0.7.1/Makefile.in	2006-10-18 01:06:35.000000000 +0200
-@@ -61,12 +61,12 @@
- # Generic targets
- #################
- 
--all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
-+all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data
- 
- # Build the library
- ###################
- 
--lib : byte $(OCAMLBEST) opt
-+lib : byte $(OCAMLBEST)
- 
- NOOBJ_INT= \
- public/unicodeString.cmi configInt.cmi internal/uReStrParserType.cmi
-@@ -372,7 +372,7 @@
- 	if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
- 	if [ -f camomile.cmxa ]; then files="camomile.cmxa $$files"; fi&& \
- 	if [ -f camomile.a ]; then files="camomile.a $$files"; fi && \
--	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi
-+	ocamlfind install $(OCAMLFIND_INSTALL_FLAGS) camomile $$files META $(MLI) camomileLibrary.cmi
- 
- install-bin:
- 	cp -f tools/camomilecharmap.$(OCAMLBEST) $(BINDIR)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1d1692
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Makefile.patch

-- 
camomile packaging

