This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository js-of-ocaml.
commit c90970f244fef1d5f0d45e12a1596b0e57690e53
Author: Mehdi Dogguy <me...@debian.org>
Date: Sun Oct 18 10:09:14 2015 +0200
Remove 0001-Fix-generation-of-compiler.cm.patch
---
debian/changelog | 1 +
.../0001-Fix-generation-of-compiler.cm.patch | 40 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c3ab285..9935087 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ js-of-ocaml (2.5-1) UNRELEASED; urgency=medium
* Team upload
* New upstream release
+ - Remove 0001-Fix-generation-of-compiler.cm.patch, integrated upstream.
-- Mehdi Dogguy <me...@debian.org> Sun, 18 Oct 2015 09:59:10 +0200
diff --git a/debian/patches/0001-Fix-generation-of-compiler.cm.patch
b/debian/patches/0001-Fix-generation-of-compiler.cm.patch
deleted file mode 100644
index 3d4b38f..0000000
--- a/debian/patches/0001-Fix-generation-of-compiler.cm.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Tue, 17 Jun 2014 11:41:17 +0200
-Subject: Fix generation of compiler.cm*
-
----
- compiler/Makefile | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/compiler/Makefile b/compiler/Makefile
-index ba1675d..4d1b306 100644
---- a/compiler/Makefile
-+++ b/compiler/Makefile
-@@ -40,17 +40,23 @@ minify.opt: $(OBJS:cmx=cmx) minify.cmx
- ocamlfind ocamlopt -package $(PACKAGES) -linkpkg -g -o $@ $^
-
-
--compiler.cma: $(OBJS:cmx=cmo)
-+compiler.cmo: $(OBJS:cmx=cmo)
- ocamlfind ocamlc -pack -o $@ $^
-
-+compiler.cma: compiler.cmo
-+ ocamlfind ocamlc -a -o $@ $^
-+
- local/compiler.cma: compiler.cma
- mkdir -p local
- cp compiler.cma compiler.cmi local/
-
--compiler.cmxa: $(OBJS)
-+compiler.cmx: $(OBJS)
- ocamlfind ocamlopt -pack -g -o $@ $^
-
--compiler.cmxs: $(OBJS)
-+compiler.cmxa: compiler.cmx
-+ ocamlfind ocamlopt -a -o $@ $^
-+
-+compiler.cmxs: compiler.cmxa
- ocamlfind ocamlopt -shared -g -o $@ $^
-
- VERSION := $(shell head -n 1 ../VERSION)
---
diff --git a/debian/patches/series b/debian/patches/series
index 8e24fcc..36cdc44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix-generation-of-compiler.cm.patch
0002-Bytecode-only-support.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/js-of-ocaml.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
