[Pkg-ocaml-maint-commits] [SCM] sexplib310 packaging branch, master, updated. debian/4.2.11-2
Stefano Zacchiroli
zack at upsilon.cc
Fri Jul 10 22:20:28 UTC 2009
The following commit has been merged in the master branch:
commit a016f8a96f72de028c6753bfa420a24029dd9973
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date: Mon Feb 2 21:22:29 2009 +0100
split patches, and include lib/Makefile
diff --git a/debian/patches/debian/byte-build.diff b/debian/patches/debian/byte-build.diff
index 0ae699d..7ac6c75 100644
--- a/debian/patches/debian/byte-build.diff
+++ b/debian/patches/debian/byte-build.diff
@@ -6,8 +6,9 @@ add Makefile targets to build/install bytecode objects only
Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
---
- Makefile | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ Makefile | 9 +++++++++
+ lib/Makefile | 5 +++++
+ 2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 4c67b1a..3d0ecd8 100644
@@ -33,5 +34,21 @@ index 4c67b1a..3d0ecd8 100644
.PHONY: uninstall
uninstall:
@cd lib && $(MAKE) $@
+diff --git a/lib/Makefile b/lib/Makefile
+index 40037a3..f5ea4b6 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -25,6 +25,11 @@ all: \
+ sexplib.cma sexplib.cmxa \
+ pa_sexp_conv.cmi pa_sexp_conv.cmo
+
++byte: \
++ pack-byte-code \
++ sexplib.cma \
++ pa_sexp_conv.cmi pa_sexp_conv.cmo
++
+ toplevel-library: byte-code-library \
+ install_printers.cmi install_printers.cmo
+ $(OCAMLC) -a -o sexplib_top.cma sexplib.cma install_printers.cmo
--
tg: (9cbfeee..) debian/byte-build (depends on: upstream)
diff --git a/debian/patches/fixes/missing-meta-deps.diff b/debian/patches/fixes/missing-meta-deps.diff
new file mode 100644
index 0000000..c0fbbf4
--- /dev/null
+++ b/debian/patches/fixes/missing-meta-deps.diff
@@ -0,0 +1,26 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Subject: [PATCH] fixes/missing-meta-deps
+
+add missing META dependencies
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+
+---
+ lib/Makefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 40037a3..416eabd 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -12,7 +12,7 @@ SOURCES = \
+ conv_error.ml
+ LIB_PACK_NAME = sexplib
+ INCDIRS = +camlp4
+-PACKS = type-conv
++PACKS = type-conv bigarray num
+ RESULT = sexplib
+
+ TRASH = \
+--
+tg: (9cbfeee..) fixes/missing-meta-deps (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 17af293..f698062 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian/byte-build.diff -p1
+fixes/missing-meta-deps.diff -p1
--
sexplib310 packaging
More information about the Pkg-ocaml-maint-commits
mailing list