This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository camlimages.
commit 6e0764bd5f6e9cd292cd600d79cac6a34c26a6cb
Author: Stephane Glondu <st...@glondu.net>
Date: Thu Feb 26 16:21:18 2015 +0100
Remove patches (merged upstream)
---
.../0001-Add-missing-cclib-in-ocamlc-a.patch | 31 ----------------------
debian/patches/0002-remove-use-of-sort.patch | 13 ---------
debian/patches/0003-fix-META.patch | 16 -----------
debian/patches/series | 3 ---
4 files changed, 63 deletions(-)
diff --git a/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch
b/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch
deleted file mode 100644
index 6569d12..0000000
--- a/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 2 Jul 2011 17:56:41 +0200
-Subject: Add missing -cclib in ocamlc -a
-
-This allows simple linking with -custom by naming only .cma files
-(used by advi).
-
-Remark: runtime support libraries (dll*.so, lib*.a) and the OCaml
-archives (*.cma, *.cmxa) are built in an ad-hoc way using ocamlmklib,
-ocamlc -a and ocamlopt -a. It would be better (but more intrusive) to
-use only ocamlmklib.
-
-Signed-off-by: Stephane Glondu <st...@glondu.net>
----
- src/OMakefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/OMakefile b/src/OMakefile
-index e198fa1..013164f 100644
---- a/src/OMakefile
-+++ b/src/OMakefile
-@@ -225,7 +225,7 @@ MakeLibOCaml(name) =
- $(LIBRARY_PREFIX)_$(name).cma $(LIBRARY_PREFIX)_$(name).cmxa: $(MakeLibC
$(name))
- # OCAML_{BYTE,NATIVE}_LINK_FLAGS do not work for OCamlLibrary
- # Bit dirty workaround
-- OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name)
-+ OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name) -cclib
-l$(LIBRARY_PREFIX)_$(name)
- OCAMLOPTFLAGS+=-cclib -l$(LIBRARY_PREFIX)_$(name)
- # use mapprefix instead of addprefix, otherwise "-cclib -lgif"
- # is considered one option.
---
diff --git a/debian/patches/0002-remove-use-of-sort.patch
b/debian/patches/0002-remove-use-of-sort.patch
deleted file mode 100644
index dcc7dc2..0000000
--- a/debian/patches/0002-remove-use-of-sort.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: camlimages/src/bitmap.ml
-===================================================================
---- camlimages.orig/src/bitmap.ml 2011-10-17 00:02:17.941672767 +0200
-+++ camlimages/src/bitmap.ml 2011-10-17 00:04:03.732755736 +0200
-@@ -186,7 +186,7 @@
-
- let swap_out_eldest words =
- let sorted =
-- Sort.list (fun b1 b2 -> b1.last_used < b2.last_used) !swappable_blocks
in
-+ List.sort (fun b1 b2 -> compare b1.last_used b2.last_used)
!swappable_blocks in
- let rec swapper sorted i =
- match sorted with
- | [] -> ()
diff --git a/debian/patches/0003-fix-META.patch
b/debian/patches/0003-fix-META.patch
deleted file mode 100644
index 0ed94c5..0000000
--- a/debian/patches/0003-fix-META.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove mentions of non-existant archives.
-
-Index: camlimages/src/META.in
-===================================================================
---- camlimages.orig/src/META.in 2011-08-04 22:11:48.000000000 -0500
-+++ camlimages/src/META.in 2011-08-04 22:12:00.000000000 -0500
-@@ -2,9 +2,6 @@
- version = "@PACKAGE_VERSION@"
- description = "Objective Caml image processing library"
-
--archive(byte) = "camlimages.cma"
--archive(native) = "camlimages.cmxa"
--
- package "core" (
- archive(byte) = "camlimages_core.cma"
- archive(native) = "camlimages_core.cmxa"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cc67441..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-Add-missing-cclib-in-ocamlc-a.patch
-0002-remove-use-of-sort.patch
-0003-fix-META.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlimages.git
_______________________________________________
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
