[Pkg-ocaml-maint-commits] [SCM] ocamlduce packaging branch, master, updated. debian/3.11.1.0-3-4-g6a05fbf
Stephane Glondu
steph at glondu.net
Tue Dec 29 21:47:11 UTC 2009
The following commit has been merged in the master branch:
commit 6a05fbfe246eab9bf606ae8cde39e7ae5215109f
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Dec 29 22:05:52 2009 +0100
New upstream release candidate
diff --git a/debian/changelog b/debian/changelog
index 4d55b04..5dc5440 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocamlduce (3.11.2.0~rc1-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate
+ - remove all patches that have been merged upstream
+
+ -- Stéphane Glondu <glondu at debian.org> Tue, 29 Dec 2009 22:07:36 +0100
+
ocamlduce (3.11.1.0-3) unstable; urgency=low
* Switch to 3.0 (quilt)
diff --git a/debian/control b/debian/control
index f8d69dc..4afadfe 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends:
dh-ocaml (>= 0.9.1~),
autotools-dev,
patch,
- ocaml-source (>= 3.11.1),
- ocaml-nox (>= 3.11.1-3~)
+ ocaml-source (>= 3.11.2~rc1),
+ ocaml-nox (>= 3.11.2~rc1)
Standards-Version: 3.8.3
Homepage: http://ocamlduce.forge.ocamlcore.org/
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlduce.git
diff --git a/debian/patches-ocaml/objinfo.patch b/debian/patches-ocaml/objinfo.patch
deleted file mode 100644
index e9a0a35..0000000
--- a/debian/patches-ocaml/objinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 14 Oct 2009 20:12:49 +0200
-Subject: [PATCH] Accept also ocaml_cmi_magic_number in objinfo
-
---- ocaml-3.11.1.orig/tools/objinfo.ml 2006-07-05 14:09:18.000000000 +0200
-+++ ocaml-3.11.1/tools/objinfo.ml 2009-10-14 17:12:07.000000000 +0200
-@@ -81,7 +81,7 @@
- close_in ic;
- print_library_info toc
- end else
-- if buffer = cmi_magic_number then begin
-+ if buffer = cmi_magic_number || buffer = ocaml_cmi_magic_number then begin
- let (name, sign, comps) = input_value ic in
- let crcs = input_value ic in
- close_in ic;
diff --git a/debian/patches/0001-Build-and-install-native-code-plugin.patch b/debian/patches/0001-Build-and-install-native-code-plugin.patch
deleted file mode 100644
index 9d830de..0000000
--- a/debian/patches/0001-Build-and-install-native-code-plugin.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 17 Jun 2009 10:06:38 +0200
-Subject: [PATCH] Build and install native-code plugin
-
----
- Makefile | 3 ++-
- mkocamlduce.sh | 2 ++
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e8ca4fc..17ac494 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,6 +20,7 @@ CMI := $(MLI:.mli=.cmi) otherlibs/ocamlduce/cduce_types.cmi
-
- CMA := otherlibs/ocamlduce/ocamlduce.cma
- CMXA := $(CMA:.cma=.cmxa) $(CMA:.cma=.a)
-+CMXS := $(CMA:.cma=.cmxs)
-
- TOPCMO := toplevel/toploop.cmo toplevel/topdirs.cmo \
- toplevel/topmain.cmo toplevel/topstart.cmo \
-@@ -76,7 +77,7 @@ installbyte: installcommon-stamp
- installopt: installcommon-stamp
- @echo "===> Installing native files... <==="
- for X in $(OPT); do Y=$${X##*/}; Y=$${Y#ocaml}; install -m 755 _build/$$X $(BINDIR)/ocamlduce$$Y; done
-- install -m 644 $(addprefix _build/,$(CMXA)) $(DUCE_LIBDIR)
-+ install -m 644 $(addprefix _build/,$(CMXA) $(CMXS)) $(DUCE_LIBDIR)
-
- clean:
- build/distclean.sh
-diff --git a/mkocamlduce.sh b/mkocamlduce.sh
-index b677ae8..2dec75e 100755
---- a/mkocamlduce.sh
-+++ b/mkocamlduce.sh
-@@ -27,6 +27,7 @@ cd ..
-
- OCAMLDUCE_BYTE="otherlibs/ocamlduce/ocamlduce.cma"
- OCAMLDUCE_NATIVE="otherlibs/ocamlduce/ocamlduce.cmxa"
-+OCAMLDUCE_SHARED="otherlibs/ocamlduce/ocamlduce.cmxs"
-
- INI_TARGETS="ocamlc tools/ocamldep.byte"
- ALL_TARGETS="$TOPLEVEL $OCAMLDUCE_BYTE $TOOLS_BYTE $OCAMLDOC_BYTE"
-@@ -51,4 +52,5 @@ cp -p _build/tools/ocamldep.byte _build/tools/ocamldep
- if [ x"$HAS_NATIVE" = x"y" ]; then
- rm -f _build/tools/ocamldep.opt
- cp -p _build/tools/ocamldep.native _build/tools/ocamldep.opt
-+ ocamlopt -shared -linkall -o "_build/$OCAMLDUCE_SHARED" "_build/$OCAMLDUCE_NATIVE"
- fi
---
diff --git a/debian/patches/0002-Build-ocamldoc-library.patch b/debian/patches/0002-Build-ocamldoc-library.patch
deleted file mode 100644
index 7470ccb..0000000
--- a/debian/patches/0002-Build-ocamldoc-library.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 14 Oct 2009 22:31:00 +0200
-Subject: [PATCH] Build ocamldoc library
-
----
- mkocamlduce.sh | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/mkocamlduce.sh b/mkocamlduce.sh
-index 2dec75e..d7d8d32 100755
---- a/mkocamlduce.sh
-+++ b/mkocamlduce.sh
-@@ -37,6 +37,10 @@ if [ x"$HAS_NATIVE" = x"y" ]; then
- ALL_TARGETS="$ALL_TARGETS $OCAMLDUCE_NATIVE $TOOLS_NATIVE $OCAMLDOC_NATIVE"
- fi
-
-+OCAML_STDLIB_DIR="$(ocamlc -where)"
-+find "${OCAML_STDLIB_DIR}/ocamldoc" -type f | sed "s@^${OCAML_STDLIB_DIR}/@@" > ocamlducedoc.itarget
-+ALL_TARGETS="$ALL_TARGETS ocamlducedoc.otarget"
-+
- set -x
-
- if [ x"$BOOT_MODE" = x"y" ]; then
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3c12c50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Build-and-install-native-code-plugin.patch
-0002-Build-ocamldoc-library.patch
diff --git a/debian/rules b/debian/rules
index 70d743a..f5fb9e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk
# We do as in ocaml: the ABI is the upstream version number and we
# need to use a special ocamlobjinfo for OCamlDuce compiled interfaces
export OCAMLOBJINFO := debian/tmp/usr/bin/ocamlduceobjinfo
-OCAMLDUCE_ABI := $(shell head -n1 debian/changelog|awk -F'[()-]' '{print $$2}')
+OCAMLDUCE_ABI := $(shell head -n1 debian/changelog|awk -F'[()-]' '{print $$2}'|sed 's/~/+/g')
BUILD_TARGET := $(if $(OCAML_OPT_ARCH),world.opt,world)
INSTALL_TARGET := installbyte $(if $(OCAML_OPT_ARCH),installopt)
@@ -24,10 +24,6 @@ ODOC_DESTDIR := debian/tmp$(OCAML_STDLIB_DIR)/ocamlduce/ocamldoc
.PHONY: override_dh_auto_configure
override_dh_auto_configure:
$(MAKE) prepare
- cd $(OCAML_SRCDIR) && \
- for u in $(wildcard debian/patches-ocaml/*); do \
- patch -p1 < ../$$u; \
- done
for ext in sub guess; do \
if [ -f /usr/share/misc/config.$$ext ]; then \
cp -f /usr/share/misc/config.$$ext $(OCAML_SRCDIR)/config/gnu/config.$$ext; \
--
ocamlduce packaging
More information about the Pkg-ocaml-maint-commits
mailing list