[Pkg-ocaml-maint-commits] [dose3] branch experimental/master updated (87e422b -> c2bfd40)

2016-01-22 Thread Ralf Treinen 
This is an automated email from the git hooks/post-receive script.

treinen pushed a change to branch experimental/master
in repository dose3.

  from  87e422b   bump build-deps ocaml, ocamlgraph
   new  c2bfd40   Imported Debian patch 4.1~beta1-2

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog   |   7 +
 .../patches/fix-doc-target-without-ocamlopt.patch  | 161 +
 debian/patches/series  |   1 +
 3 files changed, 169 insertions(+)
 create mode 100644 debian/patches/fix-doc-target-without-ocamlopt.patch

-- 
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

[Pkg-ocaml-maint-commits] [dose3] annotated tag debian/4.1_beta1-2 created (now b6f0234)

2016-01-22 Thread Ralf Treinen 
This is an automated email from the git hooks/post-receive script.

treinen pushed a change to annotated tag debian/4.1_beta1-2
in repository dose3.

at  b6f0234   (tag)
   tagging  c2bfd409d4936b5556cff7ced0a3eb293fe65b22 (commit)
  replaces  debian/4.1_beta1-1
 tagged by  Ralf Treinen
on  Fri Jan 22 09:08:22 2016 +0100

- Log -
Debian release 4.1~beta1-2

Johannes Schauer (1):
  Imported Debian patch 4.1~beta1-2

---

No new revisions were added by this update.

-- 
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

[Pkg-ocaml-maint-commits] [dose3] 01/01: Imported Debian patch 4.1~beta1-2

2016-01-22 Thread Ralf Treinen 
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 
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   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 000..e476b73
--- /dev/null
+++ b/debian/patches/fix-doc-target-without-ocamlopt.patch
@@ -0,0 +1,161 @@
+commit 3bc5304e0f1db8a0771ca5ba6ca639f6f42d9b3e
+Author: Johannes 'josch' Schauer 
+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..000
+--- 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 000..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 >

[Pkg-ocaml-maint-commits] [eliom] branch master updated (2bfa32b -> 86f6a1c)

2016-01-22 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to branch master
in repository eliom.

  from  2bfa32b   Bump Standards-Version to 3.9.6
   new  86f6a1c   Update changelog and prepare upload to unstable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.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

[Pkg-ocaml-maint-commits] [eliom] 01/01: Update changelog and prepare upload to unstable

2016-01-22 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository eliom.

commit 86f6a1c083fc097a210cd51c09625279b6f76d71
Author: Stephane Glondu 
Date:   Thu Jan 7 13:37:11 2016 +0100

Update changelog and prepare upload to unstable
---
 debian/changelog | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf9d435..401413f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-eliom (4.2-1) UNRELEASED; urgency=medium
+eliom (4.2-1) unstable; urgency=medium
 
-  * New upstream release
+  * New upstream release (Closes: #802860)
+  * Simplify packaging by removing libeliom-ocaml
+  * Bump Standards-Version to 3.9.6
 
- -- Stéphane Glondu   Tue, 27 Oct 2015 10:51:21 +0100
+ -- Stéphane Glondu   Thu, 07 Jan 2016 13:35:19 +0100
 
 eliom (4.0.0-2) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.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

[Pkg-ocaml-maint-commits] [eliom] annotated tag debian/4.2-1 created (now 2173c78)

2016-01-22 Thread Stéphane Glondu 
This is an automated email from the git hooks/post-receive script.

glondu pushed a change to annotated tag debian/4.2-1
in repository eliom.

at  2173c78   (tag)
   tagging  86f6a1c083fc097a210cd51c09625279b6f76d71 (commit)
  replaces  debian/4.0.0-2
 tagged by  Stephane Glondu
on  Fri Jan 22 10:02:38 2016 +0100

- Log -
eliom Debian release 4.2-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCgAGBQJWofAuAAoJEHhT2k1JiBrTxvAQAJ5CjTICr0tkX5BqcymP2Fhh
PM/S6byMiGnpBja7ESPrNCTnbKjZwDkFm9bNQhkgZSQaywjhjoJ0Nsc71N8VFZoN
W5nDZecmCEiqXFejrC+VQnoS92RcDllTwP2y9xiLVf78DOYXo1ZVhTXTvEuJBacY
+jXYCW5dyqsTY+OYZ3KoIQZCqquMYXlI7A88NYqxoux55yYf53UVk04jlhoZnxHs
fuMeGD91LCK9ZTYNlGorIrdSp3dKDrg/o5eF4KQLcP63nKhoGfCh3MQ3V52SMAy4
DEOZ/qy3S0WOKIwyCaN1MK51TRahUwOdkLVmHUABEFU8fh62CcgukT01v5oAA3es
umJ0r3azryKAI7cOyhblortakxon/p+bvewuczXdUtt8ynlme/MOCpHorQ6BUpTR
jLo3Rojc400xO6UT/R7qloy/v4+Bp0+88WgIBYYtWrcpbU5rKet3k+tUTtX1+KSP
vkkZayY4sw8aplWrDycZ/zls583uZNnCuTFlmwCvPVsKSMl/6bEhx1dG5+GQ4NfK
Rwq7AkoGYi+D4JdvzUVQvGQSDmbrFbskBQ2/FkHPf3TQOZ65wGoXqPOrxv55lNam
WTF8/dPZjowpsIX0gSSfGZqyPb9fKbjZDwFZ/GOf9bEbzxKzRcMAPnirAZGmKb1R
YS5sBNfC+R+UhFi8BifJ
=bF8c
-END PGP SIGNATURE-

Stephane Glondu (10):
  Imported Upstream version 4.1.0
  Imported Upstream version 4.2
  Merge tag 'upstream/4.2'
  New upstream release
  Remove obsolete patches
  Drop libeliom-ocaml
  Update packaging
  Fix installation of API documentation
  Bump Standards-Version to 3.9.6
  Update changelog and prepare upload to unstable

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.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