[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.24-1-12-g8301999

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8ba78ecc2d895b46ee2ff4a172d82895928575bf
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 27 09:41:55 2011 +0200

    Remove obsolete patches

diff --git a/debian/patches/0001-support-for-building-installing-only-bytecode.patch b/debian/patches/0001-support-for-building-installing-only-bytecode.patch
deleted file mode 100644
index 85226bc..0000000
--- a/debian/patches/0001-support-for-building-installing-only-bytecode.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 3 May 2008 21:14:06 +0200
-Subject: [PATCH] support for building/installing only bytecode
-
----
- Makefile      |   10 ++++++++++
- OCamlMakefile |    2 +-
- lib/Makefile  |    5 +++++
- 3 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4c67b1a..a62fe64 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,10 +3,20 @@ all:
- 	@cd lib && $(MAKE)
- 	@cd lib_test && make
- 
-+.PHONY: byte
-+byte:
-+	@cd lib && $(MAKE) byte
-+	@cd lib_test && make
-+
-+
- .PHONY:	install
- install:
- 	@cd lib && $(MAKE) $@
- 
-+.PHONY: libinstall-byte-code
-+libinstall-byte-code:
-+	@cd lib && $(MAKE) $@
-+
- .PHONY:	uninstall
- uninstall:
- 	@cd lib && $(MAKE) $@
-diff --git a/OCamlMakefile b/OCamlMakefile
-index 830f56e..041252f 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1182,7 +1182,7 @@ libinstall:	all
- 	$(QUIET)printf "\nInstallation successful.\n"
- 
- .PHONY: libinstall-byte-code
--libinstall-byte-code:	all
-+libinstall-byte-code: 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 5bcb328..0cca65f 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -44,6 +44,11 @@ all: \
- 	byte-code-library native-code-library \
- 	pa_bin_prot.cmi pa_bin_prot.cmo
- 
-+byte: \
-+	pack-byte-code \
-+	byte-code-library \
-+	pa_bin_prot.cmi pa_bin_prot.cmo
-+
- LIBINSTALL_FILES = \
-   common.mli nat0.mli read_c.mli read_ml.mli size.mli \
-   unsafe_common.mli unsafe_read_c.mli unsafe_write_c.mli \
--- 
diff --git a/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch b/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch
deleted file mode 100644
index 87cc711..0000000
--- a/debian/patches/0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Fri, 9 May 2008 15:25:00 +0200
-Subject: [PATCH] fix OCamlMakefile to ensure -fPIC is added to build .o
-
-(fix FTBFS on 64 bit architectures)
----
- OCamlMakefile |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/OCamlMakefile b/OCamlMakefile
-index 041252f..94e0c4f 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1074,6 +1074,7 @@ endif
- 
- .c.$(EXT_OBJ):
- 			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
-+				-fPIC \
- 				$(CPPFLAGS) $(CPPFLAGS_WIN32) \
- 				$(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $<
- 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9b37095..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-support-for-building-installing-only-bytecode.patch
-0002-fix-OCamlMakefile-to-ensure-fPIC-is-added-to-build-..patch

-- 
bin-prot packaging