The following commit has been merged in the master branch:
commit 3a1166a282fc6cd058d198bc0354d2b031c3e730
Author: Stephane Glondu <st...@glondu.net>
Date:   Mon Feb 27 14:30:18 2012 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index af0d5d0..d5c48ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+js-of-ocaml (1.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - remove patch (merged upstream)
+
+ -- St├ęphane Glondu <glo...@debian.org>  Mon, 27 Feb 2012 14:30:05 +0100
+
 js-of-ocaml (1.0.9b-1) unstable; urgency=low
 
   * New upstream release
diff --git 
a/debian/patches/0001-Better-support-for-disabling-native-compilation.patch 
b/debian/patches/0001-Better-support-for-disabling-native-compilation.patch
deleted file mode 100644
index 5d8055c..0000000
--- a/debian/patches/0001-Better-support-for-disabling-native-compilation.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sat, 3 Dec 2011 12:29:59 +0100
-Subject: Better support for disabling native compilation
-
-Introduce BEST variable in Makefile.conf, used to determine if native
-compiler and libraries should be compiled and
-installed. Unconditionally set to "opt" (meaning ocamlopt is
-available), it can be overridden in calls to "make".
----
- Makefile          |    2 +-
- Makefile.conf     |    2 ++
- Makefile.filelist |    4 ++++
- compiler/Makefile |    9 ++++++---
- lib/Makefile      |    5 ++++-
- 5 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3591d62..c244edc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -31,7 +31,7 @@ include Makefile.filelist
- 
- VERSION := $(shell head -n 1 VERSION)
- install:
--      ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) 
$(IMPL) $(NATIMPL) $(OTHERS) $(DOC)
-+      ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) 
$(IMPL) $(OTHERS) $(DOC)
-       install -d -m 755 $(BINDIR)
-       install $(BIN) $(BINDIR)
- 
-diff --git a/Makefile.conf b/Makefile.conf
-index ef72bfa..8a5c69d 100644
---- a/Makefile.conf
-+++ b/Makefile.conf
-@@ -15,6 +15,8 @@ OBJEXT := .o
- LIBEXT := .a
- DLLEXT := .so
- 
-+BEST := opt
-+
- ### Optional dependencies: ocsigen-deriving
- 
- DERIVING := $(shell ocamlfind query deriving-ocsigen 2> /dev/null)
-diff --git a/Makefile.filelist b/Makefile.filelist
-index 025573e..6d51fe6 100644
---- a/Makefile.filelist
-+++ b/Makefile.filelist
-@@ -25,6 +25,10 @@ NATIMPL := lib/deriving_json.cmxa     \
- 
- NATIMPL += $(JSON:.cmi=.cmx)
- 
-+ifeq "$(BEST)" "opt"
-+IMPL += $(NATIMPL)
-+endif
-+
- endif
- 
- DOC := ${INTF:.cmi=.mli}
-diff --git a/compiler/Makefile b/compiler/Makefile
-index 8a5adb6..5569da5 100644
---- a/compiler/Makefile
-+++ b/compiler/Makefile
-@@ -12,10 +12,13 @@ OBJS=pretty_print.cmx util.cmx dgraph.cmx \
- 
- COMPOBJS=$(OBJS) main.cmx
- 
--compile: $(COMPOBJS:cmx=cmo)
-+$(COMPILER): compile.$(BEST)
-+      cp -f $< $@
-+
-+compile.byte: $(COMPOBJS:cmx=cmo)
-       ocamlfind ocamlc -package findlib,str -linkpkg -o $@ $^
- 
--$(COMPILER): $(COMPOBJS)
-+compile.opt: $(COMPOBJS)
-       ocamlfind ocamlopt -package findlib,str -linkpkg -o $@ $^
- 
- compiler.cma: $(OBJS:cmx=cmo)
-@@ -32,7 +35,7 @@ compiler.cma: $(OBJS:cmx=cmo)
- 
- clean:
-       rm -f *.cm[aiox] *.o
--      rm -f js_of_ocaml compile
-+      rm -f js_of_ocaml compile.opt compile.byte
- 
- depend:
-       ocamldep *.ml *.mli > .depend
-diff --git a/lib/Makefile b/lib/Makefile
-index 6de96a4..5fe3d5a 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -10,7 +10,10 @@ include ../Makefile.conf
- 
- ifneq "${DERIVING}" ""
- PA_DERIVING=syntax/pa_deriving_Json.cmo
--DERIVING_JSON=deriving_json.cma deriving_json.cmxs
-+DERIVING_JSON=deriving_json.cma
-+ifeq "$(BEST)" "opt"
-+DERIVING_JSON += deriving_json.cmxs
-+endif
- endif
- 
- all: $(LIBNAME).cma syntax/pa_js.cmo ${PA_DERIVING} ${DERIVING_JSON}
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3156972..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Better-support-for-disabling-native-compilation.patch

-- 
js-of-ocaml packaging

_______________________________________________
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

Reply via email to