This is an automated email from the git hooks/post-receive script. treinen pushed a commit to branch experimental/master in repository dose3.
commit c2bfd409d4936b5556cff7ced0a3eb293fe65b22 Author: Johannes Schauer <jo...@debian.org> Date: Sat Dec 26 16:29:13 2015 +0100 Imported Debian patch 4.1~beta1-2 --- debian/changelog | 7 + .../patches/fix-doc-target-without-ocamlopt.patch | 161 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 169 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3d0c1f4..1f1279a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dose3 (4.1~beta1-2) experimental; urgency=medium + + * add patch fix-doc-target-without-ocamlopt.patch to make dose3 build on + architectures without ocamlopt + + -- Johannes Schauer <jo...@debian.org> Sat, 26 Dec 2015 16:29:13 +0100 + dose3 (4.1~beta1-1) experimental; urgency=medium * new upstream version diff --git a/debian/patches/fix-doc-target-without-ocamlopt.patch b/debian/patches/fix-doc-target-without-ocamlopt.patch new file mode 100644 index 0000000..e476b73 --- /dev/null +++ b/debian/patches/fix-doc-target-without-ocamlopt.patch @@ -0,0 +1,161 @@ +commit 3bc5304e0f1db8a0771ca5ba6ca639f6f42d9b3e +Author: Johannes 'josch' Schauer <jo...@mister-muffin.de> +Date: Sat Dec 26 16:18:38 2015 +0100 + + fix doc target to work on architectures without ocamlopt + +diff --git a/Makefile b/Makefile +index 2c5d718..f054db8 100644 +--- a/Makefile ++++ b/Makefile +@@ -242,8 +242,8 @@ credits: + @git log --pretty=format:'%aN %aE' | LC_ALL=C sort -u | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}'; + + doc: all +- $(OCAMLBUILD) -package unix scripts/pack.native +- scripts/doc.sh ++ $(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT) ++ sh scripts/doc.sh + dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot + (cd doc && $(MAKE) all) + +diff --git a/configure.ac b/configure.ac +index 9210ad1..f963f5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -336,6 +336,7 @@ AC_CONFIG_FILES([ + algo/algo.mlpack + common/versionInfo.ml + applications/dose-tests.list ++ scripts/doc.sh + ]) + AC_OUTPUT + +diff --git a/scripts/doc.sh b/scripts/doc.sh +deleted file mode 100755 +index e3912db..0000000 +--- a/scripts/doc.sh ++++ /dev/null +@@ -1,58 +0,0 @@ +-#!/bin/sh +- +-OCPPACK=_build/scripts/pack.native +- +-echo "Cleaning up before" +-for i in deb common opam pef algo versioning ; do +- F=$(ls $i/*.mlpack) ; +- rm -f ${F%.mlpack}.ml +- rm -f ${F%.mlpack}.mli +-done +- +-echo "Create packs" +-for i in deb common opam pef algo versioning ; do +- echo -n "$i..." +- F=$(ls $i/*.mlpack) ; +- ML=$(cat $F | sed -e "s/\(.\)\(.*\)/_build\/$i\/\L\1\E\2.ml/" | tr '\n' ' ') ; +- MML= +- for f in $ML; do +- if echo $f | grep -v -E "_lexer|_parser" ; then +- MML="$MML $f" +- fi +- done > /dev/null +- $OCPPACK -no-ml -mli -pp 'cppo -D '\''OCAMLGRAPHVERSION 186'\''' -o ${F%.mlpack}.ml $MML ; +- if [ -f $i/.ocamldoc.txt ]; then +- cat $i/.ocamldoc.txt ${F%.mlpack}.mli > ${F%.mlpack}.mli.tmp +- mv ${F%.mlpack}.mli.tmp ${F%.mlpack}.mli +- rm -f ${F%.mlpack}.mli.tmp +- fi +-done +- +-i=doseparse +-echo "$i..." +-F=$(ls $i/doseparse.mlpack) ; +-ML=$(cat $F | sed -e "s/\(.\)\(.*\)/_build\/$i\/\L\1\E\2.ml/" | tr '\n' ' ') ; +-MML= +-for f in $ML; do +- if echo $f | grep -v -E "_lexer|_parser" ; then +- MML="$MML $f" +- fi +-done > /dev/null +-$OCPPACK -pp 'cppo -D '\''OCAMLGRAPHVERSION 186'\''' -o ${F%.mlpack}.ml $MML ; +-if [ -f $i/.ocamldoc.txt ]; then +- cat $i/.ocamldoc.txt ${F%.mlpack}.ml > ${F%.mlpack}.ml.tmp +- mv ${F%.mlpack}.ml.tmp ${F%.mlpack}.ml +- rm -f ${F%.mlpack}.ml.tmp +-fi +- +- +-echo +- +-ocamlbuild dose3.docdir/index.html dose3.docdir/index.dot +- +-echo "Cleaning up after" +-for i in deb common opam pef algo versioning ; do +- F=$(ls $i/*.mlpack) ; +- rm -f ${F%.mlpack}.ml +- rm -f ${F%.mlpack}.mli +-done +diff --git a/scripts/doc.sh.in b/scripts/doc.sh.in +new file mode 100755 +index 0000000..8eff7df +--- /dev/null ++++ b/scripts/doc.sh.in +@@ -0,0 +1,58 @@ ++#!/bin/sh ++ ++OCPPACK=_build/scripts/pack.@OCAMLEXT@ ++ ++echo "Cleaning up before" ++for i in deb common opam pef algo versioning ; do ++ F=$(ls $i/*.mlpack) ; ++ rm -f ${F%.mlpack}.ml ++ rm -f ${F%.mlpack}.mli ++done ++ ++echo "Create packs" ++for i in deb common opam pef algo versioning ; do ++ echo -n "$i..." ++ F=$(ls $i/*.mlpack) ; ++ ML=$(cat $F | sed -e "s/\(.\)\(.*\)/_build\/$i\/\L\1\E\2.ml/" | tr '\n' ' ') ; ++ MML= ++ for f in $ML; do ++ if echo $f | grep -v -E "_lexer|_parser" ; then ++ MML="$MML $f" ++ fi ++ done > /dev/null ++ $OCPPACK -no-ml -mli -pp 'cppo -D '\''OCAMLGRAPHVERSION 186'\''' -o ${F%.mlpack}.ml $MML ; ++ if [ -f $i/.ocamldoc.txt ]; then ++ cat $i/.ocamldoc.txt ${F%.mlpack}.mli > ${F%.mlpack}.mli.tmp ++ mv ${F%.mlpack}.mli.tmp ${F%.mlpack}.mli ++ rm -f ${F%.mlpack}.mli.tmp ++ fi ++done ++ ++i=doseparse ++echo "$i..." ++F=$(ls $i/doseparse.mlpack) ; ++ML=$(cat $F | sed -e "s/\(.\)\(.*\)/_build\/$i\/\L\1\E\2.ml/" | tr '\n' ' ') ; ++MML= ++for f in $ML; do ++ if echo $f | grep -v -E "_lexer|_parser" ; then ++ MML="$MML $f" ++ fi ++done > /dev/null ++$OCPPACK -pp 'cppo -D '\''OCAMLGRAPHVERSION 186'\''' -o ${F%.mlpack}.ml $MML ; ++if [ -f $i/.ocamldoc.txt ]; then ++ cat $i/.ocamldoc.txt ${F%.mlpack}.ml > ${F%.mlpack}.ml.tmp ++ mv ${F%.mlpack}.ml.tmp ${F%.mlpack}.ml ++ rm -f ${F%.mlpack}.ml.tmp ++fi ++ ++ ++echo ++ ++ocamlbuild dose3.docdir/index.html dose3.docdir/index.dot ++ ++echo "Cleaning up after" ++for i in deb common opam pef algo versioning ; do ++ F=$(ls $i/*.mlpack) ; ++ rm -f ${F%.mlpack}.ml ++ rm -f ${F%.mlpack}.mli ++done diff --git a/debian/patches/series b/debian/patches/series index 96b0499..af4515c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ binaries-prefix-edos +fix-doc-target-without-ocamlopt.patch # librpm-4.12 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git _______________________________________________ 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