[Pkg-ocaml-maint-commits] [hevea] 04/04: create links to bytes.ml{i} only before building
Ralf Treinen
treinen at moszumanska.debian.org
Sun Oct 5 19:12:59 UTC 2014
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository hevea.
commit 432d596aedc25c5004fc5b2aaf5850cde4d8f21e
Author: Ralf Treinen <treinen at free.fr>
Date: Sun Oct 5 20:55:31 2014 +0200
create links to bytes.ml{i} only before building
---
debian/changelog | 5 +++-
debian/patches/config-ocaml-4.02 | 52 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 2d996a4..fd1ee5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
hevea (2.18-1) unstable; urgency=medium
* New upstream version.
+ * patch config-ocaml-4.02: create symlinks to bytes.ml{i} in a separate
+ script invoked by ocb.sh, instead by config.sh which is invoked by the
+ clean target of the Makefile.
- -- Ralf Treinen <treinen at debian.org> Mon, 29 Sep 2014 08:42:37 +0200
+ -- Ralf Treinen <treinen at debian.org> Sun, 05 Oct 2014 20:53:22 +0200
hevea (2.16-2) unstable; urgency=medium
diff --git a/debian/patches/config-ocaml-4.02 b/debian/patches/config-ocaml-4.02
new file mode 100644
index 0000000..a2a12a6
--- /dev/null
+++ b/debian/patches/config-ocaml-4.02
@@ -0,0 +1,52 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: create symlinks to bytes.ml{i} in a separate script invoked
+ by ocb.sh, instead by config.sh which is invoked by the clean
+ target of the Makefile
+
+Index: hevea/handle402.sh
+===================================================================
+--- hevea.orig/handle402.sh 2014-10-05 20:47:59.686435685 +0200
++++ hevea/handle402.sh 2014-10-05 20:47:59.686435685 +0200
+@@ -3,6 +3,6 @@
+ if [ $(ocaml $DIR/check402.ml) = ok ]; then
+ rm -f $DIR/bytes.ml $DIR/bytes.mli
+ else
+- cp $DIR/bytes.mlp $DIR/bytes.ml
+- cp $DIR/bytes.mlip $DIR/bytes.mli
++ ln -s $DIR/bytes.mlp $DIR/bytes.ml
++ ln -s $DIR/bytes.mlip $DIR/bytes.mli
+ fi
+Index: hevea/Makefile
+===================================================================
+--- hevea.orig/Makefile 2014-10-05 20:47:59.686435685 +0200
++++ hevea/Makefile 2014-10-05 20:47:59.686435685 +0200
+@@ -34,7 +34,7 @@
+ include libs.def
+
+ config.sh: Makefile libs.def handle402.sh
+- @( cat handle402.sh &&\
++ @(\
+ echo PGM=\"$(PGM)\" &&\
+ echo PGMNATIVE=\"$(PGMNATIVE)\" &&\
+ echo BINDIR=$(BINDIR) &&\
+@@ -48,7 +48,7 @@
+ echo INFOLIB=\"$(INFOLIB)\") > $@
+
+ clean:: config.sh
+- sh ocb.sh clean && rm config.sh
++ sh ocb.sh clean && rm -f config.sh bytes.ml bytes.mli
+
+ ocb-byte: config.sh
+ sh ocb.sh byte
+Index: hevea/ocb.sh
+===================================================================
+--- hevea.orig/ocb.sh 2014-10-05 20:48:59.978436661 +0200
++++ hevea/ocb.sh 2014-10-05 20:49:32.202437182 +0200
+@@ -1,6 +1,7 @@
+ #!/bin/sh -e
+
+ . ./config.sh
++. ./handle402.sh
+
+ OCBOCAMLFLAGS=''
+ for i in $OCAMLFLAGS
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..e04b9ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+config-ocaml-4.02
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/hevea.git
More information about the Pkg-ocaml-maint-commits
mailing list