[Pkg-ocaml-maint-commits] [ocaml-re2] 01/01: Fix watch file

2016-01-25 Thread Hilko Bengen 
This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository ocaml-re2.

commit 2908270119c4cafff4d21ba7c559bf17ca0829fe
Author: Hilko Bengen 
Date:   Mon Jan 25 18:23:58 2016 +0100

Fix watch file
---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 953e9f2..40e37b5 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts="dversionmangle=s/\+dfsg//,uversionmangle=s/rc/~rc/" \
+opts="dversionmangle=s/\+dfsg//,uversionmangle=s/-rc/~rc/" \
 https://github.com/janestreet/re2/releases .*/archive/(.*)\.tar\.gz \
 debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-re2.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] [ocaml-textutils] branch master updated (3e0604c -> 4fae637)

2016-01-25 Thread Hilko Bengen 
This is an automated email from the git hooks/post-receive script.

bengen pushed a change to branch master
in repository ocaml-textutils.

  from  3e0604c   112.17.00-1
   new  4fae637   Fix watch file

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/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-textutils.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] [ocaml-textutils] 01/01: Fix watch file

2016-01-25 Thread Hilko Bengen 
This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository ocaml-textutils.

commit 4fae6373c402de255677aaf83df9994572053e24
Author: Hilko Bengen 
Date:   Mon Jan 25 18:24:10 2016 +0100

Fix watch file
---
 debian/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/watch b/debian/watch
index 009d735..74b8387 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/rc/~rc/" \
+opts="uversionmangle=s/-rc/~rc/" \
 https://github.com/janestreet/textutils/releases .*/archive/(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-textutils.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] [ocaml-re2] branch master updated (c703e53 -> 2908270)

2016-01-25 Thread Hilko Bengen 
This is an automated email from the git hooks/post-receive script.

bengen pushed a change to branch master
in repository ocaml-re2.

  from  c703e53   113.00.00+dfsg-1
   new  2908270   Fix watch file

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/watch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-re2.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] [camlp5] annotated tag debian/6.14-2 created (now bdd5f20)

2016-01-25 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to annotated tag debian/6.14-2
in repository camlp5.

at  bdd5f20   (tag)
   tagging  d9fcb1f8d1e8bb8b58ce79fc827fff652f79e3e0 (commit)
  replaces  debian/6.14-1
 tagged by  Mehdi Dogguy
on  Mon Jan 25 22:17:05 2016 +0100

- Log -
camlp5 Debian release 6.14-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABCAAGBQJWppDRAAoJEDO+GgqMLtj/93oQANzEUcjGoNuY2kQv1lM1Mbgj
tSmyfHDfNs80q7ubZEqa06MLssNOIs7bvy3Z6tktdUlBQhwrQr60xneSKCm3wOEy
iihCRUAXA+0WMpORKBs/agb/0uCKkhRw980g0YLz+Io26rCbRTl6+LXE9WdCZocT
w3t6/1I9JiIrpZ9uqizJRCvNlaRCJe+gcPdttdBl4nZph4pO7q4Jtacp+dsvbgG6
5PozrmbO/ggug/53KQtvPj1QgSr6emROUPzqJ/QdxhscP0Ohx8WpIZSTgAxsLsv+
RdoBeumgFHaWr3nOEE98Qme2lroef6qzeqefpnjqrABZAgBfC0c2VioSRbd4FDOZ
aXmS6AnsIo2xlEcR4T5gWLmXYWB+gVvjOqoiLwqQ1PAk7y6w0/gbhevPsA93By+g
n7qDDu9Z2T++Q6jgULFtJFQMJ82w3C2Rl4Fv25KUu01vrYBajk1b3+MFEKaZGjNS
0BaCpBLUwA21ArCt02CylkpDNbcdZIHSQUoJiwYopdiRcdS0rjjULREwtpGPVhCo
oG4glKKMw1L9QbbnXLvgBiv3KkukZifiuHdEiTQ+/vvCXBIj1FtVAKY4mj5eCt3U
0E5mpCmsu7/lLN4/m33OaOjahp7tSfH6z/ZGp/m7PFYGdujGWCmjz5lUUxWmRo6e
F0tlxaiQTPtpB46xiReu
=tAre
-END PGP SIGNATURE-

Mehdi Dogguy (3):
  Fix bug on methods wrongly interpreted as vals (Closes: #802264)
  Fix bug on optional types
  Release 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/camlp5.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] [camlp5] 03/03: Release to unstable

2016-01-25 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository camlp5.

commit d9fcb1f8d1e8bb8b58ce79fc827fff652f79e3e0
Author: Mehdi Dogguy 
Date:   Mon Jan 25 21:57:52 2016 +0100

Release to unstable
---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7e6cba..2b57885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-camlp5 (6.14-2) UNRELEASED; urgency=medium
+camlp5 (6.14-2) unstable; urgency=medium
 
   * Team upload.
   * Fix bug on methods wrongly interpreted as vals (Closes: #802264)
   * Fix bug on optional types, patch picked from upstream's git repository.
 
- -- Mehdi Dogguy   Wed, 20 Jan 2016 19:59:02 +0100
+ -- Mehdi Dogguy   Mon, 25 Jan 2016 21:57:52 +0100
 
 camlp5 (6.14-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp5.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] [camlp5] branch master updated (b9ed506 -> d9fcb1f)

2016-01-25 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a change to branch master
in repository camlp5.

  from  b9ed506   Prepare upload to unstable
   new  85bae03   Fix bug on methods wrongly interpreted as vals (Closes: 
#802264)
   new  e5e039d   Fix bug on optional types
   new  d9fcb1f   Release to unstable

The 3 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 ++
 ...x-for-methods-wrongly-interpreted-as-vals.patch |  81 +
 .../patches/0002-fixed-bug-on-optional-types.patch | 100 +
 debian/patches/series  |   2 +
 4 files changed, 191 insertions(+)
 create mode 100644 
debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
 create mode 100644 debian/patches/0002-fixed-bug-on-optional-types.patch
 create mode 100644 debian/patches/series

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp5.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] [camlp5] 01/03: Fix bug on methods wrongly interpreted as vals (Closes: #802264)

2016-01-25 Thread Mehdi Dogguy 
This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository camlp5.

commit 85bae0365a625e3678ef63f46354c96464eae409
Author: Mehdi Dogguy 
Date:   Wed Jan 20 20:00:19 2016 +0100

Fix bug on methods wrongly interpreted as vals (Closes: #802264)
---
 debian/changelog   |  7 ++
 ...x-for-methods-wrongly-interpreted-as-vals.patch | 81 ++
 debian/patches/series  |  1 +
 3 files changed, 89 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index aa54e21..1a676e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlp5 (6.14-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix bug on methods wrongly interpreted as vals (Closes: #802264)
+
+ -- Mehdi Dogguy   Wed, 20 Jan 2016 19:59:02 +0100
+
 camlp5 (6.14-1) unstable; urgency=medium
 
   * New upstream release
diff --git 
a/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch 
b/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
new file mode 100644
index 000..a56e810
--- /dev/null
+++ b/debian/patches/0001-fix-for-methods-wrongly-interpreted-as-vals.patch
@@ -0,0 +1,81 @@
+From: Mehdi Dogguy 
+Date: Wed, 20 Jan 2016 19:58:12 +0100
+Subject: fix for methods wrongly interpreted as vals
+
+See 
https://scm.gforge.inria.fr/anonscm/gitweb?p=camlp5/camlp5.git;a=commit;h=caca3dd0643ec5aae9df4399fa73eb280808ef18
+---
+ lib/versdep.ml  | 2 +-
+ main/ast2pt.ml  | 4 
+ ocaml_src/lib/versdep/4.02.3.ml | 2 +-
+ ocaml_src/lib/versdep/4.02.4.ml | 2 +-
+ ocaml_src/main/ast2pt.ml| 3 ---
+ 5 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/lib/versdep.ml b/lib/versdep.ml
+index 184b988..0cd2233 100644
+--- a/lib/versdep.ml
 b/lib/versdep.ml
+@@ -1091,7 +1091,7 @@ value ocaml_pcf_valvirt =
+ value ocaml_pcf_virt (s, pf, t, loc) =
+   IFDEF OCAML_VERSION < OCAML_4_00 THEN Pcf_virt (s, pf, t, loc)
+   ELSIFDEF OCAML_VERSION < OCAML_4_02_0 THEN Pcf_virt (mkloc loc s, pf, t)
+-  ELSE Pcf_val (mkloc loc s, Immutable, Cfk_virtual t) END
++  ELSE Pcf_method (mkloc loc s, pf, Cfk_virtual t) END
+ ;
+ 
+ value ocaml_pcl_apply =
+diff --git a/main/ast2pt.ml b/main/ast2pt.ml
+index d221dff..bd3c321 100644
+--- a/main/ast2pt.ml
 b/main/ast2pt.ml
+@@ -261,10 +261,6 @@ value rec ctyp =
+   | TyArr loc (TyLab loc1 lab t1) t2 →
+   mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2))
+   | TyArr loc (TyOlb loc1 lab t1) t2 →
+-  let t1 =
+-let loc = loc1 in
+-<:ctyp< option $t1$ >>
+-  in
+   mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2))
+   | TyArr loc t1 t2 → mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2))
+   | TyObj loc fl v → mktyp loc (ocaml_ptyp_object (meth_list loc (uv fl) v))
+diff --git a/ocaml_src/lib/versdep/4.02.3.ml b/ocaml_src/lib/versdep/4.02.3.ml
+index cbe5f5b..54bfd10 100644
+--- a/ocaml_src/lib/versdep/4.02.3.ml
 b/ocaml_src/lib/versdep/4.02.3.ml
+@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt =
+ ;;
+ 
+ let ocaml_pcf_virt (s, pf, t, loc) =
+-  Pcf_val (mkloc loc s, Immutable, Cfk_virtual t)
++  Pcf_method (mkloc loc s, pf, Cfk_virtual t)
+ ;;
+ 
+ let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));;
+diff --git a/ocaml_src/lib/versdep/4.02.4.ml b/ocaml_src/lib/versdep/4.02.4.ml
+index cbe5f5b..54bfd10 100644
+--- a/ocaml_src/lib/versdep/4.02.4.ml
 b/ocaml_src/lib/versdep/4.02.4.ml
+@@ -524,7 +524,7 @@ let ocaml_pcf_valvirt =
+ ;;
+ 
+ let ocaml_pcf_virt (s, pf, t, loc) =
+-  Pcf_val (mkloc loc s, Immutable, Cfk_virtual t)
++  Pcf_method (mkloc loc s, pf, Cfk_virtual t)
+ ;;
+ 
+ let ocaml_pcl_apply = Some (fun ce lel -> Pcl_apply (ce, lel));;
+diff --git a/ocaml_src/main/ast2pt.ml b/ocaml_src/main/ast2pt.ml
+index 776c2a1..a534dd0 100644
+--- a/ocaml_src/main/ast2pt.ml
 b/ocaml_src/main/ast2pt.ml
+@@ -276,9 +276,6 @@ let rec ctyp =
+   | TyArr (loc, TyLab (loc1, lab, t1), t2) ->
+   mktyp loc (ocaml_ptyp_arrow (uv lab) (ctyp t1) (ctyp t2))
+   | TyArr (loc, TyOlb (loc1, lab, t1), t2) ->
+-  let t1 =
+-let loc = loc1 in MLast.TyApp (loc, MLast.TyLid (loc, "option"), t1)
+-  in
+   mktyp loc (ocaml_ptyp_arrow ("?" ^ uv lab) (ctyp t1) (ctyp t2))
+   | TyArr (loc, t1, t2) -> mktyp loc (ocaml_ptyp_arrow "" (ctyp t1) (ctyp t2))
+   | TyObj (loc, fl, v) ->
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..f38e374
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-for-methods-wrongly-interpreted-as-vals.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camlp5.git

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org