[Pkg-ocaml-maint-commits] [SCM] janest-core packaging branch, master, updated. debian/0.5.2-1-11-g6ebfadc
Stephane Glondu
steph at glondu.net
Sun Aug 30 01:42:36 UTC 2009
The following commit has been merged in the master branch:
commit b4fce8c135bd45b5ad4e1182fc3146a8f932e6ce
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Aug 30 01:42:55 2009 +0200
Use quilt to patch upstream
diff --git a/Makefile b/Makefile
index 3d0ecd8..4c67b1a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,10 @@ all:
@cd lib && $(MAKE)
@cd lib_test && make
-.PHONY: byte
-byte:
- @cd lib && $(MAKE) byte
- @cd lib_test && make
-
.PHONY: install
install:
@cd lib && $(MAKE) $@
-.PHONY: libinstall-byte-code
-libinstall-byte-code:
- @cd lib && $(MAKE) $@
-
.PHONY: uninstall
uninstall:
@cd lib && $(MAKE) $@
diff --git a/OCamlMakefile b/OCamlMakefile
index d60d0db..b0b9252 100644
--- a/OCamlMakefile
+++ b/OCamlMakefile
@@ -1170,7 +1170,7 @@ libinstall: all
$(QUIET)printf "\nInstallation successful.\n"
.PHONY: libinstall-byte-code
-libinstall-byte-code: byte-code
+libinstall-byte-code: all
$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
$(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..1bd889f
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+Debian source package for Jane Street Core Library
+==================================================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.5) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stéphane Glondu <glondu at debian.org>, Sun, 30 Aug 2009 01:04:36 +0200
diff --git a/debian/control b/debian/control
index 67a0a4c..d32947c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Stefano Zacchiroli <zack at debian.org>
Build-Depends:
cdbs,
debhelper (>= 7),
+ quilt,
ocaml-nox,
dh-ocaml,
camlp4,
diff --git a/debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch b/debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
new file mode 100644
index 0000000..4c54cb1
--- /dev/null
+++ b/debian/patches/0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
@@ -0,0 +1,24 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 3 May 2008 22:39:14 +0200
+Subject: [PATCH] bug fix: libinstall-byte-code should not depend on native code stuff
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ OCamlMakefile | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/OCamlMakefile b/OCamlMakefile
+index b0b9252..d60d0db 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1170,7 +1170,7 @@ libinstall: all
+ $(QUIET)printf "\nInstallation successful.\n"
+
+ .PHONY: libinstall-byte-code
+-libinstall-byte-code: all
++libinstall-byte-code: byte-code
+ $(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
+ $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
+ $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
+--
diff --git a/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch b/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
new file mode 100644
index 0000000..abc340f
--- /dev/null
+++ b/debian/patches/0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
@@ -0,0 +1,48 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 3 May 2008 22:39:34 +0200
+Subject: [PATCH] extra targets to enable compilation of byte code only
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile | 9 +++++++++
+ lib/Makefile | 1 +
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4c67b1a..3d0ecd8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,10 +3,19 @@ all:
+ @cd lib && $(MAKE)
+ @cd lib_test && make
+
++.PHONY: byte
++byte:
++ @cd lib && $(MAKE) byte
++ @cd lib_test && make
++
+ .PHONY: install
+ install:
+ @cd lib && $(MAKE) $@
+
++.PHONY: libinstall-byte-code
++libinstall-byte-code:
++ @cd lib && $(MAKE) $@
++
+ .PHONY: uninstall
+ uninstall:
+ @cd lib && $(MAKE) $@
+diff --git a/lib/Makefile b/lib/Makefile
+index 1edd843..b15a5ad 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -168,6 +168,7 @@ THREADS = yes
+ ANNOTATE = true
+
+ all: byte-code-library native-code-library
++byte: byte-code-library
+
+ LIBINSTALL_FILES = \
+ core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so
+--
diff --git a/debian/patches/0003-add-missing-META-dep-on-unix.patch b/debian/patches/0003-add-missing-META-dep-on-unix.patch
new file mode 100644
index 0000000..4f20890
--- /dev/null
+++ b/debian/patches/0003-add-missing-META-dep-on-unix.patch
@@ -0,0 +1,25 @@
+From: Stefano Zacchiroli <zack at upsilon.cc>
+Date: Sat, 3 May 2008 22:57:15 +0200
+Subject: [PATCH] add missing META dep on unix
+
+Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ lib/META | 4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/lib/META b/lib/META
+index ad5c489..e086f7d 100644
+--- a/lib/META
++++ b/lib/META
+@@ -1,8 +1,6 @@
+ name = "core"
+ version = "0.5.2"
+ description = "Core - Jane Street Capital's standard library overlay"
+-
+-requires = "bigarray, res, sexplib, bin_prot, threads"
+-
++requires = "bigarray, res, sexplib, bin_prot, unix, threads"
+ archive(byte) = "core.cma"
+ archive(native) = "core.cmxa"
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..55c636c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-bug-fix-libinstall-byte-code-should-not-depend-on-na.patch
+0002-extra-targets-to-enable-compilation-of-byte-code-onl.patch
+0003-add-missing-META-dep-on-unix.patch
diff --git a/debian/rules b/debian/rules
index 8db60ae..43a9c0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/ocaml.mk
LIB_NAME = core
diff --git a/lib/META b/lib/META
index e086f7d..ad5c489 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,8 @@
name = "core"
version = "0.5.2"
description = "Core - Jane Street Capital's standard library overlay"
-requires = "bigarray, res, sexplib, bin_prot, unix, threads"
+
+requires = "bigarray, res, sexplib, bin_prot, threads"
+
archive(byte) = "core.cma"
archive(native) = "core.cmxa"
diff --git a/lib/Makefile b/lib/Makefile
index b15a5ad..1edd843 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -168,7 +168,6 @@ THREADS = yes
ANNOTATE = true
all: byte-code-library native-code-library
-byte: byte-code-library
LIBINSTALL_FILES = \
core.cmi core.cma core.cmxa core.a libcore_stubs.a dllcore_stubs.so
--
janest-core packaging
More information about the Pkg-ocaml-maint-commits
mailing list