[Pkg-ocaml-maint-commits] [ocaml-deriving-ocsigen] 01/03: Fix compatibility with type-conv = 108
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocaml-deriving-ocsigen.
commit 8849bbb105b804e9e0fa94a1b394b150c0b1d244
Author: Stephane Glondu st...@glondu.net
Date: Sun Nov 10 11:29:05 2013 +0100
Fix compatibility with type-conv = 108
---
...0001-Fix-compatibility-with-type-conv-108.patch | 106
debian/patches/series |1 +
2 files changed, 107 insertions(+)
diff --git a/debian/patches/0001-Fix-compatibility-with-type-conv-108.patch
b/debian/patches/0001-Fix-compatibility-with-type-conv-108.patch
new file mode 100644
index 000..dc8c202
--- /dev/null
+++ b/debian/patches/0001-Fix-compatibility-with-type-conv-108.patch
@@ -0,0 +1,106 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sun, 10 Nov 2013 11:28:06 +0100
+Subject: Fix compatibility with type-conv = 108
+
+Changes cherry-picked from upstream version 0.5.
+---
+ Makefile | 2 ++
+ Makefile.config | 17 -
+ files/META.in| 2 +-
+ syntax/Makefile | 2 +-
+ syntax/pa_deriving_tc.ml | 4 ++--
+ 5 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0e9e5cb..92c28e1 100644
+--- a/Makefile
b/Makefile
+@@ -16,12 +16,14 @@ files/META: files/META.in
+ sed -e s%__NAME__%${PROJECTNAME}% \
+ -e s%__LIBDIR__%% \
+ -e s%__SYNTAXDIR__%% \
++-e s%__TCNAME__%${TYPECONVNAME}% \
+ $ $@
+
+ files/META.${PROJECTNAME}: files/META.in
+ sed -e s%__NAME__%${PROJECTNAME}% \
+ -e s%__LIBDIR__%directory = \../lib\% \
+ -e s%__SYNTAXDIR__%directory = \../syntax\% \
++-e s%__TCNAME__%${TYPECONVNAME}% \
+ $ $@
+
+ clean: clean.local
+diff --git a/Makefile.config b/Makefile.config
+index f3303d9..8226e81 100644
+--- a/Makefile.config
b/Makefile.config
+@@ -4,7 +4,22 @@ OCAMLFIND := ocamlfind
+
+ NATDYNLINK :=YES
+
+-TYPECONV := $(shell ${OCAMLFIND} query type-conv 2/dev/null)
++TYPECONV1 := \
++ $(shell ${OCAMLFIND} query -p-format type_conv 2/dev/null)
++TYPECONV2 := \
++ $(shell ${OCAMLFIND} query -p-format type-conv 2/dev/null)
++
++ifneq ${TYPECONV1}
++TYPECONVNAME := ${TYPECONV1}
++else
++ifneq ${TYPECONV2}
++TYPECONVNAME := ${TYPECONV2}
++else
++TYPECONVNAME :=
++endif
++endif
++
++TYPECONV := $(shell ${OCAMLFIND} query ${TYPECONVNAME} 2/dev/null)
+
+ OBJEXT := .o
+ LIBEXT := .a
+diff --git a/files/META.in b/files/META.in
+index a10ddb9..f3ebb9d 100644
+--- a/files/META.in
b/files/META.in
+@@ -31,7 +31,7 @@ package syntax (
+ package syntax_tc (
+ __SYNTAXDIR__
+ exists_if = pa_deriving_tc.cma
+- requires(syntax) = camlp4,unix,type-conv
++ requires(syntax) = camlp4,unix,__TCNAME__
+ requires(syntax, toploop) += __NAME__
+ archive(syntax, preprocessor) = pa_deriving_tc.cma
+ archive(syntax, toploop) = pa_deriving_tc.cma
+diff --git a/syntax/Makefile b/syntax/Makefile
+index e2be458..0aeaea4 100644
+--- a/syntax/Makefile
b/syntax/Makefile
+@@ -23,7 +23,7 @@ extend.cmo extend.cmx .extend.ml.deps: \
+ pa_deriving.cmo pa_deriving.cmx .pa_deriving.ml.deps: \
+ LIBS+=-syntax camlp4o -package camlp4.extend,camlp4.quotations.o
+ pa_deriving_tc.cmo pa_deriving_tc.cmx .pa_deriving_tc.ml.deps: \
+- LIBS+=-syntax camlp4o -package
camlp4.extend,camlp4.quotations.o,type-conv
++ LIBS+=-syntax camlp4o -package
camlp4.extend,camlp4.quotations.o,${TYPECONVNAME}
+
+ CLASSES := show_class.ml \
+dump_class.ml \
+diff --git a/syntax/pa_deriving_tc.ml b/syntax/pa_deriving_tc.ml
+index bb73d21..a8d32ef 100644
+--- a/syntax/pa_deriving_tc.ml
b/syntax/pa_deriving_tc.ml
+@@ -9,12 +9,12 @@ open Camlp4.PreCast
+
+ open Pa_deriving_common
+
+-let translate_str deriver types =
++let translate_str deriver _ types =
+ let _loc = Ast.loc_of_ctyp types in
+ let decls = Base.display_errors _loc Type.Translate.decls types in
+ Base.derive_str _loc decls deriver
+
+-let translate_sig deriver types =
++let translate_sig deriver _ types =
+ let _loc = Ast.loc_of_ctyp types in
+ let decls = Base.display_errors _loc Type.Translate.decls types in
+ Base.derive_sig _loc decls deriver
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..5487126
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-compatibility-with-type-conv-108.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.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-deriving-ocsigen] 02/03: Compile with OCaml = 4.01
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-deriving-ocsigen. commit 38b4f2805f064bd890dc360ceb1d8a37c7319890 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 11:29:53 2013 +0100 Compile with OCaml = 4.01 --- debian/control |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 50c95cd..ea1d4ca 100644 --- a/debian/control +++ b/debian/control @@ -5,12 +5,12 @@ Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Stéphane Glondu glo...@debian.org Build-Depends: - ocaml-nox (= 3.12~), - ocaml-findlib, + ocaml-nox (= 4.01), + ocaml-findlib (= 1.4), dh-ocaml (= 0.9~), debhelper (= 7.0.50~), - libtype-conv-camlp4-dev (= 2.3.0~), - camlp4-extra + libtype-conv-camlp4-dev (= 108), + camlp4-extra (= 4.01) Standards-Version: 3.9.2 Homepage: https://github.com/hnrgrgr/deriving Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.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-deriving-ocsigen] 03/03: Update changelog and prepare upload to experimental
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-deriving-ocsigen. commit 728d0302c998c27b583eca4317a7dd2aa1a963e1 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 10:45:11 2013 +0100 Update changelog and prepare upload to experimental --- debian/changelog |8 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 94848ea..81f4dd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ocaml-deriving-ocsigen (0.3c-2) experimental; urgency=low + + * debian/patches: ++ Compatibility with type-conv = 108 + * Compile with OCaml = 4.01 + + -- Stéphane Glondu glo...@debian.org Sun, 10 Nov 2013 12:24:43 +0100 + ocaml-deriving-ocsigen (0.3c-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-deriving-ocsigen.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-deriving-ocsigen] annotated tag debian/0.3c-2 created (now 7db8b83)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag debian/0.3c-2 in repository ocaml-deriving-ocsigen. at 7db8b83 (tag) tagging 728d0302c998c27b583eca4317a7dd2aa1a963e1 (commit) replaces debian/0.3c-1 tagged by Stephane Glondu on Sun Nov 10 12:42:07 2013 +0100 - Log - ocaml-deriving-ocsigen Debian release 0.3c-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABCgAGBQJSf3EPAAoJEHhT2k1JiBrTv2oP/0fw+EQy+Mh5QiTpDJLbu3cO xkRovPRlIT0pih9Qms/5EIvWzgxh8XXx00InvdGJiArlmr/brcpwol1gdfeLv7fU M1t7X+qvWfniLK5E0/pjY68vNpVYWJE7cE4Ia/OwsuRYX/ng+32HFDEnxo1bZJ6t orsbABQlyBJNOYWtjGsUzDAZrxN34Al+4HKYbLEF64osqNGFHNbt7UAlyzpYcCWx fez4FM/IvyU71YzYUVimHOYrPha09YoNsFx23TGAbWnLRgA5xe3YDvbLfvFYEPRY pWgAjcy8iI6IPySWcCctnHIKzpzgY7hLyFSNFrG351kiVvxjwBtQif40E5ZOQfLT N/hNa7nk58zi1PHOstv+xI9OxS5N/AuBVeSHv2981b4KtPcrStSSfQwVZF8v8CfR /7lcBSWjYVm3f520NCJBk0CA3t5BbzV+N9uoYkEy5AyqNugE9KC0SV3LkuhrSrAN ikZGuTYNUqG6De1klkImZo5ajxRYn5WOCuSSNrpD1csUl+/jQerihJ8RKHR3fZd0 gLrb7eOtiOhf4IHQcE725nStKbPT7LsU6C+qrT4DOFP4ub/sDis5RIpZpC/Wlqrk z18PbclOqHx+VcPuqYYte1hGz+3h5B25+MzpeLH+LvefjimTj35UZvCYQAnSQH5b kkRIwMz0u1J84dpyTIaF =YT5t -END PGP SIGNATURE- Stephane Glondu (3): Fix compatibility with type-conv = 108 Compile with OCaml = 4.01 Update changelog and prepare upload to experimental --- 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/ocaml-deriving-ocsigen.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-deriving-ocsigen] branch master updated (468a905 - 728d030)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocaml-deriving-ocsigen. from 468a905 Prepare upload to unstable new 8849bbb Fix compatibility with type-conv = 108 new 38b4f28 Compile with OCaml = 4.01 new 728d030 Update changelog and prepare upload to experimental 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 ++ debian/control |8 +- ...0001-Fix-compatibility-with-type-conv-108.patch | 106 debian/patches/series |1 + 4 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 debian/patches/0001-Fix-compatibility-with-type-conv-108.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/ocaml-deriving-ocsigen.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-sqlite3] 05/08: Use format version 1.0 in debian/copyright
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 43761cec21f6ac7df04074f239fbc3277286fcfa Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:40:19 2013 +0200 Use format version 1.0 in debian/copyright --- debian/copyright | 62 +++--- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/debian/copyright b/debian/copyright index 48c08ee..468678b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,32 +1,32 @@ -This package was debianized by Samuel Mimram smim...@debian.org on -Sat, 30 Dec 2006 14:21:42 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Packaged-By: Samuel Mimram smim...@debian.org +Packaged-Date: Sat, 30 Dec 2006 14:21:42 +0100 +Source: https://bitbucket.org/mmottl/sqlite3-ocaml +Upstream-Contact: + Markus Mottl markus.mo...@gmail.com, + Christian Szegedy csdonts...@metamatix.com -It was downloaded from http://ocaml.info/home/ocaml_sources.html - -Upstream Authors: Christian Szegedy csdontspam...@metamatix.org - Markus Mottl markus.mo...@gmail.com - -Copyright (C) 2005 Christian Szegedy csdontspam...@metamatix.org -Copyright (C) 2007 Markus Mottl markus.mo...@gmail.com - -License: - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the Software), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +Files: * +Copyright: 2007-2010, Jane Street Holding LLC opensou...@janestreet.com + 2010-2012, Markus Mottl markus.mo...@gmail.com + 2005-2012, Christian Szegedy csdonts...@metamatix.com +License: MIT + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the Software), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] annotated tag debian/2.0.4-1 created (now 76a08c5)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag debian/2.0.4-1 in repository ocaml-sqlite3. at 76a08c5 (tag) tagging f75bb738eec919b2df91a45c4c701f06c7aaa6bb (commit) replaces upstream/2.0.4 tagged by Stephane Glondu on Wed May 8 15:46:54 2013 +0200 - Log - ocaml-sqlite3 Debian release 2.0.4-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRildOAAoJEHhT2k1JiBrTbKsP/2pl0X6l1M/6ZFtAIo2KCVzY peqIxdJ+oKZ5sLeiapXga04+uvf5/HpZ9S3geyNAMKpicrSyn6bLRe/uVBvVvSDG H2/tNzSPHZS9bMgmUYTjf7svN6A2XVzS1/2xYBLLpqde4LrlJt+AFU5/zu9JctqQ TjExlI33XO12SstzS3qey9Up2gY20xo898jduZh/wOe28Jhor2E92BStvFTUu1F8 5R8RGWA51Y7vSl3y895OXgi+pocwKAl89gOAzoQuKBqrrQBYI/0txVPHFY4oR5Hp HfWHhMrlNC8xzaNMK0oudxCXHNFTwRVQXeH68NJL5CNsKDHhlyyMjiAu8+3lX52O A8WvWa31ayhBDXFAPC41ZkS8bkknRX7g01O5y6d0p9Gmo9WMf55peztEtnoPx5zv febVqOADkwJgCj7CxBDIv2BSHotA8wvRz9i6HIqXJ1M1gFsjqCR4TKGIlx4OlPGU FLLcefwDvUY4buEFETDNrcBypHjOW6Ukffq/d4mw8szAVq5e4reuOLy3Pac742f2 PAUHmtjokGaEb8/ceJ6VskRA6ANHCMcPq5/YUOLmJ62nXWEQGsyIeczAInJfC+zb LXhXGHBxmLMrM8KHNg5MoJvM2zfDBbZg0gskdORsIza3+XgVg1HzBWSzd1wmy7C8 MJLlG9tSkhRdPv5kkP0a =64Ut -END PGP SIGNATURE- Enrico Tassi (2): Merge commit 'upstream/0.21.0' sqlite3 against 3.10.0 Samuel Mimram (35): Initial import of the package. Backport patches from 0.2.1. s/dllsqlite3.so/dllsqlite3_stubs.so/ Merge commit 'upstream/0.3.0' New upstream release. Merge commit 'upstream/0.13.0' New upstream release. Merge commit 'upstream/0.16.0' New upstream release. Updated install-no-mktop.dpatch in order to correctly install on non-native archs. Uploading. Tighten dependency on libsqlite3-dev. Merge commit 'upstream/0.22.0' New upstream release. Build with OCaml 3.10. Merge commit 'upstream/0.23.0' Merge commit 'upstream/1.0.0' New upstream release. Uploading. Merge commit 'upstream/1.0.1' New upstream release. Merge commit 'upstream/1.0.3' Switch packaging to git Merge commit 'upstream/1.3.0' Merge changelog entries. Update compat to 7. Update standards version to 3.8.0. Remove useless packaging copyright. Use predefined variables in rules. More cleaning. Uploading to experimental. Better cleaning of ocamlinit files. Upload to unstable. Merge commit 'upstream/1.4.0' New upstream release. Stefano Zacchiroli (4): added XS-Vcs-Browser field promote Vcs-* fields to real debian/control fields, now that they are supported by dpkg fix vcs-svn fields to point just above debian/ dir (as suggested by devref) set archive section to ocaml Stephane Glondu (44): Added debian/libsqlite3-ocaml-dev.doc-base, closes #464440. Missing colon. Raising priority to optional. Adding me to uploaders. Merge commit 'upstream/1.0.2' * New upstream release. New upstream release. Merge commit 'upstream/1.2.0' Remove explicit sections in binary packages (both ocaml now) Move .cma and META to libsqlite3-ocaml, build .cmxs Update changelog Prepare upload to unstable NOT RELEASED YET Switch patch system to quilt Update Standards-Version to 3.8.2 and add Homepage Merge commit 'upstream/1.5.1' New upstream release Add README.source Update changelog and prepare upload to unstable Adapt to new dh-ocaml, switch debian/rules to dh Merge commit 'upstream/1.5.6' New upstream release This release breaks ocsigen (at ABI level) Update build-dependencies Update Standards-Version to 3.8.3 Update my e-mail address and remove DMUA Update changelog and prepare upload to unstable Add Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch Merge commit 'upstream/1.6.1' New upstream release Refresh patches Switch source package format to 3.0 (quilt) Bump debhelper compatibility level to 8 Remove old versioned dependencies Bump Standards-Version to 3.9.2 Update changelog and prepare upload to unstable New debian/watch file by Bart Martens Merge tag 'upstream/2.0.4' New upstream release Remove obsolete patches Adapt packaging to new build system Use format version 1.0 in debian/copyright Bump Standards-Version to 3.9.4 Add pkg-config to Build-Depends 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/ocaml-sqlite3.git ___ Pkg-ocaml-maint-commits mailing
[Pkg-ocaml-maint-commits] [ocaml-sqlite3] 02/08: New upstream release
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 8fb68f5757b96c8883c92d13ccb8b584ba4648bf Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:20:02 2013 +0200 New upstream release --- debian/changelog |6 ++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 08fe2db..61532a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-sqlite3 (2.0.4-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 15:19:59 +0200 + ocaml-sqlite3 (1.6.1-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 01/08: Merge tag 'upstream/2.0.4'
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit ad8a4128d9e543bd5e3f1a55cefb27e934c12c78 Merge: 04ae96c 9aaa4ba Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:10:34 2013 +0200 Merge tag 'upstream/2.0.4' Upstream version 2.0.4 .hg_archival.txt |4 +- .hgignore |8 +- .hgtags|7 + API.odocl |4 + AUTHORS.txt| 10 + Changelog = CHANGES.txt | 32 + COPYING = COPYING.txt |0 INSTALL.txt| 37 + META.in|6 - Makefile | 38 + Makefile.in| 81 - OMakefile | 14 - README.md | 63 + README.txt | 86 - TODO | 16 - TODO.md| 16 + _oasis | 122 + _tags | 42 +- configure | 5925 +- configure.ac | 42 - install-sh | 251 -- lib/META | 11 + lib/libsqlite3_stubs.clib |4 + sqlite3.ml = lib/sqlite3.ml |7 +- lib/sqlite3.mldylib|1 + sqlite3.mli = lib/sqlite3.mli | 15 +- lib/sqlite3.mllib |4 + sqlite3_stubs.c = lib/sqlite3_stubs.c | 18 +- libsqlite3_stubs.clib |1 - myocamlbuild.ml| 639 +++- setup.ml | 6322 test/Makefile | 24 - test/OMakefile |6 - test/test_agg.ml |1 - test/test_exec.ml |2 +- test/test_stmt.ml |8 +- 36 files changed, 7374 insertions(+), 6493 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 03/08: Remove obsolete patches
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 6cce5070cc844fe41d6cccf2dfe202656684597f Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:19:42 2013 +0200 Remove obsolete patches --- debian/patches/0001-Install-no-mktop.patch | 33 - ...est-only-if-sqlite3.cmxa-has-been-compile.patch | 37 debian/patches/series |2 -- 3 files changed, 72 deletions(-) diff --git a/debian/patches/0001-Install-no-mktop.patch b/debian/patches/0001-Install-no-mktop.patch deleted file mode 100644 index 9c49743..000 --- a/debian/patches/0001-Install-no-mktop.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Samuel Mimram smim...@debian.org -Date: Tue, 30 Jun 2009 20:38:46 +0200 -Subject: Install no mktop - -Allow installation without building in native mode - -Signed-off-by: Samuel Mimram smim...@debian.org -Signed-off-by: Stephane Glondu st...@glondu.net - Makefile.in |8 ++-- - 1 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 675324f..9f0ef79 100644 a/Makefile.in -+++ b/Makefile.in -@@ -42,13 +42,9 @@ clean: - distclean: clean - rm -rf autom4te.* config.* META Makefile doc - --# install rebuilds sqlite3top to point to the findlib-managed dll and not the --# one in . --install: sqlite3.cma sqlite3.cmxa sqlite3top -+install: sqlite3.cma - [ -f *.so ] SO_FILES=*.so; \ -- ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES -- ocamlfind ocamlmktop -o sqlite3top -package sqlite3 sqlite3.cma -- $(INSTALL) sqlite3top $(bindir)/sqlite3top -+ ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma $(wildcard *.cmxa *.a *.cmx) $$SO_FILES - - remove: uninstall - uninstall: --- diff --git a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch deleted file mode 100644 index e67de6a..000 --- a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Sun, 18 Oct 2009 15:27:11 +0200 -Subject: Do native test only if sqlite3.cmxa has been compiled - -Signed-off-by: Stephane Glondu st...@glondu.net - Makefile.in |2 +- - test/Makefile |2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 9f0ef79..0e03f2c 100644 a/Makefile.in -+++ b/Makefile.in -@@ -32,7 +32,7 @@ bytecode: sqlite3.cma sqlite3top - - opt: sqlite3.cmxa - --test: bytecode opt -+test: - @cd test $(MAKE) all - - clean: -diff --git a/test/Makefile b/test/Makefile -index 8bfed3b..d379649 100644 a/test/Makefile -+++ b/test/Makefile -@@ -5,7 +5,7 @@ TESTS = $(wildcard *.ml) - all: bytecode opt - - bytecode: $(TESTS:%.ml=%.bc) --opt: $(TESTS:%.ml=%.exe) -+opt: $(if $(wildcard ../sqlite3.cmxa),$(TESTS:%.ml=%.exe),) - - %.bc: %.ml - ocamlc -w Ae -warn-error Ae -I .. -dllpath .. str.cma sqlite3.cma $ -o $@ --- diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index b48c8c7..000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-Install-no-mktop.patch -0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 06/08: Bump Standards-Version to 3.9.4
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit fd7fe8bcff42fe27acd7fe4f47021687e70eac5c Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:40:34 2013 +0200 Bump Standards-Version to 3.9.4 --- debian/control |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index cd0e053..55bb4fe 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: libsqlite3-dev (= 3.3.9), ocaml-findlib (= 1.2.5), dh-ocaml (= 0.9) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Section: ocaml Homepage: http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] branch master updated (04ae96c - f75bb73)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocaml-sqlite3. from 04ae96c New debian/watch file by Bart Martens adds 298bd2d Imported Upstream version 1.6.2 adds 46de208 Imported Upstream version 1.6.3 adds af474bc Imported Upstream version 2.0.0 adds ed7b544 Imported Upstream version 2.0.1 adds 7d08089 Imported Upstream version 2.0.2 adds 8203b5c Imported Upstream version 2.0.3 adds 9aaa4ba Imported Upstream version 2.0.4 new ad8a412 Merge tag 'upstream/2.0.4' new 8fb68f5 New upstream release new 6cce507 Remove obsolete patches new 36e67ca Adapt packaging to new build system new 43761ce Use format version 1.0 in debian/copyright new fd7fe8b Bump Standards-Version to 3.9.4 new e0c8519 Add pkg-config to Build-Depends new f75bb73 Update changelog and prepare upload to unstable The 8 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: .hg_archival.txt |4 +- .hgignore |8 +- .hgtags|7 + API.odocl |4 + AUTHORS.txt| 10 + Changelog = CHANGES.txt | 32 + COPYING = COPYING.txt |0 INSTALL.txt| 37 + META.in|6 - Makefile | 38 + Makefile.in| 81 - OMakefile | 14 - README.md | 63 + README.txt | 86 - TODO | 16 - TODO.md| 16 + _oasis | 122 + _tags | 42 +- configure | 5925 +- configure.ac | 42 - debian/changelog |9 + debian/control |3 +- debian/copyright | 62 +- debian/libsqlite3-ocaml-dev.doc-base |4 +- debian/libsqlite3-ocaml-dev.docs |1 - debian/libsqlite3-ocaml-dev.install.in |1 + debian/libsqlite3-ocaml.install.in |2 +- debian/patches/0001-Install-no-mktop.patch | 33 - ...est-only-if-sqlite3.cmxa-has-been-compile.patch | 37 - debian/patches/series |2 - debian/rules | 36 +- install-sh | 251 - lib/META | 11 + lib/libsqlite3_stubs.clib |4 + sqlite3.ml = lib/sqlite3.ml |7 +- lib/sqlite3.mldylib|1 + sqlite3.mli = lib/sqlite3.mli | 15 +- lib/sqlite3.mllib |4 + sqlite3_stubs.c = lib/sqlite3_stubs.c | 18 +- libsqlite3_stubs.clib |1 - myocamlbuild.ml| 639 +- setup.ml | 6322 test/Makefile | 24 - test/OMakefile |6 - test/test_agg.ml |1 - test/test_exec.ml |2 +- test/test_stmt.ml |8 +- 47 files changed, 7443 insertions(+), 6614 deletions(-) create mode 100644 API.odocl create mode 100644 AUTHORS.txt rename Changelog = CHANGES.txt (83%) rename COPYING = COPYING.txt (100%) create mode 100644 INSTALL.txt delete mode 100644 META.in create mode 100644 Makefile delete mode 100644 Makefile.in delete mode 100644 OMakefile create mode 100644 README.md delete mode 100644 README.txt delete mode 100644 TODO create mode 100644 TODO.md create mode 100644 _oasis delete mode 100644 configure.ac delete mode 100644 debian/libsqlite3-ocaml-dev.docs delete mode 100644 debian/patches/0001-Install-no-mktop.patch delete mode 100644 debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch delete mode 100644 debian/patches/series delete mode 100755 install-sh create mode
[Pkg-ocaml-maint-commits] [ocaml-sqlite3] 07/08: Add pkg-config to Build-Depends
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit e0c851979ccfd95058089ec4dd64b74ccd1f66c5 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:44:10 2013 +0200 Add pkg-config to Build-Depends --- debian/control |1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 55bb4fe..4ff6acb 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Stéphane Glondu glo...@debian.org Build-Depends: debhelper (= 8), + pkg-config, ocaml-nox (= 3.11.1-3~), camlp4, libsqlite3-dev (= 3.3.9), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 08/08: Update changelog and prepare upload to unstable
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit f75bb738eec919b2df91a45c4c701f06c7aaa6bb Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:42:12 2013 +0200 Update changelog and prepare upload to unstable --- debian/changelog |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61532a4..d4c9370 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -ocaml-sqlite3 (2.0.4-1) UNRELEASED; urgency=low +ocaml-sqlite3 (2.0.4-1) unstable; urgency=low * New upstream release +- add pkg-config to Build-Depends + * Use format version 1.0 in debian/copyright + * Bump Standards-Version to 3.9.4 - -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 15:19:59 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 15:43:28 +0200 ocaml-sqlite3 (1.6.1-1) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 04/08: Adapt packaging to new build system
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 36e67cafae7160d8fbe4b659f0de3afca0b5044f Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:34:09 2013 +0200 Adapt packaging to new build system --- debian/libsqlite3-ocaml-dev.doc-base |4 ++-- debian/libsqlite3-ocaml-dev.docs |1 - debian/libsqlite3-ocaml-dev.install.in |1 + debian/libsqlite3-ocaml.install.in |2 +- debian/rules | 36 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/debian/libsqlite3-ocaml-dev.doc-base b/debian/libsqlite3-ocaml-dev.doc-base index 033e758..fdc5796 100644 --- a/debian/libsqlite3-ocaml-dev.doc-base +++ b/debian/libsqlite3-ocaml-dev.doc-base @@ -5,5 +5,5 @@ Abstract: Ocamldoc-generated documentation for OCaml sqlite3 bindings Section: Programming/OCaml Format: HTML -Index: /usr/share/doc/libsqlite3-ocaml-dev/doc/index.html -Files: /usr/share/doc/libsqlite3-ocaml-dev/doc/*.html +Index: /usr/share/doc/libsqlite3-ocaml-dev/api/index.html +Files: /usr/share/doc/libsqlite3-ocaml-dev/api/*.html diff --git a/debian/libsqlite3-ocaml-dev.docs b/debian/libsqlite3-ocaml-dev.docs deleted file mode 100644 index 8e695ec..000 --- a/debian/libsqlite3-ocaml-dev.docs +++ /dev/null @@ -1 +0,0 @@ -doc diff --git a/debian/libsqlite3-ocaml-dev.install.in b/debian/libsqlite3-ocaml-dev.install.in index a8e9af7..6a0012d 100644 --- a/debian/libsqlite3-ocaml-dev.install.in +++ b/debian/libsqlite3-ocaml-dev.install.in @@ -3,3 +3,4 @@ @OCamlStdlibDir@/sqlite3/*.a OPT: @OCamlStdlibDir@/sqlite3/*.cmx OPT: @OCamlStdlibDir@/sqlite3/*.cmxa +usr/share/doc/sqlite3-ocaml/api usr/share/doc/libsqlite3-ocaml-dev/ diff --git a/debian/libsqlite3-ocaml.install.in b/debian/libsqlite3-ocaml.install.in index fcd2f39..182cea1 100644 --- a/debian/libsqlite3-ocaml.install.in +++ b/debian/libsqlite3-ocaml.install.in @@ -1,4 +1,4 @@ @OCamlDllDir@/*.so @OCamlStdlibDir@/sqlite3/sqlite3.cma @OCamlStdlibDir@/sqlite3/META -OPT: sqlite3.cmxs @OCamlStdlibDir@/sqlite3 +DYN: @OCamlStdlibDir@/sqlite3/*.cmxs diff --git a/debian/rules b/debian/rules index bf01d76..784b363 100755 --- a/debian/rules +++ b/debian/rules @@ -4,31 +4,41 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DESTDIR := $(CURDIR)/debian/tmp + include /usr/share/ocaml/ocamlvars.mk -DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR) +OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_DESTDIR +OCAMLFIND_LDCONF=ignore +export OCAMLFIND_LDCONF %: dh $@ --with ocaml .PHONY: override_dh_auto_configure override_dh_auto_configure: - dh_auto_configure -- LDFLAGS=-Wl,-z,defs + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' .PHONY: override_dh_auto_build override_dh_auto_build: - $(MAKE) bytecode docs -ifneq ($(OCAML_OPT_ARCH),) - $(MAKE) opt - ocamlopt -I . -shared -linkall -o sqlite3.cmxs sqlite3.cmxa -endif + ocaml setup.ml -build + ocaml setup.ml -doc -.PHONY: override_dh_auto_clean -override_dh_auto_clean: - [ ! -f Makefile ] || $(MAKE) distclean +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test .PHONY: override_dh_auto_install override_dh_auto_install: - mkdir -p $(CURDIR)/debian/tmp$(OCAML_DLL_DIR) - mkdir -p $(CURDIR)/debian/tmp/usr/bin - $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore + mkdir -p '$(DESTDIR)/usr/bin' + mkdir -p '$(DESTDIR)/$(OCAML_DLL_DIR)' + ocaml setup.ml -install + +.PHONY: override_dh_install +override_dh_install: + dh_install --fail-missing -X.so.owner + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 01/04: Update Homepage
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 730f2e10347e82f8582deb90218b967c82eb5217 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:32:26 2013 +0100 Update Homepage --- debian/control |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 4ff6acb..300aa29 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: dh-ocaml (= 0.9) Standards-Version: 3.9.4 Section: ocaml -Homepage: http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3 +Homepage: https://bitbucket.org/mmottl/sqlite3-ocaml Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-sqlite3.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 04/04: Update changelog and prepare upload to experimental
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 0b75488927b12dd0f15dbafddcdc558f7114536b Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:34:01 2013 +0100 Update changelog and prepare upload to experimental --- debian/changelog |9 + 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index d4c9370..76abb05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ocaml-sqlite3 (2.0.4-2) experimental; urgency=low + + * debian/control: +- update Homepage +- update Vcs-* + * Compile with OCaml = 4.01 + + -- Stéphane Glondu glo...@debian.org Sun, 10 Nov 2013 13:33:55 +0100 + ocaml-sqlite3 (2.0.4-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 02/04: Update Vcs-*
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 0a1bd456a06d8b72d69b49f8c9b6f8f3d830d3e2 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:33:05 2013 +0100 Update Vcs-* --- debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 300aa29..07226a4 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Build-Depends: Standards-Version: 3.9.4 Section: ocaml Homepage: https://bitbucket.org/mmottl/sqlite3-ocaml -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-sqlite3.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/ocaml-sqlite3.git +Vcs-Browser: http://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git Package: libsqlite3-ocaml Architecture: any -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] branch master updated (f75bb73 - 0b75488)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocaml-sqlite3. from f75bb73 Update changelog and prepare upload to unstable new 730f2e1 Update Homepage new 0a1bd45 Update Vcs-* new 9497a09 Compile with OCaml = 4.01 new 0b75488 Update changelog and prepare upload to experimental The 4 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 |9 + debian/control |8 2 files changed, 13 insertions(+), 4 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] 03/04: Compile with OCaml = 4.01
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocaml-sqlite3. commit 9497a09ef4a852bc7d651bf4f52cded0abc2f0f4 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:33:21 2013 +0100 Compile with OCaml = 4.01 --- debian/control |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 07226a4..322d685 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Build-Depends: debhelper (= 8), pkg-config, - ocaml-nox (= 3.11.1-3~), + ocaml-nox (= 4.01), camlp4, libsqlite3-dev (= 3.3.9), ocaml-findlib (= 1.2.5), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.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-sqlite3] annotated tag debian/2.0.4-2 created (now dea9f81)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag debian/2.0.4-2 in repository ocaml-sqlite3. at dea9f81 (tag) tagging 0b75488927b12dd0f15dbafddcdc558f7114536b (commit) replaces debian/2.0.4-1 tagged by Stephane Glondu on Sun Nov 10 13:36:10 2013 +0100 - Log - ocaml-sqlite3 Debian release 2.0.4-2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABCgAGBQJSf326AAoJEHhT2k1JiBrT5cMP/i9UEVpDL6ujfxICWHImsWdF yJmoaRjhbn5RkhbNuYdvhO01FiEE8Q6uTMbKEnkTwSBPZ0JT/rWB294LHHdiJAXr rXNXd9VtbwnV+FfahVqk1fsaAsKTWATKL0JgJ8UGLOr3VXHSMalWdZraedd3eDTa vFNqETV1G9x114oH25rn9AtqvWSJCupeGiGvXw5p54/OBq3htl7VZp8EJouU4YHF KZ3VQ2tZV89aoHbMAZAkYQAAN2SdJ159Zg3etaOOy8rinT0c7LFBUZ0wD0iPH9RB 5Pc/mv0yYqFMI/ym6yqOqD5SX8tPZ4i9LQR45cwOEl6MCPgFDxuC44AkTDgugMlG ffP9BFkdMJtu8f/GBMmlFMzLL7bWpFMhnfVOI6d3ydtrdC0Z0MnL2YIZXJ4hTFWD 3UKXsxJTmxka8n00jbe8dLjKI3WVnao4u7qmcCK5PnxobamfvmtUOlyXJBmpjIrp E3ygL8jbfFSnc+L/Nn7Rws2QvNAQ24Yrvn9kroNAhOewJeWrZH0nsD+17Iqf/qbQ +qNGkzwClhZRls7FkJn5H8swD/SaSYrMBmj6i56d6QxTtWpCk+LvIhpItOc5vZ3d +PkzxShu9u42fzW5e64yr5OUJ0W3txFkGRQe+41iLqq5Wcz1H3NQKeFMuSEmOFI9 FrR8MTNgt/IMs02dVkk1 =6+4n -END PGP SIGNATURE- Stephane Glondu (4): Update Homepage Update Vcs-* Compile with OCaml = 4.01 Update changelog and prepare upload to experimental --- 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/ocaml-sqlite3.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] [ocsigenserver] 05/05: Update changelog and prepare upload to experimental
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocsigenserver. commit 5427753bb618a7ffa6401861fcbb760746935ce0 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:25:01 2013 +0100 Update changelog and prepare upload to experimental --- debian/changelog |9 + 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index d3674a2..f3c084e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ocsigenserver (2.2.0-2) experimental; urgency=low + + * debian/patches: ++ Fix compilation with ocamlnet 3.6.5 (addition of netstring-pcre) + * Compile with OCaml = 4.01 + * Drop ocsipersist-dbm (because of OCaml = 4) + + -- Stéphane Glondu glo...@debian.org Sun, 10 Nov 2013 13:47:22 +0100 + ocsigenserver (2.2.0-1) unstable; urgency=low * New upstream release -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.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] [ocsigenserver] 01/05: Fix compilation with ocamlnet 3.6.5
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository ocsigenserver.
commit 7980e7a5b0e969058ef69f82cfde56e0dccf6b73
Author: Stephane Glondu st...@glondu.net
Date: Thu Jun 6 11:47:22 2013 +0200
Fix compilation with ocamlnet 3.6.5
---
debian/control |2 +-
.../0001-Fix-compilation-with-ocamlnet-3.6.5.patch | 21
debian/patches/series |1 +
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 1053574..9ac7c68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
camlp4-extra,
ocaml-findlib (= 1.2.5),
liblwt-ssl-ocaml-dev (= 2.4.2),
- libocamlnet-ocaml-dev (= 2.2.9-7~),
+ libocamlnet-ocaml-dev (= 3.6.5),
libpcre-ocaml-dev (= 6.0.1-2~),
libssl-ocaml-dev (= 0.4.3-3~),
libgdbm-dev,
diff --git a/debian/patches/0001-Fix-compilation-with-ocamlnet-3.6.5.patch
b/debian/patches/0001-Fix-compilation-with-ocamlnet-3.6.5.patch
new file mode 100644
index 000..2d82748
--- /dev/null
+++ b/debian/patches/0001-Fix-compilation-with-ocamlnet-3.6.5.patch
@@ -0,0 +1,21 @@
+From: Stephane Glondu st...@glondu.net
+Date: Thu, 6 Jun 2013 11:46:46 +0200
+Subject: Fix compilation with ocamlnet 3.6.5
+
+---
+ src/extensions/Makefile |1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/extensions/Makefile b/src/extensions/Makefile
+index e7a0fad..6caeb92 100644
+--- a/src/extensions/Makefile
b/src/extensions/Makefile
+@@ -4,6 +4,7 @@ PACKAGE := lwt.unix \
+ lwt.ssl \
+ lwt.react\
+ netstring\
++netstring-pcre \
+ tyxml.parser \
+
+ LIBS := -I ../baselib -I ../http -I ../server ${addprefix -package
,${PACKAGE}}
+--
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..f55d091
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-compilation-with-ocamlnet-3.6.5.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.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] [ocsigenserver] 04/05: Drop ocsipersist-dbm
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocsigenserver. commit dd8e30fd99fe894adb1d392f3553c025de852da1 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:43:40 2013 +0100 Drop ocsipersist-dbm --- debian/control |1 - debian/libocsigenserver-ocaml.install.in |4 2 files changed, 5 deletions(-) diff --git a/debian/control b/debian/control index e996bb3..8cdb318 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,6 @@ Build-Depends: libocamlnet-ocaml-dev (= 3.6.5), libpcre-ocaml-dev (= 6.0.1-2~), libssl-ocaml-dev (= 0.4.3-3~), - libgdbm-dev, libsqlite3-ocaml-dev (= 1.5.6-3~), libzip-ocaml-dev (= 1.04-6~), libcryptokit-ocaml-dev (= 1.3-14~), diff --git a/debian/libocsigenserver-ocaml.install.in b/debian/libocsigenserver-ocaml.install.in index 99300c7..fed7e73 100644 --- a/debian/libocsigenserver-ocaml.install.in +++ b/debian/libocsigenserver-ocaml.install.in @@ -14,12 +14,9 @@ @OCamlStdlibDir@/ocsigenserver/extensions/cors.cmo @OCamlStdlibDir@/ocsigenserver/extensions/userconf.cmo @OCamlStdlibDir@/ocsigenserver/extensions/ocsipersist-sqlite.cma -@OCamlStdlibDir@/ocsigenserver/extensions/ocsipersist-dbm.cma @OCamlStdlibDir@/ocsigenserver/extensions/staticmod.cmo @OCamlStdlibDir@/ocsigenserver/extensions/accesscontrol.cmo @OCamlStdlibDir@/ocsigenserver/extensions/extendconfiguration.cmo -@OCamlStdlibDir@/ocsigenserver/extensions/ocsidbm -DYN: @OCamlStdlibDir@/ocsigenserver/extensions/ocsidbm.opt DYN: @OCamlStdlibDir@/ocsigenserver/parsecommandline.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/polytables.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/donotparsecommandline.cmxs @@ -35,7 +32,6 @@ DYN: @OCamlStdlibDir@/ocsigenserver/extensions/revproxy.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/cors.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/userconf.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/ocsipersist-sqlite.cmxs -DYN: @OCamlStdlibDir@/ocsigenserver/extensions/ocsipersist-dbm.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/staticmod.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/accesscontrol.cmxs DYN: @OCamlStdlibDir@/ocsigenserver/extensions/extendconfiguration.cmxs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.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] [ocsigenserver] 02/05: Run distclean only when Makefile.config is present
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocsigenserver. commit ece02545577b310d9068a071d30b53d1ffe44ea1 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:23:39 2013 +0100 Run distclean only when Makefile.config is present --- debian/rules |4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 30de511..81fb6dc 100755 --- a/debian/rules +++ b/debian/rules @@ -62,3 +62,7 @@ endif .PHONY: override_dh_install override_dh_install: dh_install --fail-missing -X.sample + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + [ ! -f Makefile.config ] || $(MAKE) distclean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.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] [ocsigenserver] 03/05: Compile with OCaml = 4.01
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository ocsigenserver. commit 08327e7d98f5c4d9a51502fd11d84b0ab27dbd52 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:26:43 2013 +0100 Compile with OCaml = 4.01 --- debian/control |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9ac7c68..e996bb3 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Nicolas Dandrimont nicolas.dandrim...@crans.org Build-Depends: debhelper (= 8), - ocaml-nox (= 3.11.1-3~), + ocaml-nox (= 4.01), camlp4-extra, ocaml-findlib (= 1.2.5), liblwt-ssl-ocaml-dev (= 2.4.2), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocsigenserver.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] [ocsigenserver] branch master updated (e754dcd - 5427753)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository ocsigenserver. from e754dcd Update changelog and prepare upload to unstable new 7980e7a Fix compilation with ocamlnet 3.6.5 new ece0254 Run distclean only when Makefile.config is present new 08327e7 Compile with OCaml = 4.01 new dd8e30f Drop ocsipersist-dbm new 5427753 Update changelog and prepare upload to experimental The 5 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 |9 + debian/control |5 ++--- debian/libocsigenserver-ocaml.install.in |4 .../0001-Fix-compilation-with-ocamlnet-3.6.5.patch | 21 debian/patches/series |1 + debian/rules |4 6 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 debian/patches/0001-Fix-compilation-with-ocamlnet-3.6.5.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/ocsigenserver.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] branch master updated (4f124a3 - d688650)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository eliom. from 4f124a3 Fix up too violent copy-pasting new 4330d42 Run distclean only when Makefile.config is present new 21053b0 Compile with OCaml = 4.01 new 9eee8f4 Update Vcs-* new d688650 Update changelog The 4 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 debian/control |6 +++--- debian/rules |4 3 files changed, 15 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] 04/04: Update changelog
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository eliom. commit d688650cba2d9827acff31e7ba777db5fcf659ff Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:57:03 2013 +0100 Update changelog --- debian/changelog |8 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index eabc181..52afabf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +eliom (3.0.3-2) UNRELEASED; urgency=low + + * Fix eliom-server doc-base files + * Compile with OCaml = 4.01 + * Update Vcs-* + + -- Stéphane Glondu glo...@debian.org Sun, 10 Nov 2013 13:59:59 +0100 + eliom (3.0.3-1) unstable; urgency=low * New upstream release -- 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/04: Run distclean only when Makefile.config is present
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository eliom. commit 4330d42e02f0702eae5f9368731d289d802f6081 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:56:09 2013 +0100 Run distclean only when Makefile.config is present --- debian/rules |4 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 1a1c5b0..2ac1163 100755 --- a/debian/rules +++ b/debian/rules @@ -52,3 +52,7 @@ override_dh_auto_install: .PHONY: override_dh_install override_dh_install: dh_install --fail-missing + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + [ ! -f Makefile.config ] || $(MAKE) distclean -- 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] 03/04: Update Vcs-*
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository eliom. commit 9eee8f48c3952d7f55e7a3cdf59c65beb28d5027 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:59:49 2013 +0100 Update Vcs-* --- debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index f3a11c6..c6957af 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ Build-Depends: libtyxml-ocaml-dev (= 2.2) Standards-Version: 3.9.4 Homepage: http://ocsigen.org/eliom -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/eliom.git -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/eliom.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/eliom.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/eliom.git Package: eliom Architecture: any -- 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] 02/04: Compile with OCaml = 4.01
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository eliom. commit 21053b042c2b0aa5323aca395c63b512bbabeb3b Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 13:56:29 2013 +0100 Compile with OCaml = 4.01 --- debian/control |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index dbb5874..f3a11c6 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Stéphane Glondu glo...@debian.org, Pierre Chambart pierre.chamb...@crans.org Build-Depends: - ocaml-nox (= 3.12.1-2~), + ocaml-nox (= 4.01), ocaml-findlib, dh-ocaml (= 0.9~), debhelper (= 8), -- 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] [cmigrep] branch master updated (392f48a - ee9cc0f)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to branch master in repository cmigrep. from 392f48a Remove myself from Uploaders new ee9cc0f 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, 6 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] 01/01: Prepare upload to unstable
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cmigrep. commit ee9cc0f270b2ac6a6f51c5368e9ee61a6ac4ae8e Author: Stephane Glondu st...@glondu.net Date: Wed Nov 2 22:25:57 2011 +0100 Prepare upload to unstable --- debian/changelog |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e24f3f6..019f36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -cmigrep (1.5-9) UNRELEASED; urgency=low +cmigrep (1.5-9) unstable; urgency=low + + [ Stéphane Glondu ] + * Team upload + * Recompile with OCaml 3.12.1 (no changes) [ Stefano Zacchiroli ] * Remove myself from Uploaders - -- Stefano Zacchiroli z...@debian.org Sat, 08 Oct 2011 17:13:45 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 02 Nov 2011 22:25:45 +0100 cmigrep (1.5-8) unstable; urgency=low -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] annotated tag debian/1.5-9 created (now 879dd8d)
This is an automated email from the git hooks/post-receive script. glondu pushed a change to annotated tag debian/1.5-9 in repository cmigrep. at 879dd8d (tag) tagging ee9cc0f270b2ac6a6f51c5368e9ee61a6ac4ae8e (commit) replaces debian/1.5-8 tagged by Stephane Glondu on Wed Nov 2 22:29:06 2011 +0100 - Log - Debian release 1.5-9 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOsbYiAAoJEHhT2k1JiBrTIdYP/3lS+UuaIzGYTKsgz+6RReut 5xuHN0aTXd1e/LjwB+adNOFtLNiCZu2t8+8yCwjly/b0c05rqiMq0cTfV9xU/Qvq 3wEK1ExDA9RuWwTy0c8c4Av/HueS2Iu8AhL9b+ab7N1iHuOSw4IvRwQMq/STAVZV 8UoUr9oCTOhW5x90yK/tjtWA1aTRTo9r2oUs1iOCuaTF3oMY9m8wGBmN4Pj9djVG S7Vac7lU+JjjbqA8zAVWc4YbWKQ81+FN6DL4mYob8eiYjKRAN/pLb2ueUbv3Nqv0 L9nas6nO5OwnBvVsk3cil5PuywV4UB3gyZ8QNlbmr1cPikuD+7FcI7nYn71aVFCl t7psf1ZCVZoyR8qHX8F90QdJsgj2wZClYS2AIPgzleMTNvZ5uTYfTuNwfKz914Mu szmPaA7viGgmA+jDw+mOtO+RRAEboHk2a+sB4YIcmg6mi7SicrvfNo4X0O0hWXj8 CzSbw7C3kcBJycZcQr5ZG/EDLx60mPPu08MpIYhJE+ZFEiNnXQwG3pxmuKneuXNS UXOxYsQDpPLLbnNCQX3GX9ZUBawJvEV6cx526sUL5Nx10D+/B5nlqdw1JkEKARCR xfc0kPz0/62yNiBbHQgMvJ3e6Z3xmrgzOGAyrh3lG1ozj7aB/Li4fgJewx2vHCwl PnBlAyFmmGto7IuNdex/ =R77Z -END PGP SIGNATURE- Stefano Zacchiroli (1): Remove myself from Uploaders Stephane Glondu (1): 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/cmigrep.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] [cmigrep] branch master updated (ee9cc0f - 1986421)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to branch master
in repository cmigrep.
from ee9cc0f Prepare upload to unstable
new b70d0a2 Switch patches to dom-{apply,save}-patches workflow
new a19cd04 Port to OCaml = 4
new c15d870 Compile with ocaml = 4.01
new d527bec Update Vcs-*
new 1986421 Update changelog and prepare upload to experimental
The 5 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 | 12 ++
debian/control |9 +-
...{no-private-flag = 0001-No-private-flag.patch} | 23 +++-
.../0002-Adapt-to-Types-types-of-OCaml-4.patch | 135
.../0003-Adapt-build-system-to-OCaml-4.patch | 53
debian/patches/make-without-godi | 28
debian/patches/series |5 +-
7 files changed, 224 insertions(+), 41 deletions(-)
rename debian/patches/{no-private-flag = 0001-No-private-flag.patch} (56%)
mode change 100755 = 100644
create mode 100644 debian/patches/0002-Adapt-to-Types-types-of-OCaml-4.patch
create mode 100644 debian/patches/0003-Adapt-build-system-to-OCaml-4.patch
delete mode 100755 debian/patches/make-without-godi
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] 03/05: Compile with ocaml = 4.01
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cmigrep. commit c15d8704ecfab70eeca64d427247f864eaae5587 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 16:35:16 2013 +0100 Compile with ocaml = 4.01 --- debian/control |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 5afac93..b8ab9c3 100644 --- a/debian/control +++ b/debian/control @@ -7,9 +7,10 @@ Uploaders: Ralf Treinen trei...@debian.org, Samuel Mimram smim...@debian.org, Mehdi Dogguy me...@debian.org Build-Depends: debhelper (= 7.0.50~) -Build-Depends-Indep: ocaml-nox (= 3.11.1-3~), +Build-Depends-Indep: + ocaml-nox (= 4.01), libpcre-ocaml-dev (= 6.0.1), - ocaml-findlib (= 1.2.4-2), + ocaml-findlib (= 1.4), libfindlib-ocaml-dev, ocaml-compiler-libs Standards-Version: 3.9.2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] 04/05: Update Vcs-*
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cmigrep. commit d527bec5fd163f99dc4657194b9335f545bf7d6d Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 16:39:19 2013 +0100 Update Vcs-* --- debian/control |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b8ab9c3..506a3d1 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends-Indep: libfindlib-ocaml-dev, ocaml-compiler-libs Standards-Version: 3.9.2 -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cmigrep.git +Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/cmigrep.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/cmigrep.git Homepage: http://homepage.mac.com/letaris/ Package: cmigrep -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] 05/05: Update changelog and prepare upload to experimental
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cmigrep. commit 19864210f295883a53390f4df61da4080b1371f1 Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 16:36:37 2013 +0100 Update changelog and prepare upload to experimental --- debian/changelog | 12 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 019f36a..a28f2b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +cmigrep (1.5-10) experimental; urgency=low + + * Team upload + * Compile with OCaml = 4.01 + * debian/patches: +- Compile without godi ++ Adapt to Types types of OCaml = 4 ++ Adapt build system to OCaml = 4 + * Update Vcs-* + + -- Stéphane Glondu glo...@debian.org Sun, 10 Nov 2013 16:39:37 +0100 + cmigrep (1.5-9) unstable; urgency=low [ Stéphane Glondu ] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] annotated tag debian/1.5-10 created (now 66a86ec)
This is an automated email from the git hooks/post-receive script.
glondu pushed a change to annotated tag debian/1.5-10
in repository cmigrep.
at 66a86ec (tag)
tagging 19864210f295883a53390f4df61da4080b1371f1 (commit)
replaces debian/1.5-9
tagged by Stephane Glondu
on Sun Nov 10 16:41:28 2013 +0100
- Log -
cmigrep Debian release 1.5-10
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.15 (GNU/Linux)
iQIcBAABCgAGBQJSf6koAAoJEHhT2k1JiBrTX/YP/imwxDo7T/3Qb+pWWTaOvj4f
/EjP37ocRw0WvzMvAiPDBCe1n3cEr5aaeo/DWabhP0wDlXm7Gi/q4tchQ9W/0nB5
xs7MMC22NCVT9gCiYjiKhhRUAs1ZJ0hhh70hpbk/vD2WsOUVk3bSX6IyEvaOnCXz
dNPedj4QiaPdmmIxdIyrXaY13FssGrES3jplXKuAP0IqzSradJs0fxRv48fk4jY8
IkOWGYU9z/YEefsZtN8MXLhAeTEex1hYwtoRImXPYhTi7XQcjcH+whjovgkz8ZR/
Ch02nDhhKh8fFSub/kxXv16iEWJf9cfYlqyqD/JMPc2VMhJ2E4eM0WQFFdHBRJZM
D9vgfqZ7aaVzmhj5JRBv7u+bNz/+n84MZDezcWaQFrdIxNeSFiJ9NCwLQvOeU0oq
bn/HdtQMRNHq4rM0gEjuYTBb5D0I+gCVU0vtJWlmmrKK3rkiVdxQKS6rnfATdnaQ
lGuWzsCL2AaiAPkChsuOZXBZlVEFL6kvLYPmsp+K7lfU6HPC5W9I3J+PTRoUAS+K
pb5sLrbbfPhf1Fjgo1z2OkRcNpnkYLSajg6dGIrnlWURBq+YPWQ5jYU1BKo3LSIC
fvx/nO+9k5NMEdH8Vu9lFsG8eIcbPxifo5ciebk/XR3SnCZ1lYoLcleC9ynofpyr
cEckGZAq1Az/9/RI3/Qh
=KZmH
-END PGP SIGNATURE-
Stephane Glondu (5):
Switch patches to dom-{apply,save}-patches workflow
Port to OCaml = 4
Compile with ocaml = 4.01
Update Vcs-*
Update changelog and prepare upload to experimental
---
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/cmigrep.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] [cmigrep] 01/05: Switch patches to dom-{apply, save}-patches workflow
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository cmigrep.
commit b70d0a24ec4411b217d143ec2cf1e24f5986e89c
Author: Stephane Glondu st...@glondu.net
Date: Sun Nov 10 16:25:11 2013 +0100
Switch patches to dom-{apply,save}-patches workflow
---
...ithout-godi = 0001-Compile-without-godi.patch} | 20 -
...{no-private-flag = 0002-No-private-flag.patch} | 23 ++--
debian/patches/series |4 ++--
3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/debian/patches/make-without-godi
b/debian/patches/0001-Compile-without-godi.patch
old mode 100755
new mode 100644
similarity index 63%
rename from debian/patches/make-without-godi
rename to debian/patches/0001-Compile-without-godi.patch
index 3c456e7..ba06769
--- a/debian/patches/make-without-godi
+++ b/debian/patches/0001-Compile-without-godi.patch
@@ -1,10 +1,17 @@
-Author: Ralf Treinen trei...@debian.org
-Description: Compile without godi. Provide directly the include directories for
- the compiler-libs.
+From: Ralf Treinen trei...@debian.org
+Date: Fri, 13 Nov 2009 20:11:48 +0100
+Subject: Compile without godi
trunk~/Makefile2007-04-01 16:43:39.0 +0200
-+++ trunk/Makefile 2007-07-07 10:18:23.0 +0200
-@@ -16,17 +16,15 @@
+Provide directly the include directories for the compiler-libs.
+---
+ Makefile | 10 --
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 546acc6..b3378fa 100644
+--- a/Makefile
b/Makefile
+@@ -16,17 +16,15 @@ typedtree.cmo ctype.cmo printtyp.cmo includeclass.cmo
mtype.cmo\
includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo \
typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml
@@ -26,3 +33,4 @@ Description: Compile without godi. Provide directly the
include directories for
-package pcre,findlib,unix -linkpkg $(BYTESOURCES)
install:
+--
diff --git a/debian/patches/no-private-flag
b/debian/patches/0002-No-private-flag.patch
old mode 100755
new mode 100644
similarity index 56%
rename from debian/patches/no-private-flag
rename to debian/patches/0002-No-private-flag.patch
index b112fba..d081499
--- a/debian/patches/no-private-flag
+++ b/debian/patches/0002-No-private-flag.patch
@@ -1,10 +1,18 @@
-Author: Ralf Treinen trei...@debian.org
-Description: The fields Type_variant and Type_record have lost the private
- field in the passage from ocaml 3.10 to 3.11.
+From: Ralf Treinen trei...@debian.org
+Date: Fri, 13 Nov 2009 20:11:48 +0100
+Subject: No private flag
trunk~/cmigrep.ml 2008-04-02 02:37:07.0 +0200
-+++ trunk/cmigrep.ml 2009-03-02 21:01:16.0 +0100
-@@ -304,7 +304,7 @@
+The fields Type_variant and Type_record have lost the private field
+in the passage from ocaml 3.10 to 3.11.
+---
+ cmigrep.ml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmigrep.ml b/cmigrep.ml
+index dcab49e..cdac8b3 100755
+--- a/cmigrep.ml
b/cmigrep.ml
+@@ -304,7 +304,7 @@ let print_constructor print_path path s exp =
(function
| Tsig_type (id, type_decl, _rec_status) -
begin match type_decl.type_kind with
@@ -13,7 +21,7 @@ Description: The fields Type_variant and Type_record have
lost the private
List.iter
(fun (name, type_exprs) -
if Pcre.pmatch ~rex:exp name then begin
-@@ -382,7 +382,7 @@
+@@ -382,7 +382,7 @@ let print_record_label print_path path s exp =
(function
| Tsig_type (id, type_decl, _rec_status) -
begin match type_decl.type_kind with
@@ -22,3 +30,4 @@ Description: The fields Type_variant and Type_record have
lost the private
List.iter
(fun (name, mutable_flag, type_expr) -
if Pcre.pmatch ~rex:exp name then begin
+--
diff --git a/debian/patches/series b/debian/patches/series
index ccc6908..dcce0c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-make-without-godi
-no-private-flag
+0001-Compile-without-godi.patch
+0002-No-private-flag.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.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] [cmigrep] 02/05: Port to OCaml = 4
This is an automated email from the git hooks/post-receive script. glondu pushed a commit to branch master in repository cmigrep. commit a19cd04b8cb90c157ed8499ed32645de47fec0da Author: Stephane Glondu st...@glondu.net Date: Sun Nov 10 16:33:56 2013 +0100 Port to OCaml = 4 --- debian/patches/0001-Compile-without-godi.patch | 36 -- ...ivate-flag.patch = 0001-No-private-flag.patch} |0 .../0002-Adapt-to-Types-types-of-OCaml-4.patch | 135 .../0003-Adapt-build-system-to-OCaml-4.patch | 53 debian/patches/series |5 +- 5 files changed, 191 insertions(+), 38 deletions(-) diff --git a/debian/patches/0001-Compile-without-godi.patch b/debian/patches/0001-Compile-without-godi.patch deleted file mode 100644 index ba06769..000 --- a/debian/patches/0001-Compile-without-godi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Ralf Treinen trei...@debian.org -Date: Fri, 13 Nov 2009 20:11:48 +0100 -Subject: Compile without godi - -Provide directly the include directories for the compiler-libs. - Makefile | 10 -- - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 546acc6..b3378fa 100644 a/Makefile -+++ b/Makefile -@@ -16,17 +16,15 @@ typedtree.cmo ctype.cmo printtyp.cmo includeclass.cmo mtype.cmo\ - includecore.cmo includemod.cmo parmatch.cmo typetexp.cmo stypes.cmo \ - typecore.cmo typedecl.cmo typeclass.cmo typemod.cmo cmigrep.ml - -- --GODI_CONF=$(shell godi_confdir) --GODI_BASE=$(shell cat $(GODI_CONF)/godi.conf | grep ^LOCALBASE | sed -e 's/LOCALBASE *= *//') --GODI_LIB=$(GODI_BASE)/lib/ocaml/compiler-lib -+COMPILERLIBFLAGS=-I +compiler-libs/parsing -I +compiler-libs/typing \ -+-I +compiler-libs/utils - - all: -- ocamlfind ocamlopt -o cmigrep -I $(GODI_LIB) \ -+ ocamlfind ocamlopt -o cmigrep $(COMPILERLIBFLAGS) \ - -package pcre,findlib,unix -linkpkg $(SOURCES) - - byte: -- ocamlfind ocamlc -o cmigrep -I $(GODI_LIB) \ -+ ocamlfind ocamlc -o cmigrep $(COMPILERLIBFLAGS) \ - -package pcre,findlib,unix -linkpkg $(BYTESOURCES) - - install: --- diff --git a/debian/patches/0002-No-private-flag.patch b/debian/patches/0001-No-private-flag.patch similarity index 100% rename from debian/patches/0002-No-private-flag.patch rename to debian/patches/0001-No-private-flag.patch diff --git a/debian/patches/0002-Adapt-to-Types-types-of-OCaml-4.patch b/debian/patches/0002-Adapt-to-Types-types-of-OCaml-4.patch new file mode 100644 index 000..6756a2c --- /dev/null +++ b/debian/patches/0002-Adapt-to-Types-types-of-OCaml-4.patch @@ -0,0 +1,135 @@ +From: Stephane Glondu st...@glondu.net +Date: Sun, 10 Nov 2013 16:29:20 +0100 +Subject: Adapt to Types types of OCaml = 4 + +--- + cmigrep.ml | 44 +++- + 1 file changed, 23 insertions(+), 21 deletions(-) + +diff --git a/cmigrep.ml b/cmigrep.ml +index cdac8b3..dd162fa 100755 +--- a/cmigrep.ml b/cmigrep.ml +@@ -285,7 +285,7 @@ let whsp = Pcre.regexp ~study:true \\s+|$ + let print_type print_path path s exp = + List.iter + (function +- | Tsig_type (id, type_decl, rec_status) - ++ | Sig_type (id, type_decl, rec_status) - +if match_ident exp id then begin + Printtyp.type_declaration id Format.std_formatter type_decl; + if print_path then +@@ -302,11 +302,12 @@ let print_constructor print_path path s exp = + in + List.iter + (function +- | Tsig_type (id, type_decl, _rec_status) - ++ | Sig_type (id, type_decl, _rec_status) - +begin match type_decl.type_kind with +| Type_variant (constructors) - +List.iter +- (fun (name, type_exprs) - ++ (fun (name, type_exprs, _) - ++ let name = Ident.name name in + if Pcre.pmatch ~rex:exp name then begin + Format.print_string name; + if type_exprs [] then begin +@@ -369,7 +370,7 @@ let print_polymorphic_variant print_path path s expr = + in + List.iter + (function +- | Tsig_type (id, type_decl, _rec_status) - ++ | Sig_type (id, type_decl, _rec_status) - +begin match type_decl.type_kind with +| Type_abstract - print_if_polymorphic_variant id type_decl +| _ - () +@@ -380,11 +381,12 @@ let print_polymorphic_variant print_path path s expr = + let print_record_label print_path path s exp = + List.iter + (function +- | Tsig_type (id, type_decl, _rec_status) - ++ | Sig_type (id, type_decl, _rec_status) - +begin match type_decl.type_kind with +| Type_record (labels, _) - +List.iter + (fun (name, mutable_flag, type_expr) - ++let name = Ident.name name in + if Pcre.pmatch ~rex:exp name then begin +
