[Pkg-ocaml-maint-commits] [SCM] fieldslib packaging branch, master, updated. debian/0.1.0-2-12-g6155aa1

Stephane Glondu steph at glondu.net
Mon Jun 27 06:52:04 UTC 2011


The following commit has been merged in the master branch:
commit 5d00c8ecab42bbd2992cb38f622d198c44415ccc
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jun 26 22:53:32 2011 +0200

    Remove obsolete patches

diff --git a/debian/patches/0001-support-for-bytecode-only-build.patch b/debian/patches/0001-support-for-bytecode-only-build.patch
deleted file mode 100644
index 18073b6..0000000
--- a/debian/patches/0001-support-for-bytecode-only-build.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Fri, 11 Dec 2009 10:45:33 +0100
-Subject: [PATCH] support for bytecode-only build
-
----
- Makefile      |    9 +++++++++
- OCamlMakefile |    2 +-
- lib/Makefile  |    8 +++++++-
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e5bd9d9..dec8f1c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,10 +3,19 @@ all:
- 	@cd lib && $(MAKE)
- 	@cd sample && $(MAKE)
- 
-+.PHONY: byte
-+byte:
-+	@cd lib && $(MAKE) byte
-+	@cd sample && $(MAKE)
-+
- .PHONY:	install
- install:
- 	@cd lib && $(MAKE) $@
- 
-+.PHONY:	installbyte
-+installbyte:
-+	@cd lib && $(MAKE) $@
-+
- .PHONY:	uninstall
- uninstall:
- 	@cd lib && $(MAKE) $@
-diff --git a/OCamlMakefile b/OCamlMakefile
-index e9deb24..b7042bf 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1216,7 +1216,7 @@ libinstall:	all
- 	$(QUIET)printf "\nInstallation successful.\n"
- 
- .PHONY: libinstall-byte-code
--libinstall-byte-code:	all
-+libinstall-byte-code:
- 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
- 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
- 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
-diff --git a/lib/Makefile b/lib/Makefile
-index 5fd5087..af8b13e 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -14,14 +14,20 @@ all: \
- 	fieldslib.cma fieldslib.cmxa \
- 	pa_fields_conv.cmi pa_fields_conv.cmo
- 
-+byte: \
-+	pack-byte-code \
-+	fieldslib.cma \
-+	pa_fields_conv.cmi pa_fields_conv.cmo
-+
- #toplevel-library:	byte-code-library \
- #	$(OCAMLC) -a -o sexplib_top.cma sexplib.cma install_printers.cmo
- 
- LIBINSTALL_FILES = \
--  fieldslib.cmi fieldslib.cma fieldslib.cmxa $(wildcard fieldslib.a) \
-+  fieldslib.cmi fieldslib.cma $(wildcard fieldslib.cmxa) $(wildcard fieldslib.a) \
-   $(wildcard fieldslib.lib) pa_fields_conv.cmi pa_fields_conv.cmo
- 
- install:	libinstall
-+installbyte:	libinstall-byte-code
- uninstall:	libuninstall
- 
- clean::	clean-doc
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1eea0ff..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-support-for-bytecode-only-build.patch

-- 
fieldslib packaging



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