[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.6.0-3-16-g0ea2707

Stephane Glondu steph at glondu.net
Wed Nov 16 19:57:07 UTC 2011 

The following commit has been merged in the master branch:
commit eedb2f129e276f2ee6ce3162aee6e99437cd6805
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jun 27 16:17:26 2011 +0200

    Remove obsolete patches

diff --git a/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch b/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
deleted file mode 100644
index 89d2a52..0000000
--- a/debian/patches/0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 3 May 2008 22:39:14 +0200
-Subject: [PATCH] bug fix: libinstall-b-c should not depend on native code
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
----
- OCamlMakefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/OCamlMakefile b/OCamlMakefile
-index b0b9252..b51c452 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -1170,7 +1170,7 @@ libinstall:	all
- 	$(QUIET)printf "\nInstallation successful.\n"
- 
- .PHONY: libinstall-byte-code
--libinstall-byte-code:	all
-+libinstall-byte-code: byte-code-library
- 	$(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/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch b/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch
deleted file mode 100644
index 56a5683..0000000
--- a/debian/patches/0002-make-targets-to-enable-bytecode-only-compilation.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 3 May 2008 22:39:34 +0200
-Subject: [PATCH] make targets to enable bytecode only compilation
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
----
- Makefile          |   12 ++++++++++++
- extended/Makefile |    1 +
- lib/Makefile      |    1 +
- 3 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 04a3d60..746dca2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,3 +17,15 @@ uninstall:
- clean:
- 	@cd lib && $(MAKE) clean
- 	@cd extended && $(MAKE) clean
-+
-+.PHONY: byte
-+byte:
-+	@cd lib && $(MAKE) $@
-+	@cd lib_test && make
-+	@cd extended && $(MAKE) $@
-+
-+.PHONY:	libinstall-byte-code
-+libinstall-byte-code:
-+	@cd lib && $(MAKE) $@
-+	@cd extended && $(MAKE) $@
-+
-diff --git a/extended/Makefile b/extended/Makefile
-index b044c16..dc777ee 100644
---- a/extended/Makefile
-+++ b/extended/Makefile
-@@ -114,6 +114,7 @@ THREADS = yes
- ANNOTATE = true
- 
- all: byte-code-library native-code-library
-+byte: byte-code-library
- 
- LIBINSTALL_FILES = \
-   core_extended.cmi core_extended.cma core_extended.cmxa core_extended.a libcore_extended_stubs.a dllcore_extended_stubs.so
-diff --git a/lib/Makefile b/lib/Makefile
-index ab1c8d8..d2af679 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -210,6 +210,7 @@ THREADS = yes
- ANNOTATE = true
- 
- all: byte-code-library native-code-library
-+byte: byte-code-library
- 
- LIBINSTALL_FILES = \
-   core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so
--- 
diff --git a/debian/patches/0003-add-missing-META-dep-on-unix.patch b/debian/patches/0003-add-missing-META-dep-on-unix.patch
deleted file mode 100644
index 6b7b4a6..0000000
--- a/debian/patches/0003-add-missing-META-dep-on-unix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Sat, 3 May 2008 22:57:15 +0200
-Subject: [PATCH] add missing META dep on unix
-
-Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- lib/META |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/META b/lib/META
-index 60ca7f9..63258b5 100644
---- a/lib/META
-+++ b/lib/META
-@@ -2,7 +2,7 @@ name = "core"
- version = "0.6.0"
- description = "Core - Jane Street Capital's standard library overlay"
- 
--requires = "bigarray, res, sexplib, bin_prot, threads, fieldslib"
-+requires = "bigarray, unix, res, sexplib, bin_prot, threads, fieldslib"
- 
- archive(byte) = "core.cma"
- archive(native) = "core.cmxa"
--- 
diff --git a/debian/patches/0004-fix-build-on-kfreebsd.patch b/debian/patches/0004-fix-build-on-kfreebsd.patch
deleted file mode 100644
index 009759c..0000000
--- a/debian/patches/0004-fix-build-on-kfreebsd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Mon, 9 Nov 2009 13:23:05 +0100
-Subject: [PATCH] fix build on kfreebsd
-
----
- lib/Makefile |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index d2af679..40eabae 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,9 +1,13 @@
- OCAMLMAKEFILE = ../OCamlMakefile
- 
--ifeq ($(shell uname -s), Linux)
-+SYSTEM := $(shell uname -s)
-+
-+ifeq ($(SYSTEM), Linux)
-   LINUX_EXT_STUBS_C = linux_ext_stubs.c
-   LINUX_EXT_ML = linux_ext.mli linux_ext.ml
- 	CLIBS += rt
-+else if ($(SYSTEM), GNU/kFreeBSD)
-+  CLIBS = rt
- endif
- 
- SOURCES = \
--- 
diff --git a/debian/patches/0005-create-destdir-upon-install.patch b/debian/patches/0005-create-destdir-upon-install.patch
deleted file mode 100644
index 88409cd..0000000
--- a/debian/patches/0005-create-destdir-upon-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Stefano Zacchiroli <zack at upsilon.cc>
-Date: Fri, 13 Nov 2009 11:34:03 +0100
-Subject: [PATCH] create destdir upon install
-
----
- Makefile |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 746dca2..f3af42b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,6 +5,7 @@ all:
- 
- .PHONY:	install
- install:
-+	if [ -n "$(DESTDIR)" ] ; then mkdir -p "$(DESTDIR)" ; fi
- 	@cd lib && $(MAKE) $@
- 	@cd extended && $(MAKE) $@
- 
-@@ -26,6 +27,7 @@ byte:
- 
- .PHONY:	libinstall-byte-code
- libinstall-byte-code:
-+	if [ -n "$(DESTDIR)" ] ; then mkdir -p "$(DESTDIR)" ; fi
- 	@cd lib && $(MAKE) $@
- 	@cd extended && $(MAKE) $@
- 
--- 
diff --git a/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch b/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch
deleted file mode 100644
index f45f4bb..0000000
--- a/debian/patches/0006-Fix-Gc.stat-definition-in-core_gc.ml.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Mehdi Dogguy <mehdi at debian.org>
-Date: Thu, 21 Apr 2011 22:26:30 +0200
-Subject: [PATCH] Fix Gc.stat definition in core_gc.ml
-
----
- lib/core_gc.ml  |    1 +
- lib/core_gc.mli |    2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/lib/core_gc.ml b/lib/core_gc.ml
-index acee021..5878517 100644
---- a/lib/core_gc.ml
-+++ b/lib/core_gc.ml
-@@ -54,6 +54,7 @@ module Stat = struct
-     fragments : pretty_int;
-     compactions : pretty_int;
-     top_heap_words : pretty_int;
-+    stack_size : pretty_int;
-   } with bin_io, sexp
-   type binable = t
-   type sexpable = t
-diff --git a/lib/core_gc.mli b/lib/core_gc.mli
-index 9a2e734..87aa60f 100644
---- a/lib/core_gc.mli
-+++ b/lib/core_gc.mli
-@@ -71,6 +71,8 @@ module Stat : sig
- 
-     top_heap_words : int;
-     (** Maximum size reached by the major heap, in words. *)
-+
-+    stack_size : int;
-   }
-   include Binable.S with type binable = t
-   include Sexpable.S with type sexpable = t
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 25625d6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-0001-bug-fix-libinstall-b-c-should-not-depend-on-native-c.patch
-0002-make-targets-to-enable-bytecode-only-compilation.patch
-0003-add-missing-META-dep-on-unix.patch
-0004-fix-build-on-kfreebsd.patch
-0005-create-destdir-upon-install.patch
-0006-Fix-Gc.stat-definition-in-core_gc.ml.patch

-- 
janest-core packaging

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