[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.5.1-1-15-g9138f62
The following commit has been merged in the master branch:
commit 9138f62ea3da64bab48a9ef0e796744803a59df3
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 11:32:47 2013 +0200
Enable netmech-scram and netzip
diff --git a/debian/README.Debian b/debian/README.Debian
index c333e51..eb5ea25 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -33,35 +33,37 @@ An overview of all the libraries available in Ocamlnet is
given in
/usr/share/doc/libocamlnet-ocaml-dev/INSTALL.gz, the following table
describes in which Debian package a given Ocamlnet library can be found:
- Library Debian package name
- --
- equeuelibocamlnet-ocaml{,-dev}
- equeue-gtk1 n/a
- equeue-gtk2 libocamlnet-gtk-ocaml-dev
- equeue-ssllibocamlnet-ssl-ocaml{,-dev}
- equeue-tcln/a
- netcgi2 libocamlnet-ocaml{,-dev}
- netcgi2-plex libocamlnet-ocaml{,-dev}
- netclient libocamlnet-ocaml{,-dev}
- nethttpd libnethttpd-ocaml-dev
- nethttpd-for-netcgi2 libnethttpd-ocaml-dev
- netplex libocamlnet-ocaml{,-dev}
- netshmlibocamlnet-ocaml{,-dev}
- netstring libocamlnet-ocaml{,-dev}
- netstring-pcrelibocamlnet-ocaml{,-dev}
- netsyslibocamlnet-ocaml{,-dev}
- pop libocamlnet-ocaml{,-dev}
- rpc libocamlnet-ocaml{,-dev}
- rpc-auth-dh libocamlnet-ocaml{,-dev}
- rpc-auth-locallibocamlnet-ocaml{,-dev}
- rpc-generator libocamlnet-ocaml{,-dev}
- rpc-ssl libocamlnet-ssl-ocaml{,-dev}
- rpc-xti n/a
- shell libocamlnet-ocaml{,-dev}
- smtp libocamlnet-ocaml{,-dev}
- --
+Library Debian package name
+--
+equeuelibocamlnet-ocaml{,-dev}
+equeue-gtk1 n/a
+equeue-gtk2 libocamlnet-gtk-ocaml-dev
+equeue-ssllibocamlnet-ssl-ocaml{,-dev}
+equeue-tcln/a
+netcgi2 libocamlnet-ocaml{,-dev}
+netcgi2-plex libocamlnet-ocaml{,-dev}
+netclient libocamlnet-ocaml{,-dev}
+nethttpd libnethttpd-ocaml-dev
+nethttpd-for-netcgi2 libnethttpd-ocaml-dev
+netmech-scram libocamlnet-ocaml{,-dev}
+netplex libocamlnet-ocaml{,-dev}
+netshmlibocamlnet-ocaml{,-dev}
+netstring libocamlnet-ocaml{,-dev}
+netstring-pcrelibocamlnet-ocaml{,-dev}
+netsyslibocamlnet-ocaml{,-dev}
+netziplibocamlnet-ocaml{,-dev}
+pop libocamlnet-ocaml{,-dev}
+rpc libocamlnet-ocaml{,-dev}
+rpc-auth-dh libocamlnet-ocaml{,-dev}
+rpc-auth-locallibocamlnet-ocaml{,-dev}
+rpc-generator libocamlnet-ocaml{,-dev}
+rpc-ssl libocamlnet-ssl-ocaml{,-dev}
+rpc-xti n/a
+shell libocamlnet-ocaml{,-dev}
+smtp libocamlnet-ocaml{,-dev}
+--
- -- Stéphane Glondu glo...@debian.org Tue, 07 May 2013 13:57:52 +0200
+ -- Stéphane Glondu glo...@debian.org, Wed, 8 May 2013 12:04:38 +0200
Debian GNU/kFreeBSD and GNU/Hurd ports
==
diff --git a/debian/control b/debian/control
index 2439a19..2933b7b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Build-Depends:
liblablgtk2-ocaml-dev (= 2.12.0-4~),
libcryptgps-ocaml-dev (= 0.2.1-7~),
libssl-ocaml-dev (= 0.4.3-3~),
+ libzip-ocaml-dev,
+ libcryptokit-ocaml-dev,
apache2-prefork-dev
Standards-Version: 3.9.4
Homepage: http://projects.camlcity.org/projects/ocamlnet.html
diff --git a/debian/libocamlnet-ocaml-dev.install.in
b/debian/libocamlnet-ocaml-dev.install.in
index 946dc92..0bb3432 100644
--- a/debian/libocamlnet-ocaml-dev.install.in
+++ b/debian/libocamlnet-ocaml-dev.install.in
@@ -1,21 +1,23 @@
-@OCamlStdlibDir@/equeue@OCamlStdlibDir@
-@OCamlStdlibDir@/netcamlbox@OCamlStdlibDir@
-@OCamlStdlibDir@/netcgi2 @OCamlStdlibDir@
-@OCamlStdlibDir@/netcgi_apache @OCamlStdlibDir@
-@OCamlStdlibDir@/netcgi2-plex @OCamlStdlibDir@
-@OCamlStdlibDir@/netclient @OCamlStdlibDir@
-@OCamlStdlibDir@/netgssapi @OCamlStdlibDir@
-@OCamlStdlibDir@/netmulticore @OCamlStdlibDir@
-@OCamlStdlibDir@/netplex @OCamlStdlibDir@
[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/6.06-1-8-g8dd056e
The following commit has been merged in the master branch: commit a5d9db857d73eeda2b28fe1b6f9585882a4764d7 Merge: f9f8c4d781713dd971562c0014d621381ca4ddd8 1379e3ba07d560fd4567843dd234fd5352bf6d14 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 12:58:32 2013 +0200 Merge tag 'upstream/6.08' Upstream version 6.08 -- camlp5 packaging ___ 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] [SCM] camlp5 packaging branch, master, updated. debian/6.06-1-8-g8dd056e
The following commit has been merged in the master branch: commit ce1bf7596fe53fd6c4b7144e7758832e47037663 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 12:59:26 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index ac15519..e7174fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -camlp5 (6.06-2) UNRELEASED; urgency=low +camlp5 (6.08-1) UNRELEASED; urgency=low + [ Stéphane Glondu ] + * New upstream release + + [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Sylvain Le Gall gil...@debian.org Fri, 21 Sep 2012 01:11:52 + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 12:58:48 +0200 camlp5 (6.06-1) unstable; urgency=low -- camlp5 packaging ___ 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] [SCM] camlp5 packaging branch, master, updated. debian/6.06-1-8-g8dd056e
The following commit has been merged in the master branch:
commit 1316893a70af7786112e793be8937ae95f0a0c09
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 13:05:38 2013 +0200
Import upstream's patch-6.08-1
diff --git a/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch
b/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch
new file mode 100644
index 000..3b096e9
--- /dev/null
+++ b/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch
@@ -0,0 +1,210 @@
+From: Stephane Glondu st...@glondu.net
+Date: Wed, 8 May 2013 13:03:59 +0200
+Subject: Upstream's official patch-6.08-1
+
+Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.08-1
+---
+ LICENSE |2 +-
+ main/pcaml.ml|4 ++--
+ ocaml_stuff/4.01.0/parsing/asttypes.mli |2 --
+ ocaml_stuff/4.01.0/parsing/location.mli |3 ---
+ ocaml_stuff/4.01.0/parsing/longident.mli |2 --
+ ocaml_stuff/4.01.0/parsing/parsetree.mli | 33 +++---
+ ocaml_stuff/4.01.0/utils/warnings.mli| 10 +
+ 7 files changed, 25 insertions(+), 31 deletions(-)
+
+diff --git a/LICENSE b/LICENSE
+index 06fb1d3..d85e9d0 100644
+--- a/LICENSE
b/LICENSE
+@@ -1,4 +1,4 @@
+-* Copyright (c) 2007-2012, INRIA (Institut National de Recherches en
++* Copyright (c) 2007-2013, INRIA (Institut National de Recherches en
+ * Informatique et Automatique). All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+diff --git a/main/pcaml.ml b/main/pcaml.ml
+index c586ef6..487444b 100644
+--- a/main/pcaml.ml
b/main/pcaml.ml
+@@ -1,5 +1,5 @@
+ (* camlp5r *)
+-(* $Id: pcaml.ml,v 6.36 2013-03-06 09:34:30 deraugla Exp $ *)
++(* $Id: pcaml.ml,v 6.37 2013-03-06 16:35:10 deraugla Exp $ *)
+ (* Copyright (c) INRIA 2007-2012 *)
+
+ #load pa_macro.cmo;
+@@ -7,7 +7,7 @@
+
+ open Printf;
+
+-value version = 6.08;
++value version = 6.09-exp;
+ value syntax_name = ref ;
+
+ value gram =
+diff --git a/ocaml_stuff/4.01.0/parsing/asttypes.mli
b/ocaml_stuff/4.01.0/parsing/asttypes.mli
+index 83b372e..fb6d5ba 100644
+--- a/ocaml_stuff/4.01.0/parsing/asttypes.mli
b/ocaml_stuff/4.01.0/parsing/asttypes.mli
+@@ -10,8 +10,6 @@
+ (* *)
+ (***)
+
+-(* Id *)
+-
+ (* Auxiliary a.s.t. types used by parsetree and typedtree. *)
+
+ type constant =
+diff --git a/ocaml_stuff/4.01.0/parsing/location.mli
b/ocaml_stuff/4.01.0/parsing/location.mli
+index 21d17ff..bae9090 100644
+--- a/ocaml_stuff/4.01.0/parsing/location.mli
b/ocaml_stuff/4.01.0/parsing/location.mli
+@@ -10,8 +10,6 @@
+ (* *)
+ (***)
+
+-(* Id *)
+-
+ (* Source code locations (ranges of positions), used in parsetree. *)
+
+ open Format
+@@ -77,4 +75,3 @@ val show_filename: string - string
+
+
+ val absname: bool ref
+-
+diff --git a/ocaml_stuff/4.01.0/parsing/longident.mli
b/ocaml_stuff/4.01.0/parsing/longident.mli
+index 9f971e8..9e79585 100644
+--- a/ocaml_stuff/4.01.0/parsing/longident.mli
b/ocaml_stuff/4.01.0/parsing/longident.mli
+@@ -10,8 +10,6 @@
+ (* *)
+ (***)
+
+-(* Id *)
+-
+ (* Long identifiers, used in parsetree. *)
+
+ type t =
+diff --git a/ocaml_stuff/4.01.0/parsing/parsetree.mli
b/ocaml_stuff/4.01.0/parsing/parsetree.mli
+index d4720a9..b802fc8 100644
+--- a/ocaml_stuff/4.01.0/parsing/parsetree.mli
b/ocaml_stuff/4.01.0/parsing/parsetree.mli
+@@ -10,8 +10,6 @@
+ (* *)
+ (***)
+
+-(* Id *)
+-
+ (* Abstract syntax tree produced by parsing *)
+
+ open Asttypes
+@@ -104,7 +102,8 @@ and expression_desc =
+ | Pexp_ifthenelse of expression * expression * expression option
+ | Pexp_sequence of expression * expression
+ | Pexp_while of expression * expression
+- | Pexp_for of string loc * expression * expression * direction_flag *
expression
++ | Pexp_for of
++ string loc * expression * expression * direction_flag * expression
+ | Pexp_constraint of expression * core_type option * core_type option
+ | Pexp_when of expression * expression
+ | Pexp_send of expression * string
+@@ -126,7 +125,7 @@ and expression_desc =
+ and value_description =
+ { pval_type: core_type;
+ pval_prim: string list;
+-pval_loc : Location.t
++pval_loc: Location.t
+ }
+
+ (* Type declarations *)
+@@ -161,14 +160,14 @@ and class_type_desc =
+ | Pcty_fun of label * core_type * class_type
+
[Pkg-ocaml-maint-commits] [SCM] camlp5 packaging branch, master, updated. debian/6.06-1-8-g8dd056e
The following commit has been merged in the master branch: commit 8dd056edacfe324d9d2dbb676b58217b3b91cc10 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 13:14:58 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index e7174fc..3affee8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,13 @@ -camlp5 (6.08-1) UNRELEASED; urgency=low +camlp5 (6.08-1) unstable; urgency=low [ Stéphane Glondu ] * New upstream release +- apply upstream's patch-6.08-1 [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 12:58:48 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 13:14:48 +0200 camlp5 (6.06-1) unstable; urgency=low -- camlp5 packaging ___ 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] [SCM] camlp5 packaging branch, pristine-tar, updated. 61e45fb95383da0ecbef2492bb97ff25c14f3f42
The following commit has been merged in the pristine-tar branch: commit 67678e483e6550d54cd39552166fe2e7b563e4a7 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 12:58:15 2013 +0200 pristine-tar data for camlp5_6.07.orig.tar.gz diff --git a/camlp5_6.07.orig.tar.gz.delta b/camlp5_6.07.orig.tar.gz.delta new file mode 100644 index 000..50c6960 Binary files /dev/null and b/camlp5_6.07.orig.tar.gz.delta differ diff --git a/camlp5_6.07.orig.tar.gz.id b/camlp5_6.07.orig.tar.gz.id new file mode 100644 index 000..1dcaced --- /dev/null +++ b/camlp5_6.07.orig.tar.gz.id @@ -0,0 +1 @@ +5221cb47630d33887b71ea8f87c1d66d17a9d927 -- camlp5 packaging ___ 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] [SCM] camlp5 packaging annotated tag, debian/6.08-1, created. debian/6.08-1
The annotated tag, debian/6.08-1 has been created at a05c4e6b7ffcdf8dbdd1236c0afea6e196fd2326 (tag) tagging 8dd056edacfe324d9d2dbb676b58217b3b91cc10 (commit) replaces debian/6.06-1 tagged by Stephane Glondu on Wed May 8 13:21:39 2013 +0200 - Shortlog camlp5 Debian release 6.08-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRijVDAAoJEHhT2k1JiBrTLvUQALQTmRZLoBdpZp+7/ot7yWzs pKKTqYY18GKg+4FfXyQZNMk6XFHhEOFeHDzqpqZSPKHHGsdxKGFAxdDjFs6TpIcN k5b6oi7YkD/pmhAUUWAlxfB+dNTXb1Zj+nk1XT4yHd2IxBl+w49xX7uI6zkqJjSa xQe3HKGMAXhd8VqI37uWIodU302UjLYPi/p2+tqq7M5+fhm8EGVkXuKiIxFzcbzS S0tU93Bqm/rrf0W/7U8vCCqQ0WvcccMSIOUkWtlASC96TYVs05bWLLOob4JGz7B4 v5wNZFje7aEr0VMobf6d4dBBnPgqhcA9yhk3Woa4Q+CdttLms56HlfUJDxDKwcUV BQ/XCEx/S5lpp5NMyd525O7Ihm6giMGJFDnz8Hc3oqSIqkWKTYvcgPhfTnNvfPkC T8bm69vV705g9Pr7L2vzBf4AmTtb4Aj2kifbVo7wttxofMQUbZHxBmscusLFFuTc pNxyVFJgvmCkp+cwuUES8n5P9isuWgp+c2u/DAMUIZaTbk120fmo8nJ3dCFIZWDT qRswlV/maPBIamATukKMTgo5tq4wamZtEpVUCOjtWjDmGq2LANTAqc59VJS/Kg0p kyfZ+Vbb1zY3CSIa4ZBwQ/Lgi/yf6gR5HgVeVn0qTmjdSoYEvj9r+DYom8hcDuQS GPVh0WQ6wCV/ZGIE0ZYx =hfEt -END PGP SIGNATURE- Stephane Glondu (6): Imported Upstream version 6.07 Imported Upstream version 6.08 Merge tag 'upstream/6.08' New upstream release Import upstream's patch-6.08-1 Update changelog and prepare upload to unstable Sylvain Le Gall (1): Remove Sylvain Le Gall from uploaders --- -- camlp5 packaging ___ 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] [SCM] camlp5 packaging annotated tag, upstream/6.07, created. upstream/6.07
The annotated tag, upstream/6.07 has been created at d703e0ef54f41df69960cb6e1246f70beea0964d (tag) tagging 284a9d8786513a638dd809531218891fca3659a6 (commit) replaces upstream/6.06 tagged by Stephane Glondu on Wed May 8 12:58:16 2013 +0200 - Shortlog Upstream version 6.07 Stephane Glondu (1): Imported Upstream version 6.07 --- -- camlp5 packaging ___ 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] [SCM] camlp5 packaging annotated tag, upstream/6.08, created. upstream/6.08
The annotated tag, upstream/6.08 has been created at a18b0f579adb38cce45a5fd9215ba79db47d462a (tag) tagging 1379e3ba07d560fd4567843dd234fd5352bf6d14 (commit) replaces upstream/6.07 tagged by Stephane Glondu on Wed May 8 12:58:31 2013 +0200 - Shortlog Upstream version 6.08 Stephane Glondu (1): Imported Upstream version 6.08 --- -- camlp5 packaging ___ 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] [SCM] calendar packaging branch, master, updated. debian/2.03-1-9-g2ccc8e6
The following commit has been merged in the master branch: commit 22f82edba9f22e178224f6f5fd1d9a48a0b879c5 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:00:47 2013 +0200 New debian/watch file by Bart Martens diff --git a/debian/watch b/debian/watch index 6d03a0a..34e5d0c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -http://forge.ocamlcore.org/frs/?group_id=83 \ - /frs/download.php/.*/calendar-(.*).tar.gz +http://calendar.forge.ocamlcore.org/ .*/calendar-(\d.*)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz)) +# Bart Martens ba...@debian.org Fri, 23 Nov 2012 19:36:37 + -- calendar packaging ___ 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] [SCM] calendar packaging branch, master, updated. debian/2.03-1-9-g2ccc8e6
The following commit has been merged in the master branch: commit 9761d7e052787bccaae7dc07db53be54e9908865 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:15:17 2013 +0200 Use format version 1.0 in debian/copyright diff --git a/debian/copyright b/debian/copyright index ee38309..51bebda 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,36 +1,35 @@ -This package was debianized by Stefano Zacchiroli z...@debian.org on -Wed, 10 Dec 2003 21:19:46 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Packaged-By: Stefano Zacchiroli z...@debian.org +Packaged-Date: Wed, 10 Dec 2003 21:19:46 +0100 +Source: http://www.lri.fr/~signoles/prog.en.html +Upstream-Contact: Julien Signoles julien.signo...@lri.fr -It was downloaded from http://www.lri.fr/~signoles/prog.en.html - -Upstream Author: Julien Signoles julien.signo...@lri.fr - -Copyright: © 2003-2010 Julien Signoles - -License: - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License version 2, as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of +Files: * +Copyright: 2003-2012, Julien Signoles +License: LGPL-2-exception + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Library General Public License version + 2, as published by the Free Software Foundation. + . + This library is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - + . See the GNU Library General Public License version 2 for more details - - As a special exception to the GNU Library General Public License, you may - link, statically or dynamically, a work that uses the Library with a - publicly distributed version of the Library to produce an executable file - containing portions of the Library, and distribute that executable file under - terms of your choice, without any of the additional requirements listed in - clause 6 of the GNU Library General Public License. By a publicly - distributed version of the Library, we mean either the unmodified Library as - distributed by the original author, or a modified version of the Library that - is distributed under the conditions defined in clause 3 of the GNU Library - General Public License. This exception does not however invalidate any other - reasons why the executable file might be covered by the GNU Library General - Public License. - - On a Debian GNU/Linux system, the LGPL can be found as - /usr/share/common-licenses/LGPL-2.1. + . + As a special exception to the GNU Library General Public License, you + may link, statically or dynamically, a work that uses the Library + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Library General + Public License. By a publicly distributed version of the Library, + we mean either the unmodified Library as distributed by the original + author, or a modified version of the Library that is distributed + under the conditions defined in clause 3 of the GNU Library General + Public License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU Library + General Public License. + . + On a Debian GNU/Linux system, the full text of the LGPL can be found + in `/usr/share/common-licenses/LGPL-2'. -- calendar packaging ___ 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] [SCM] calendar packaging branch, master, updated. debian/2.03-1-9-g2ccc8e6
The following commit has been merged in the master branch: commit 2ccc8e6f1cf528c491b564e97c156aaf8cc9646d Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:07:01 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index bccd83c..c195c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ -calendar (2.03.2-1) UNRELEASED; urgency=low +calendar (2.03.2-1) unstable; urgency=low - [ Mehdi Dogguy ] - * Fix watch file - - [ Stéphane Glondu ] * New upstream release + * New debian/watch file by Bart Martens + * Use format version 1.0 in debian/copyright + * Bump Standards-Version to 3.9.4 - -- Stéphane Glondu glo...@debian.org Wed, 10 Apr 2013 11:22:34 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 14:15:54 +0200 calendar (2.03-1) unstable; urgency=low -- calendar packaging ___ 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] [SCM] calendar packaging branch, master, updated. debian/2.03-1-9-g2ccc8e6
The following commit has been merged in the master branch: commit 3e3ca8d66b47cd240f6630114f48b39351e11f1d Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:15:28 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index 011576a..523aa7e 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: ocaml-findlib (= 1.2.4), dh-ocaml (= 0.9.5~), cdbs -Standards-Version: 3.9.0 +Standards-Version: 3.9.4 Homepage: http://calendar.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/calendar.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/calendar.git -- calendar packaging ___ 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] [SCM] calendar packaging annotated tag, debian/2.03.2-1, created. debian/2.03.2-1
The annotated tag, debian/2.03.2-1 has been created at 68b4ae17a2475917aecfc159ff7a102abbe3962a (tag) tagging 2ccc8e6f1cf528c491b564e97c156aaf8cc9646d (commit) replaces debian/2.03-1 tagged by Stephane Glondu on Wed May 8 14:21:30 2013 +0200 - Shortlog calendar Debian release 2.03.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRikNKAAoJEHhT2k1JiBrTRqoP/2FvVuWLR8hQzBIf0pcJbTnr pGQzM8zhz93p7Wacy9uAnyVQm9kKSulkzOUKPz+CzsInIrkmOvle0YOkFPXFH6Ia 6+oYYi3bJ/kWznSxr5ZC9jjAgXfAIp15tVmZVjeQM6EJ31eMDayvICDz4JikLF0M x4KCmzO8e0hROHLxTNiK/AiDv/PQ6AkdLysLTxk1qR/nO9hE8u3dCLZLhgJw8Dkw SqtCfsEHXk6Lg0E2lE68O80C+kyQHxZm85GnTMjO9ArAlEulJ9w5Cu4fbwTgT312 gMMSdhd6H3Mz7NYyKjC/mWBKh5sX8V6awHgsrXB1c9pvbH3R1qIa9PXjj+5w0jzQ 69albn0Bb0vwCJijREpysc1qyLaC6dMdIYtpvSApqf+PgZjWkbspd7Ih1iyItz1S +CB2pD1zR/IFAyVemZ80aeGjSTNyguVGL4YtBgGAuXEexAjXB1uyrxY01dMmw7ql CbYnrVIVGUUD7/vE36MIVOmffSw8SOgrwTJr3FAn7Vio0Vlfqxhn95NvlsCBMhaO AHKs+kFcDICnclTK+HEFnslwC157oUdW+SjU5YKAI9jwloEMZx/+qfR3zNCoZlNh DvUHwGWcbGm9d/9dcVOPQKo9meO8TR+qaxNcmyzqA+7twhWFShdIT7M0PYWjUiWh /HeXdSRupNo+O2zJARDy =S3Q8 -END PGP SIGNATURE- Mehdi Dogguy (1): Fix watch file Stephane Glondu (8): Imported Upstream version 2.03.1 Imported Upstream version 2.03.2 Merge tag 'upstream/2.03.2' New upstream release New debian/watch file by Bart Martens Use format version 1.0 in debian/copyright Bump Standards-Version to 3.9.4 Update changelog and prepare upload to unstable --- -- calendar packaging ___ 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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit cf781528b482089cf7b44c45dc42eab219496a4e Merge: 121df48f2ef728360b73089ad7d6a1ae47f87d78 c8502c67bbae652f93999282cf0de5a5e34ab3fe Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:32:05 2013 +0200 Merge tag 'upstream/1.7' Upstream version 1.7 -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch:
commit 095fa6ebd02d5df98d8f5ef15865b6c9c7352b62
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 14:41:43 2013 +0200
Upstream support of *.{cmx,cmxs}
diff --git a/debian/libcryptokit-ocaml-dev.install.in
b/debian/libcryptokit-ocaml-dev.install.in
index 8661b44..d1a9c25 100644
--- a/debian/libcryptokit-ocaml-dev.install.in
+++ b/debian/libcryptokit-ocaml-dev.install.in
@@ -3,4 +3,4 @@ usr/share/doc
@OCamlStdlibDir@/cryptokit/*.cmi
@OCamlStdlibDir@/cryptokit/*.mli
OPT: @OCamlStdlibDir@/cryptokit/*.cmxa
-OPT: _build/src/*.cmx @OCamlStdlibDir@/cryptokit
+OPT: @OCamlStdlibDir@/cryptokit/*.cmx
diff --git a/debian/libcryptokit-ocaml.install.in
b/debian/libcryptokit-ocaml.install.in
index 900e58f..f1033c5 100644
--- a/debian/libcryptokit-ocaml.install.in
+++ b/debian/libcryptokit-ocaml.install.in
@@ -1,4 +1,4 @@
@OCamlDllDir@/*.so
@OCamlStdlibDir@/cryptokit/META
@OCamlStdlibDir@/cryptokit/cryptokit.cma
-DYN: _build/src/cryptokit.cmxs@OCamlStdlibDir@/cryptokit
+DYN: @OCamlStdlibDir@/cryptokit/*.cmxs
--
cryptokit packaging
___
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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit 22121189befbd2f4aae291f7d84bfe8e8ac9ba76 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:38:00 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index 033e4e4..f9a3f16 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (= 8), zlib1g-dev, dh-ocaml (= 0.9) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://forge.ocamlcore.org/projects/cryptokit/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cryptokit.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cryptokit.git -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit 95396a20a42017ae766a6c4e322ef97536edf374 Merge: 22121189befbd2f4aae291f7d84bfe8e8ac9ba76 67d04a3282edb176a6e4212668ae3c71df906efc Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:46:28 2013 +0200 Merge remote-tracking branch 'origin/master' Conflicts: debian/changelog diff --combined debian/changelog index ecc5427,ce5c412..92e5905 --- a/debian/changelog +++ b/debian/changelog @@@ -1,8 -1,8 +1,12 @@@ -cryptokit (1.5-2) UNRELEASED; urgency=low +cryptokit (1.7-1) UNRELEASED; urgency=low ++ [ Stéphane Glondu ] + * New upstream release + ++ [ Sylvain Le Gall ] + * Remove Sylvain Le Gall from uploaders + - -- Sylvain Le Gall gil...@debian.org Fri, 21 Sep 2012 01:13:31 + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 14:32:08 +0200 cryptokit (1.5-1) unstable; urgency=low diff --combined debian/control index f9a3f16,4832c4a..449dc07 --- a/debian/control +++ b/debian/control @@@ -5,7 -5,6 +5,6 @@@ Maintainer: Debian OCaml Maintainers d Uploaders: Ralf Treinen trei...@debian.org, Samuel Mimram smim...@debian.org, - Sylvain Le Gall gil...@debian.org, Stéphane Glondu glo...@debian.org, Mehdi Dogguy me...@debian.org Build-Depends: @@@ -14,7 -13,7 +13,7 @@@ debhelper (= 8), zlib1g-dev, dh-ocaml (= 0.9) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://forge.ocamlcore.org/projects/cryptokit/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cryptokit.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cryptokit.git -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit 9eaa91b2b88a3bcdbde0d144211095294b0ad3ea Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:32:14 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 3d393b0..ecc5427 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cryptokit (1.7-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 14:32:08 +0200 + cryptokit (1.5-1) unstable; urgency=low [ Stéphane Glondu ] -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit 4b708c43467386338711b78c9c8f1c4f8c920899 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:37:44 2013 +0200 Use format version 1.0 in debian/copyright diff --git a/debian/copyright b/debian/copyright index 3fd5783..cd05ea6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,57 +1,54 @@ -This package was debianized by Michael K. Edwards mke...@sane.net on -Sun, 14 Dec 2003 02:24:27 -0800. - -It was downloaded on Sat, 13 Dec 2003 from: - http://caml.inria.fr/distrib/bazar-ocaml/cryptokit-1.2.tar.gz - -The author's homepage is at http://pauillac.inria.fr/~xleroy/ - -Upstream Authors: Xavier Leroy xavier.le...@inria.fr - Michael K. Edwards crypto...@sane.net - -Copyright: 2001,2002,2003 Xavier Leroy xavier.le...@inria.fr -Portions Copyright: 2003 Michael K. Edwards crypto...@sane.net - -Cryptokit is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2, or -(at your option) any later version, including its successor, the -GNU Lesser General Public License. - -Cryptokit is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You may have received a copy of the GNU Library General Public License along -with Cryptokit; see the file COPYING. If not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -As a special exception to the GNU Library General Public License, you -may link, statically or dynamically, a work that uses the Library -with a publicly distributed version of the Library to produce an -executable file containing portions of the Library, and distribute -that executable file under terms of your choice, without any of the -additional requirements listed in clause 6 of the GNU Library General -Public License. By a publicly distributed version of the Library, -we mean either the unmodified Library as distributed by INRIA, or a -modified version of the Library that is distributed under the -conditions defined in clause 3 of the GNU Library General Public -License. This exception does not however invalidate any other reasons -why the executable file might be covered by the GNU Library General -Public License. - -However, the RSA and Diffie-Hellman operations in this version of -Cryptokit have been reimplemented using the Numerix multi-precision -integer library, which is licensed under the GNU General Public License. -Consequently, any use of this Library together with Numerix will be -governed by the GNU General Public License and the special exception -listed above will not apply to the resulting work. - - -On Debian systems the complete text of Version 2 of the Library General -Public License can be found in /usr/share/common-licenses/LGPL-2, and -its successor, Version 2.1 of the Lesser General Public License, can -be found in /usr/share/common-licenses/LGPL-2.1. The General Public -License mentioned in connection with Numerix can also be found in -/usr/share/common-licenses/GPL-2. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Packaged-By: Michael K. Edwards mke...@sane.net +Packaged-Date: Sun, 14 Dec 2003 02:24:27 -0800 +Source: https://forge.ocamlcore.org/projects/cryptokit/ +Upstream-Contact: Xavier Leroy xavier.le...@inria.fr + +Files: * +Copyright: 2001-2012, Inria + 2003, Michael K. Edwards crypto...@sane.net +License: LGPL-2-exception | GPL-2 + Cryptokit is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version, including its successor, the GNU + Lesser General Public License. + . + Cryptokit is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You may have received a copy of the GNU Library General Public + License along with Cryptokit; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301, USA. + . + As a special exception to the GNU Library General Public License, you + may link, statically or dynamically, a work that uses the Library + with a publicly distributed version of the Library to produce an + executable file containing portions of the Library, and distribute + that executable file under terms of your choice, without any of the + additional requirements listed in clause 6 of the GNU Library General + Public License. By a publicly distributed version of the
[Pkg-ocaml-maint-commits] [SCM] cryptokit packaging branch, master, updated. debian/1.5-1-10-gcc86fd7
The following commit has been merged in the master branch: commit cc86fd70c0d786d6f8b3db8d782f8c556be54986 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:48:54 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 92e5905..53468b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -cryptokit (1.7-1) UNRELEASED; urgency=low +cryptokit (1.7-1) unstable; urgency=low [ Stéphane Glondu ] * New upstream release + * Use format version 1.0 in debian/copyright + * Bump Standards-Version to 3.9.4 [ Sylvain Le Gall ] * Remove Sylvain Le Gall from uploaders - -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 14:32:08 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 14:48:43 +0200 cryptokit (1.5-1) unstable; urgency=low -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, pristine-tar, updated. 0b0f546a72d83329f85bdb939dcd3793f4220b10
The following commit has been merged in the pristine-tar branch: commit 6719c47e3024c3127bc99d2c3f5072350e812a43 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:31:54 2013 +0200 pristine-tar data for cryptokit_1.6.orig.tar.gz diff --git a/cryptokit_1.6.orig.tar.gz.delta b/cryptokit_1.6.orig.tar.gz.delta new file mode 100644 index 000..cac467e Binary files /dev/null and b/cryptokit_1.6.orig.tar.gz.delta differ diff --git a/cryptokit_1.6.orig.tar.gz.id b/cryptokit_1.6.orig.tar.gz.id new file mode 100644 index 000..96052bb --- /dev/null +++ b/cryptokit_1.6.orig.tar.gz.id @@ -0,0 +1 @@ +fae640a28e5be0f4a39340685d4517803dc961e2 -- cryptokit packaging ___ 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] [SCM] cryptokit packaging branch, pristine-tar, updated. 0b0f546a72d83329f85bdb939dcd3793f4220b10
The following commit has been merged in the pristine-tar branch: commit 0b0f546a72d83329f85bdb939dcd3793f4220b10 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 14:32:05 2013 +0200 pristine-tar data for cryptokit_1.7.orig.tar.gz diff --git a/cryptokit_1.7.orig.tar.gz.delta b/cryptokit_1.7.orig.tar.gz.delta new file mode 100644 index 000..c594910 Binary files /dev/null and b/cryptokit_1.7.orig.tar.gz.delta differ diff --git a/cryptokit_1.7.orig.tar.gz.id b/cryptokit_1.7.orig.tar.gz.id new file mode 100644 index 000..8bd5fc5 --- /dev/null +++ b/cryptokit_1.7.orig.tar.gz.id @@ -0,0 +1 @@ +3aea1d300b3d362107db03c3ca02f3d6b60b5ec7 -- cryptokit packaging ___ 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] [SCM] cryptokit packaging annotated tag, debian/1.7-1, created. debian/1.7-1
The annotated tag, debian/1.7-1 has been created
at 799b26e4af7a84c9107f3c4b436d95aa0b23539e (tag)
tagging cc86fd70c0d786d6f8b3db8d782f8c556be54986 (commit)
replaces debian/1.5-1
tagged by Stephane Glondu
on Wed May 8 14:51:03 2013 +0200
- Shortlog
cryptokit Debian release 1.7-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABCgAGBQJRiko3AAoJEHhT2k1JiBrTIh0P/RBQYPdG6pP3QTSAOhJhlCNY
phlkKJx3wzAaD3k8ljRovfhGFejbrFgwwbJn4jT2JdXERu6Oug8R6u2WhexlR2BH
51hxUQzz6ZpIj7IJYCtPR0lK0C1Ef24rw2c4OtmrqtpQMIh198IQ2Pylc3JJLUpm
6hGop62v8pFvF0OEr1+rjHN5FDmfS+9P4wEMOlXncXtw7uTyWyEAHGKwM6MVQXyB
jCMR/AEJAnLQhOOFldAzHxQHBK+LACGTG1pv3K7QnBIB9qB/aAwmjSIaSUETDF3Q
oMOA9SZ41ZpqSAKCf9EuJQvtaEv/QDwdpqzH43D8wiPG4kG9PEXSHdkgd/9rZrZn
BSYOABEHT+cnHA2U0oV2bHlWd5CHg+2mSEIbBIiYbqsweggkEvm3I6jPAD2Zo3dO
T5lnQV0m4IeiAAhLarqUfR8nKjzIZKmfdupcEDcMFmujwBQchjD+QbU1qOyFkXZx
KIQtuEkEf/zN0ptNaBvyndqGSoH9JeRJDhWxSBzlOpx9SiJI5NxCo+gNRJ4ii0hP
TBXx5UWCN71yrbx4Ct/c5by2jdf2ppZWlcFlYm4glBJVd+7eLwfWrq9CVMpFx3eo
Or/WX86vokrO754bjeeApseLJEhN17Vt7d5enS0rfPUzHUNzhY9egbrk4uBbmHYw
HSLUu4dGzNX5zVthkErm
=eFCu
-END PGP SIGNATURE-
Stephane Glondu (9):
Imported Upstream version 1.6
Imported Upstream version 1.7
Merge tag 'upstream/1.7'
New upstream release
Upstream support of *.{cmx,cmxs}
Use format version 1.0 in debian/copyright
Bump Standards-Version to 3.9.4
Merge remote-tracking branch 'origin/master'
Update changelog and prepare upload to unstable
Sylvain Le Gall (1):
Remove Sylvain Le Gall from uploaders
---
--
cryptokit packaging
___
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] [SCM] cryptokit packaging annotated tag, upstream/1.6, created. upstream/1.6
The annotated tag, upstream/1.6 has been created at 91ae4fb344c9fe0208d31c1fb9880330e17b5047 (tag) tagging acc31533d32ab3c17e4da1aaf14d3be424b68b2b (commit) replaces upstream/1.5 tagged by Stephane Glondu on Wed May 8 14:31:54 2013 +0200 - Shortlog Upstream version 1.6 Stephane Glondu (1): Imported Upstream version 1.6 --- -- cryptokit packaging ___ 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] [SCM] cryptokit packaging annotated tag, upstream/1.7, created. upstream/1.7
The annotated tag, upstream/1.7 has been created at 998daed7eca71f8f072e428ef3c0a42377df93b1 (tag) tagging c8502c67bbae652f93999282cf0de5a5e34ab3fe (commit) replaces upstream/1.6 tagged by Stephane Glondu on Wed May 8 14:32:05 2013 +0200 - Shortlog Upstream version 1.7 Stephane Glondu (1): Imported Upstream version 1.7 --- -- cryptokit packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, upstream, updated. upstream/1.6.1-7-g9aaa4ba
The following commit has been merged in the upstream branch: commit 298bd2da0eb92399f220d077efa5f3cb9384985d Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:07:55 2013 +0200 Imported Upstream version 1.6.2 diff --git a/.hg_archival.txt b/.hg_archival.txt index ce3ee7f..280f6aa 100644 --- a/.hg_archival.txt +++ b/.hg_archival.txt @@ -1,2 +1,4 @@ repo: 42b5d31bc33edcbe8bd08bd924e56244cd453699 -node: 903dfda413bc5a80e3425d6e5458574d6a0362b7 +node: e77dfff5ac640b141e29464a1ecaac8215e5c334 +branch: default +tag: release-1.6.2 diff --git a/.hgtags b/.hgtags index ea7420a..b29fa60 100644 --- a/.hgtags +++ b/.hgtags @@ -19,3 +19,4 @@ b924c4a44355c64839e3a6969b4e57691cfaf444 release-1.5.3 d04c39adf32ce248e87365897d62e622853ee215 release-1.5.8 595a79c26337c1ebeb7f024d6115b7dcff434d62 release-1.5.9 bdb8a82c1481682a9d736a5c04108480bcfbf155 release-1.6.0 +903dfda413bc5a80e3425d6e5458574d6a0362b7 release-1.6.1 diff --git a/configure b/configure index c787519..4f55f11 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ocaml-sqlite 1.6.1. +# Generated by GNU Autoconf 2.68 for sqlite-ocaml 1.6.2. # # Report bugs to markus.mo...@gmail.com. # @@ -558,10 +558,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='ocaml-sqlite' -PACKAGE_TARNAME='ocaml-sqlite' -PACKAGE_VERSION='1.6.1' -PACKAGE_STRING='ocaml-sqlite 1.6.1' +PACKAGE_NAME='sqlite-ocaml' +PACKAGE_TARNAME='sqlite-ocaml' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='sqlite-ocaml 1.6.2' PACKAGE_BUGREPORT='markus.mo...@gmail.com' PACKAGE_URL='' @@ -673,8 +673,7 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -CPPFLAGS' +CPP' # Initialize some variables set by options. @@ -1217,7 +1216,7 @@ if test $ac_init_help = long; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures ocaml-sqlite 1.6.1 to adapt to many kinds of systems. +\`configure' configures sqlite-ocaml 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1265,7 +1264,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIRman documentation [DATAROOTDIR/man] - --docdir=DIRdocumentation root [DATAROOTDIR/doc/ocaml-sqlite] + --docdir=DIRdocumentation root [DATAROOTDIR/doc/sqlite-ocaml] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIRdvi documentation [DOCDIR] --pdfdir=DIRpdf documentation [DOCDIR] @@ -1278,7 +1277,7 @@ fi if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of ocaml-sqlite 1.6.1:;; + short | recursive ) echo Configuration of sqlite-ocaml 1.6.2:;; esac cat \_ACEOF @@ -1363,7 +1362,7 @@ fi test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -ocaml-sqlite configure 1.6.1 +sqlite-ocaml configure 1.6.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1665,7 +1664,7 @@ cat config.log _ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ocaml-sqlite $as_me 1.6.1, which was +It was created by sqlite-ocaml $as_me 1.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -4121,7 +4120,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by ocaml-sqlite $as_me 1.6.1, which was +This file was extended by sqlite-ocaml $as_me 1.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -4174,7 +4173,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'` ac_cs_version=\\ -ocaml-sqlite config.status 1.6.1 +sqlite-ocaml config.status 1.6.2 configured by $0, generated by GNU Autoconf 2.68, with options \\\$ac_cs_config\\ @@ -5296,7 +5295,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by ocaml-sqlite $as_me 1.6.1, which was +This file was extended by sqlite-ocaml $as_me 1.6.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -5349,7 +5348,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'` ac_cs_version=\\ -ocaml-sqlite config.status 1.6.1
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, upstream, updated. upstream/1.6.1-7-g9aaa4ba
The following commit has been merged in the upstream branch:
commit 46de2083aa49bfddf1e7fa8edec1dbe5e8dddb90
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 15:07:59 2013 +0200
Imported Upstream version 1.6.3
diff --git a/.hg_archival.txt b/.hg_archival.txt
index 280f6aa..95e100e 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
repo: 42b5d31bc33edcbe8bd08bd924e56244cd453699
-node: e77dfff5ac640b141e29464a1ecaac8215e5c334
+node: c24545d1a514fa32484b769a655f9779ed9e7c88
branch: default
-tag: release-1.6.2
+tag: release-1.6.3
diff --git a/.hgtags b/.hgtags
index b29fa60..768d472 100644
--- a/.hgtags
+++ b/.hgtags
@@ -20,3 +20,4 @@ d04c39adf32ce248e87365897d62e622853ee215 release-1.5.8
595a79c26337c1ebeb7f024d6115b7dcff434d62 release-1.5.9
bdb8a82c1481682a9d736a5c04108480bcfbf155 release-1.6.0
903dfda413bc5a80e3425d6e5458574d6a0362b7 release-1.6.1
+e77dfff5ac640b141e29464a1ecaac8215e5c334 release-1.6.2
diff --git a/Changelog b/Changelog
index 2c523d8..d4cc005 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2012-05-19: Fixed cpp warnings and removed superfluous check for dynamic
+linking library. The latter improves portability to FreeBSD.
+
+Thanks to Stéphane Legrand steph...@free.fr for the bug report!
+
2011-03-10: Added sqlite3_open_v2 functionality.
Thanks to Mike Lin m...@mit.edu for the initial patch!
diff --git a/Makefile.in b/Makefile.in
index 675324f..9f20e92 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,10 +5,10 @@ bindir=@bindir@
HAS_ENABLE_LOAD_EXTENSION=@HAS_ENABLE_LOAD_EXTENSION@
ifeq ($(HAS_ENABLE_LOAD_EXTENSION), true)
HAS_ENABLE_LOAD_EXTENSION= -DHAS_ENABLE_LOAD_EXTENSION
- OCFLAGS=-pp cpp -DHAS_ENABLE_LOAD_EXTENSION
+ OCFLAGS=-pp cpp -traditional-cpp -DHAS_ENABLE_LOAD_EXTENSION
else
HAS_ENABLE_LOAD_EXTENSION=
- OCFLAGS=-pp cpp
+ OCFLAGS=-pp cpp -traditional-cpp
endif
CC=@CC@
diff --git a/configure b/configure
index 4f55f11..50c8ffd 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for sqlite-ocaml 1.6.2.
+# Generated by GNU Autoconf 2.69 for sqlite-ocaml 1.6.3.
#
# Report bugs to markus.mo...@gmail.com.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) /dev/null 21 unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x${_as_can_reexec} != xno test x$CONFIG_SHELL != x; then
+_as_can_reexec=no; export _as_can_reexec;
+# We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) /dev/null 21 unset BASH_ENV ENV
+case $- in #
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts $as_myself ${1+$@}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo $0: could not re-execute with $CONFIG_SHELL 2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test x$CONFIG_SHELL = x; then
as_bourne_compatible=if test -n \\${ZSH_VERSION+set}\ (emulate sh)
/dev/null 21; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y test x = \\$1\ ); then
:
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1
as_suggested=
as_lineno_1=;as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested
as_lineno_1a=\$LINENO
as_lineno_2=;as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested
as_lineno_2a=\$LINENO
eval 'test \x\$as_lineno_1'\$as_run'\ != \x\$as_lineno_2'\$as_run'\
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
if test x$CONFIG_SHELL != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) /dev/null 21 unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in #
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x*
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, upstream, updated. upstream/1.6.1-7-g9aaa4ba
The following commit has been merged in the upstream branch: commit 8203b5c9baa5c74363ecd4dd29098ec1cc78b3d6 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:49 2013 +0200 Imported Upstream version 2.0.3 diff --git a/.hg_archival.txt b/.hg_archival.txt index 64778e2..3240d58 100644 --- a/.hg_archival.txt +++ b/.hg_archival.txt @@ -1,4 +1,4 @@ repo: 42b5d31bc33edcbe8bd08bd924e56244cd453699 -node: 31b3731fa002bfab22bc49a368b2b14b47927db8 +node: b574dea46582a400600b87d5043f64af239060cb branch: default -tag: release-2.0.2 +tag: release-2.0.3 diff --git a/.hgtags b/.hgtags index 658d1ae..de0aeb3 100644 --- a/.hgtags +++ b/.hgtags @@ -24,3 +24,4 @@ e77dfff5ac640b141e29464a1ecaac8215e5c334 release-1.6.2 c24545d1a514fa32484b769a655f9779ed9e7c88 release-1.6.3 bd4bac35acf6ab5515d7a3ef8bacb038e417ae56 release-2.0.0 a0f0a04508c6b8c42688fd6aa4557a03f420eae5 release-2.0.1 +31b3731fa002bfab22bc49a368b2b14b47927db8 release-2.0.2 diff --git a/CHANGES.txt b/CHANGES.txt index 5630b29..c2dab34 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,16 +1,20 @@ -2012-07-20: Downgraded findlib version requirement to support the Debian - testing branch. +2012-11-19: Added missing .mldylib file for shared library support. -2012-07-16: Replaced String.trim function in myocamlbuild.ml to allow - compiling with OCaml 3.12.1. +Thanks to Hugo Heuzard for the bug report! -2012-07-15: New major release version 2.0.0: +2012-07-20: Downgraded findlib version requirement to support the Debian +testing branch. - * Upgraded to OCaml 4.00 - * Switched to Oasis for packaging - * Switched to OCamlBuild for the build process - * Rewrote README in Markdown - * Added stricter compilation flags +2012-07-16: Replaced String.trim function in myocamlbuild.ml to allow +compiling with OCaml 3.12.1. + +2012-07-15: New major release version 2.0.0: + + * Upgraded to OCaml 4.00 + * Switched to Oasis for packaging + * Switched to OCamlBuild for the build process + * Rewrote README in Markdown + * Added stricter compilation flags 2012-05-19: Fixed cpp warnings and removed superfluous check for dynamic linking library. The latter improves portability to FreeBSD. diff --git a/INSTALL.txt b/INSTALL.txt index 34f6d9d..66b9eca 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 4b03d3c2252969fb579b92758c53f3a5) *) +(* DO NOT EDIT (digest: 82fea3d6fec6637a0a4b91bdcef06e81) *) This is the INSTALL file for the sqlite3-ocaml distribution. This package uses OASIS to generate its build system. See section OASIS for @@ -11,7 +11,7 @@ Dependencies In order to compile this package, you will need: * ocaml (= 3.12) for all, test test_agg, test test_db, test test_exec, test test_fun, test test_stmt, doc API -* findlib (= 1.3.2) +* findlib (= 1.3.1) Installing == diff --git a/_oasis b/_oasis index aeb1786..f56cf7f 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.3 Name: sqlite3-ocaml -Version: 2.0.2 +Version: 2.0.3 Synopsis: sqlite3-ocaml - bindings to the SQLite3 library Description: sqlite3-ocaml offers library functions for accessing SQLite3 database Authors: Markus Mottl markus.mo...@gmail.com, diff --git a/lib/META b/lib/META index b1f46d5..f127b49 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 351f3ace294279ab0bc82513b0aa4dc8) -version = 2.0.1 +# DO NOT EDIT (digest: 27324187102378b24fdc95dc4761e05e) +version = 2.0.3 description = sqlite3-ocaml - bindings to the SQLite3 library archive(byte) = sqlite3.cma archive(byte, plugin) = sqlite3.cma diff --git a/lib/sqlite3.mldylib b/lib/sqlite3.mldylib new file mode 100644 index 000..ad7f569 --- /dev/null +++ b/lib/sqlite3.mldylib @@ -0,0 +1 @@ +Sqlite3 diff --git a/myocamlbuild.ml b/myocamlbuild.ml index c2f1d68..0d83d9d 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,7 +1,7 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: da20c8b112fd110cb90562115ab3f0d8) *) +(* DO NOT EDIT (digest: 3b119367c38709b17bd258c9a0f91d16) *) module OASISGettext = struct -(* # 21 /Users/mmottl/local/darwin11.3.0/src/oasis-0.3.0/src/oasis/OASISGettext.ml *) +# 21 /Users/mmottl/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISGettext.ml let ns_ str = str @@ -24,7 +24,7 @@ module OASISGettext = struct end module OASISExpr = struct -(* # 21 /Users/mmottl/local/darwin11.3.0/src/oasis-0.3.0/src/oasis/OASISExpr.ml *) +# 21 /Users/mmottl/.opam/4.00.1/build/oasis.0.3.0/src/oasis/OASISExpr.ml @@ -116,7 +116,7 @@ end # 117 myocamlbuild.ml module BaseEnvLight = struct -(* # 21 /Users/mmottl/local/darwin11.3.0/src/oasis-0.3.0/src/base/BaseEnvLight.ml *) +# 21
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, upstream, updated. upstream/1.6.1-7-g9aaa4ba
The following commit has been merged in the upstream branch:
commit 9aaa4ba9a07264f4f65e947788d225adda18c67d
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 15:10:33 2013 +0200
Imported Upstream version 2.0.4
diff --git a/.hg_archival.txt b/.hg_archival.txt
index 3240d58..8f7e316 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
repo: 42b5d31bc33edcbe8bd08bd924e56244cd453699
-node: b574dea46582a400600b87d5043f64af239060cb
+node: f880b39bb3d91a8c8fb5bc9007145ccfd2ab410a
branch: default
-tag: release-2.0.3
+tag: release-2.0.4
diff --git a/.hgtags b/.hgtags
index de0aeb3..389de49 100644
--- a/.hgtags
+++ b/.hgtags
@@ -25,3 +25,4 @@ c24545d1a514fa32484b769a655f9779ed9e7c88 release-1.6.3
bd4bac35acf6ab5515d7a3ef8bacb038e417ae56 release-2.0.0
a0f0a04508c6b8c42688fd6aa4557a03f420eae5 release-2.0.1
31b3731fa002bfab22bc49a368b2b14b47927db8 release-2.0.2
+b574dea46582a400600b87d5043f64af239060cb release-2.0.3
diff --git a/CHANGES.txt b/CHANGES.txt
index c2dab34..0e391ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+2012-12-02: Added new functions
+
+ * sleep
+ * clear_bindings
+
+Really old operating system distributions may have had problems
+linking these functions, but it seems that reasonably recent
+ones support them.
+
2012-11-19: Added missing .mldylib file for shared library support.
Thanks to Hugo Heuzard for the bug report!
diff --git a/_oasis b/_oasis
index f56cf7f..6a41535 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: sqlite3-ocaml
-Version: 2.0.3
+Version: 2.0.4
Synopsis: sqlite3-ocaml - bindings to the SQLite3 library
Description: sqlite3-ocaml offers library functions for accessing SQLite3
database
Authors: Markus Mottl markus.mo...@gmail.com,
diff --git a/lib/META b/lib/META
index f127b49..2c75ad2 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 27324187102378b24fdc95dc4761e05e)
-version = 2.0.3
+# DO NOT EDIT (digest: cb012c6e65adca8fbd893b29be5522d8)
+version = 2.0.4
description = sqlite3-ocaml - bindings to the SQLite3 library
archive(byte) = sqlite3.cma
archive(byte, plugin) = sqlite3.cma
diff --git a/lib/sqlite3.ml b/lib/sqlite3.ml
index cc28125..3c2c53d 100644
--- a/lib/sqlite3.ml
+++ b/lib/sqlite3.ml
@@ -195,6 +195,7 @@ external recompile : stmt - unit = caml_sqlite3_recompile
external step : stmt - Rc.t = caml_sqlite3_step
external reset : stmt - Rc.t = caml_sqlite3_stmt_reset
+external sleep : int - int = caml_sqlite3_sleep
external finalize : stmt - Rc.t = caml_sqlite3_stmt_finalize
external data_count : stmt - int = caml_sqlite3_data_count
@@ -216,15 +217,13 @@ external bind_parameter_name :
external bind_parameter_index :
stmt - string - int = caml_sqlite3_bind_parameter_index
+external clear_bindings : stmt - Rc.t = caml_sqlite3_clear_bindings
+
external busy_timeout : db - int - unit = caml_sqlite3_busy_timeout
external enable_load_extension :
db - bool - bool = caml_sqlite3_enable_load_extension noalloc
-(* TODO: these give linking errors on some platforms *)
-(* external sleep : int - int = caml_sqlite3_sleep *)
-(* external clear_bindings : stmt - Rc.t = caml_sqlite3_clear_bindings *)
-
let row_data stmt = Array.init (data_count stmt) (column stmt)
let row_names stmt = Array.init (data_count stmt) (column_name stmt)
let row_decltypes stmt = Array.init (data_count stmt) (column_decltype stmt)
diff --git a/lib/sqlite3.mli b/lib/sqlite3.mli
index 8fc05cb..21682cd 100644
--- a/lib/sqlite3.mli
+++ b/lib/sqlite3.mli
@@ -351,6 +351,10 @@ external reset : stmt - Rc.t = caml_sqlite3_stmt_reset
@raise SqliteError if the statement could not be reset.
*)
+external sleep : int - int = caml_sqlite3_sleep
+(** [sleep ms] sleeps at least [ms] milliseconds. @return the number of
+milliseconds of sleep actually requested from the operating system. *)
+
(** {2 Data query} *)
@@ -434,9 +438,14 @@ external bind_parameter_index :
@raise SqliteError if the statement is invalid.
*)
-(* TODO: these give linking errors on some platforms *)
-(* external sleep : int - int = caml_sqlite3_sleep *)
-(* external clear_bindings : stmt - Rc.t = caml_sqlite3_clear_bindings *)
+external clear_bindings : stmt - Rc.t = caml_sqlite3_clear_bindings
+(** [clear_bindings stmt] resets all bindings associated with prepared
+statement [stmt].
+
+@return the return code of this operation.
+
+@raise SqliteError if the statement is invalid.
+*)
(** {2 Stepwise query convenience functions} *)
diff --git a/lib/sqlite3_stubs.c b/lib/sqlite3_stubs.c
index 2c94ea5..a42087d 100644
--- a/lib/sqlite3_stubs.c
+++ b/lib/sqlite3_stubs.c
@@ -843,16 +843,11 @@ CAMLprim value caml_sqlite3_bind(value v_stmt, value
v_index, value v_data)
return Val_rc(SQLITE_ERROR);
}
-/* FIXME */
-
-/* Sorry this gives a
[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/1.6.2, created. upstream/1.6.2
The annotated tag, upstream/1.6.2 has been created at 55edf2c8d8d8658e7defef0cc78063319e223435 (tag) tagging 298bd2da0eb92399f220d077efa5f3cb9384985d (commit) replaces upstream/1.6.1 tagged by Stephane Glondu on Wed May 8 15:07:55 2013 +0200 - Shortlog Upstream version 1.6.2 Stephane Glondu (1): Imported Upstream version 1.6.2 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/1.6.3, created. upstream/1.6.3
The annotated tag, upstream/1.6.3 has been created at f65112ea681205bd4a1bf4772784d77cb649a0e2 (tag) tagging 46de2083aa49bfddf1e7fa8edec1dbe5e8dddb90 (commit) replaces upstream/1.6.2 tagged by Stephane Glondu on Wed May 8 15:08:00 2013 +0200 - Shortlog Upstream version 1.6.3 Stephane Glondu (1): Imported Upstream version 1.6.3 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/2.0.0, created. upstream/2.0.0
The annotated tag, upstream/2.0.0 has been created at 278dab1365861738fa07d625a1591727c1e52b00 (tag) tagging af474bcfb0855b63402182e03ed7e86476f03e47 (commit) replaces upstream/1.6.3 tagged by Stephane Glondu on Wed May 8 15:08:20 2013 +0200 - Shortlog Upstream version 2.0.0 Stephane Glondu (1): Imported Upstream version 2.0.0 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/2.0.1, created. upstream/2.0.1
The annotated tag, upstream/2.0.1 has been created at a4a86d810380866fcd9ae4a520801f5e88dc7794 (tag) tagging ed7b544ef4c5591b5d81c263c51503e11c04ce1a (commit) replaces upstream/2.0.0 tagged by Stephane Glondu on Wed May 8 15:08:33 2013 +0200 - Shortlog Upstream version 2.0.1 Stephane Glondu (1): Imported Upstream version 2.0.1 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/2.0.2, created. upstream/2.0.2
The annotated tag, upstream/2.0.2 has been created at cace33bba867d69c45500df78c99318838f97c26 (tag) tagging 7d080895b143abdb6189b3195f0dc60c9e7bb24b (commit) replaces upstream/2.0.1 tagged by Stephane Glondu on Wed May 8 15:08:39 2013 +0200 - Shortlog Upstream version 2.0.2 Stephane Glondu (1): Imported Upstream version 2.0.2 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/2.0.3, created. upstream/2.0.3
The annotated tag, upstream/2.0.3 has been created at 64569be709fbdb27f8a05547da4c3ad74af21c9d (tag) tagging 8203b5c9baa5c74363ecd4dd29098ec1cc78b3d6 (commit) replaces upstream/2.0.2 tagged by Stephane Glondu on Wed May 8 15:08:49 2013 +0200 - Shortlog Upstream version 2.0.3 Stephane Glondu (1): Imported Upstream version 2.0.3 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging annotated tag, upstream/2.0.4, created. upstream/2.0.4
The annotated tag, upstream/2.0.4 has been created at deae5d8562ddc1f7a4656e027162b871e5330bae (tag) tagging 9aaa4ba9a07264f4f65e947788d225adda18c67d (commit) replaces upstream/2.0.3 tagged by Stephane Glondu on Wed May 8 15:10:34 2013 +0200 - Shortlog Upstream version 2.0.4 Stephane Glondu (1): Imported Upstream version 2.0.4 --- -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 7f1baf6ab9bb07bec272520265d05cc768b11d1c Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:00 2013 +0200 pristine-tar data for ocaml-sqlite3_1.6.3.orig.tar.gz diff --git a/ocaml-sqlite3_1.6.3.orig.tar.gz.delta b/ocaml-sqlite3_1.6.3.orig.tar.gz.delta new file mode 100644 index 000..f7a6800 Binary files /dev/null and b/ocaml-sqlite3_1.6.3.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_1.6.3.orig.tar.gz.id b/ocaml-sqlite3_1.6.3.orig.tar.gz.id new file mode 100644 index 000..1318cac --- /dev/null +++ b/ocaml-sqlite3_1.6.3.orig.tar.gz.id @@ -0,0 +1 @@ +f6304edd017a6454889953fd66a3d4f708eca937 -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 47b4e1671f413ede5038dc8f47a0a963f5daafab Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:20 2013 +0200 pristine-tar data for ocaml-sqlite3_2.0.0.orig.tar.gz diff --git a/ocaml-sqlite3_2.0.0.orig.tar.gz.delta b/ocaml-sqlite3_2.0.0.orig.tar.gz.delta new file mode 100644 index 000..dd64744 Binary files /dev/null and b/ocaml-sqlite3_2.0.0.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_2.0.0.orig.tar.gz.id b/ocaml-sqlite3_2.0.0.orig.tar.gz.id new file mode 100644 index 000..91f9f27 --- /dev/null +++ b/ocaml-sqlite3_2.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +e6c848cf8ac060d386143f2d8b6453633e2cc0af -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 6a398faff91e07331d2ba2c5079e222beede4737 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:07:55 2013 +0200 pristine-tar data for ocaml-sqlite3_1.6.2.orig.tar.gz diff --git a/ocaml-sqlite3_1.6.2.orig.tar.gz.delta b/ocaml-sqlite3_1.6.2.orig.tar.gz.delta new file mode 100644 index 000..68efb34 Binary files /dev/null and b/ocaml-sqlite3_1.6.2.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_1.6.2.orig.tar.gz.id b/ocaml-sqlite3_1.6.2.orig.tar.gz.id new file mode 100644 index 000..685cc07 --- /dev/null +++ b/ocaml-sqlite3_1.6.2.orig.tar.gz.id @@ -0,0 +1 @@ +641ac10e3500b9f73d0e4d1ab672d30300625df2 -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 83f6d7814d0d26d35aaaebaf539c65d3d0394019 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:33 2013 +0200 pristine-tar data for ocaml-sqlite3_2.0.1.orig.tar.gz diff --git a/ocaml-sqlite3_2.0.1.orig.tar.gz.delta b/ocaml-sqlite3_2.0.1.orig.tar.gz.delta new file mode 100644 index 000..0c64314 Binary files /dev/null and b/ocaml-sqlite3_2.0.1.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_2.0.1.orig.tar.gz.id b/ocaml-sqlite3_2.0.1.orig.tar.gz.id new file mode 100644 index 000..9401cf6 --- /dev/null +++ b/ocaml-sqlite3_2.0.1.orig.tar.gz.id @@ -0,0 +1 @@ +9910b5c00bf410b6c850c0e94cfdb5d0f8428b2b -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 9816be4c3ee85cb184db47e5aec135306581bb79 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:49 2013 +0200 pristine-tar data for ocaml-sqlite3_2.0.3.orig.tar.gz diff --git a/ocaml-sqlite3_2.0.3.orig.tar.gz.delta b/ocaml-sqlite3_2.0.3.orig.tar.gz.delta new file mode 100644 index 000..a94d420 Binary files /dev/null and b/ocaml-sqlite3_2.0.3.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_2.0.3.orig.tar.gz.id b/ocaml-sqlite3_2.0.3.orig.tar.gz.id new file mode 100644 index 000..ca9c9da --- /dev/null +++ b/ocaml-sqlite3_2.0.3.orig.tar.gz.id @@ -0,0 +1 @@ +c844769961439aa8d0cde066c8325e526114ef34 -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 33e13523645e757a39b419c852848263e54e6c40 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:10:33 2013 +0200 pristine-tar data for ocaml-sqlite3_2.0.4.orig.tar.gz diff --git a/ocaml-sqlite3_2.0.4.orig.tar.gz.delta b/ocaml-sqlite3_2.0.4.orig.tar.gz.delta new file mode 100644 index 000..aa6bf74 Binary files /dev/null and b/ocaml-sqlite3_2.0.4.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_2.0.4.orig.tar.gz.id b/ocaml-sqlite3_2.0.4.orig.tar.gz.id new file mode 100644 index 000..97aa358 --- /dev/null +++ b/ocaml-sqlite3_2.0.4.orig.tar.gz.id @@ -0,0 +1 @@ +17b9cd3fcff63f543bdc690021c62b0615ff39d4 -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, pristine-tar, updated. 33e13523645e757a39b419c852848263e54e6c40
The following commit has been merged in the pristine-tar branch: commit 8eb28fc68845b548352ebd8f41031b2f75451beb Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:08:39 2013 +0200 pristine-tar data for ocaml-sqlite3_2.0.2.orig.tar.gz diff --git a/ocaml-sqlite3_2.0.2.orig.tar.gz.delta b/ocaml-sqlite3_2.0.2.orig.tar.gz.delta new file mode 100644 index 000..9a768d7 Binary files /dev/null and b/ocaml-sqlite3_2.0.2.orig.tar.gz.delta differ diff --git a/ocaml-sqlite3_2.0.2.orig.tar.gz.id b/ocaml-sqlite3_2.0.2.orig.tar.gz.id new file mode 100644 index 000..d6aea20 --- /dev/null +++ b/ocaml-sqlite3_2.0.2.orig.tar.gz.id @@ -0,0 +1 @@ +b90363e5a16793938cbf7627d6cd14eb3b931d32 -- ocaml-sqlite3 packaging ___ 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] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.6.1-1-1-g04ae96c
The following commit has been merged in the master branch: commit 04ae96c1859dd56408718d19189da121684c34cd Author: Stephane Glondu st...@glondu.net Date: Wed May 8 15:06:09 2013 +0200 New debian/watch file by Bart Martens diff --git a/debian/watch b/debian/watch index 6ce97a9..15a2026 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 - -http://www.ocaml.info/ocaml_sources/ ocaml-sqlite3-(.*)\.tar\.gz +https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +# Bart Martens ba...@debian.org Sat, 23 Feb 2013 22:56:26 + -- ocaml-sqlite3 packaging ___ 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] [SCM] pcre-ocaml packaging branch, pristine-tar, updated. 3f9f8d9251cf5bbc6d2155c92e258c23be2a1400
The following commit has been merged in the pristine-tar branch: commit eff665198f2a3c52255629ead5cd3a0de709b558 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:36:53 2013 +0200 pristine-tar data for pcre-ocaml_7.0.0.orig.tar.gz diff --git a/pcre-ocaml_7.0.0.orig.tar.gz.delta b/pcre-ocaml_7.0.0.orig.tar.gz.delta new file mode 100644 index 000..1b009f8 Binary files /dev/null and b/pcre-ocaml_7.0.0.orig.tar.gz.delta differ diff --git a/pcre-ocaml_7.0.0.orig.tar.gz.id b/pcre-ocaml_7.0.0.orig.tar.gz.id new file mode 100644 index 000..8f59f13 --- /dev/null +++ b/pcre-ocaml_7.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +035896a8d65599847fd4fecfaaea453eab5dd339 -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, pristine-tar, updated. 3f9f8d9251cf5bbc6d2155c92e258c23be2a1400
The following commit has been merged in the pristine-tar branch: commit 3f9f8d9251cf5bbc6d2155c92e258c23be2a1400 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:37:07 2013 +0200 pristine-tar data for pcre-ocaml_7.0.2.orig.tar.gz diff --git a/pcre-ocaml_7.0.2.orig.tar.gz.delta b/pcre-ocaml_7.0.2.orig.tar.gz.delta new file mode 100644 index 000..6d5aaa0 Binary files /dev/null and b/pcre-ocaml_7.0.2.orig.tar.gz.delta differ diff --git a/pcre-ocaml_7.0.2.orig.tar.gz.id b/pcre-ocaml_7.0.2.orig.tar.gz.id new file mode 100644 index 000..59ef18b --- /dev/null +++ b/pcre-ocaml_7.0.2.orig.tar.gz.id @@ -0,0 +1 @@ +4572e6e3d0a163f491f3a76b3d0d39addd7cdb17 -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, pristine-tar, updated. 3f9f8d9251cf5bbc6d2155c92e258c23be2a1400
The following commit has been merged in the pristine-tar branch: commit 411465bcc90bd71eb4cc7fda4a93dc3718a39037 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:36:58 2013 +0200 pristine-tar data for pcre-ocaml_7.0.1.orig.tar.gz diff --git a/pcre-ocaml_7.0.1.orig.tar.gz.delta b/pcre-ocaml_7.0.1.orig.tar.gz.delta new file mode 100644 index 000..dc258b5 Binary files /dev/null and b/pcre-ocaml_7.0.1.orig.tar.gz.delta differ diff --git a/pcre-ocaml_7.0.1.orig.tar.gz.id b/pcre-ocaml_7.0.1.orig.tar.gz.id new file mode 100644 index 000..59d7f8d --- /dev/null +++ b/pcre-ocaml_7.0.1.orig.tar.gz.id @@ -0,0 +1 @@ +a669240d3b9f5704931e05a7bb7cbf9c3cdc6f4f -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, upstream, updated. upstream/6.2.5-3-g1bea41d
The following commit has been merged in the upstream branch:
commit f276ae0ceabef7af9c9fed41eaea5f3fc06f8978
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 16:36:57 2013 +0200
Imported Upstream version 7.0.1
diff --git a/.hg_archival.txt b/.hg_archival.txt
index b870a43..db64091 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,5 +1,4 @@
repo: 1062d19ece6f075dbc2fff3238732629f8005eb1
-node: 2b4e9bb63f5bae155ed862d9119b51643d3c5e53
+node: 8a4c42595d8297848e6872cbd111cb5e24ae721e
branch: default
-latesttag: release-7.0.0
-latesttagdistance: 1
+tag: release-7.0.1
diff --git a/CHANGES.txt b/CHANGES.txt
index c4145b4..e314d51 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,6 @@
+2012-07-20: Downgraded findlib version requirement to support the Debian
+ testing branch.
+
2012-07-15: New major release version 7.0.0:
* Upgraded to OCaml 4.00
diff --git a/INSTALL.txt b/INSTALL.txt
index 398f9ab..c160a61 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: f2472efb2e9166cc65bf2c929da1590f) *)
+(* DO NOT EDIT (digest: 192e943301af913cb0b976621682101a) *)
This is the INSTALL file for the pcre-ocaml distribution.
This package uses OASIS to generate its build system. See section OASIS for
@@ -10,7 +10,7 @@ Dependencies
In order to compile this package, you will need:
* ocaml (= 3.12) for all, doc API
-* findlib (= 1.3.2)
+* findlib (= 1.3.1)
Installing
==
diff --git a/_oasis b/_oasis
index 94f147b..afef7f8 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: pcre-ocaml
-Version: 7.0.0
+Version: 7.0.1
Synopsis: pcre-ocaml - bindings to the Perl Compatibility Regular
Expressions library
Description: pcre-ocaml offers library functions for string pattern
matching and substitution, similar to the functionality offered by the Perl
language.
Authors: Markus Mottl markus.mo...@gmail.com
@@ -9,7 +9,7 @@ Maintainers: Markus Mottl markus.mo...@gmail.com
LicenseFile: COPYING.txt
License: LGPL-2.1+ with OCaml linking exception
OCamlVersion: = 3.12
-FindlibVersion: = 1.3.2
+FindlibVersion: = 1.3.1
Homepage: https://bitbucket.org/mmottl/pcre-ocaml
#Categories:
#FilesAB:
diff --git a/lib/META b/lib/META
index 9edf3c4..f6ea408 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: c57f2d485325421c6ce880a4de56e8c7)
-version = 7.0.0
+# DO NOT EDIT (digest: d0ebe0fdbefb8351a1b7bbaacc418d60)
+version = 7.0.1
description =
pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library
archive(byte) = pcre.cma
diff --git a/setup.ml b/setup.ml
index e4825f3..97627b2 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: cbfb89929b547d2f600144faa183f6f1) *)
+(* DO NOT EDIT (digest: 9feba4fba60ba13906a466bd238bd159) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5576,9 +5576,9 @@ let setup_t =
{
oasis_version = 0.3;
ocaml_version = Some (OASISVersion.VGreaterEqual 3.12);
- findlib_version = Some (OASISVersion.VGreaterEqual 1.3.2);
+ findlib_version = Some (OASISVersion.VGreaterEqual 1.3.1);
name = pcre-ocaml;
- version = 7.0.0;
+ version = 7.0.1;
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5873,7 +5873,7 @@ let setup_t =
};
oasis_fn = Some _oasis;
oasis_version = 0.3.0;
- oasis_digest = Some �U�,�\029:\137\003u��\026�,u;
+ oasis_digest = Some \138\128B\018\156a��5�)\t;
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
--
pcre-ocaml packaging
___
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] [SCM] pcre-ocaml packaging branch, upstream, updated. upstream/6.2.5-3-g1bea41d
The following commit has been merged in the upstream branch:
commit 1bea41d483654556075b4a05482d02b58c3cb9e8
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 16:37:07 2013 +0200
Imported Upstream version 7.0.2
diff --git a/.hg_archival.txt b/.hg_archival.txt
index db64091..5b8809d 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,4 +1,4 @@
repo: 1062d19ece6f075dbc2fff3238732629f8005eb1
-node: 8a4c42595d8297848e6872cbd111cb5e24ae721e
+node: 00e2295ec90dac1d9b3139456ed062179c00c1b2
branch: default
-tag: release-7.0.1
+tag: release-7.0.2
diff --git a/.hgtags b/.hgtags
index 07fa909..2c258b1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@ d3debcff192d7911d1c11fc9c148146099ec125d release-6.2.3
ec6cbe5b8c3bcbe85e50df42afdd3b0583ae6c72 release-6.2.4
853c8a72818fdb44b4268bbe27228af44843f7d3 release-6.2.5
6f677cdfc12cfb68c522e3c35d62db10b4c15125 release-7.0.0
+8a4c42595d8297848e6872cbd111cb5e24ae721e release-7.0.1
diff --git a/CHANGES.txt b/CHANGES.txt
index e314d51..6d5d953 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,9 @@
2012-07-20: Downgraded findlib version requirement to support the Debian
testing branch.
+ Added --with-pcre-config flag to configure location of PCRE
+ configuration generator.
+
2012-07-15: New major release version 7.0.0:
* Upgraded to OCaml 4.00
diff --git a/_oasis b/_oasis
index afef7f8..b18fb3d 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: pcre-ocaml
-Version: 7.0.1
+Version: 7.0.2
Synopsis: pcre-ocaml - bindings to the Perl Compatibility Regular
Expressions library
Description: pcre-ocaml offers library functions for string pattern
matching and substitution, similar to the functionality offered by the Perl
language.
Authors: Markus Mottl markus.mo...@gmail.com
diff --git a/lib/META b/lib/META
index f6ea408..c4753f7 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: d0ebe0fdbefb8351a1b7bbaacc418d60)
-version = 7.0.1
+# DO NOT EDIT (digest: 4c0acc9560e507366bad7184b97298b0)
+version = 7.0.2
description =
pcre-ocaml - bindings to the Perl Compatibility Regular Expressions library
archive(byte) = pcre.cma
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 8f163ef..2c1caba 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -543,7 +543,14 @@ let () =
(* Add correct PCRE compilation and link flags *)
let pcre_clibs, opcre_cflags, opcre_clibs =
- let ic = Unix.open_process_in pcre-config --cflags --libs in
+ let ic =
+let pcre_config =
+ let env =
+BaseEnvLight.load ~filename:MyOCamlbuildBase.env_filename ()
+ in
+ BaseEnvLight.var_get with_pcre_config env
+in
+Unix.open_process_in (pcre_config ^ --cflags --libs) in
try
let pcre_cflags = input_line ic in
let pcre_clibs = input_line ic in
@@ -579,5 +586,4 @@ let () =
| _ - ()
in
dispatch (
-MyOCamlbuildBase.dispatch_combine
- [MyOCamlbuildBase.dispatch_default package_default; additional_rules])
+MyOCamlbuildBase.dispatch_combine [dispatch_default; additional_rules])
diff --git a/setup.ml b/setup.ml
index 97627b2..983259f 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.3.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 9feba4fba60ba13906a466bd238bd159) *)
+(* DO NOT EDIT (digest: d292fd74158442519bfda56081d2a794) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5578,7 +5578,7 @@ let setup_t =
ocaml_version = Some (OASISVersion.VGreaterEqual 3.12);
findlib_version = Some (OASISVersion.VGreaterEqual 1.3.1);
name = pcre-ocaml;
- version = 7.0.1;
+ version = 7.0.2;
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -5873,7 +5873,7 @@ let setup_t =
};
oasis_fn = Some _oasis;
oasis_version = 0.3.0;
- oasis_digest = Some \138\128B\018\156a��5�)\t;
+ oasis_digest = Some sV�\155\129�\157{���\128\156h�\155;
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
@@ -5883,4 +5883,11 @@ let setup () = BaseSetup.setup setup_t;;
# 5885 setup.ml
(* OASIS_STOP *)
+
+let pcre_config =
+ BaseEnv.var_define
+with_pcre_config (fun () - pcre-config)
+~cli:BaseEnv.CLIAuto
+~arg_help: Full path to pcre-config executable
+
let () = setup ();;
--
pcre-ocaml packaging
___
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] [SCM] pcre-ocaml packaging annotated tag, upstream/7.0.1, created. upstream/7.0.1
The annotated tag, upstream/7.0.1 has been created at 8c96fe9288225e30639eb0e5ced9e8357b4a8984 (tag) tagging f276ae0ceabef7af9c9fed41eaea5f3fc06f8978 (commit) replaces upstream/7.0.0 tagged by Stephane Glondu on Wed May 8 16:36:58 2013 +0200 - Shortlog Upstream version 7.0.1 Stephane Glondu (1): Imported Upstream version 7.0.1 --- -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging annotated tag, upstream/7.0.0, created. upstream/7.0.0
The annotated tag, upstream/7.0.0 has been created at 447b01309b7ba9497608c3ec23ba3b316ba18f4f (tag) tagging cb5ff184e49056ef331bea99ac7a4e32bca5a835 (commit) replaces upstream/6.2.5 tagged by Stephane Glondu on Wed May 8 16:36:53 2013 +0200 - Shortlog Upstream version 7.0.0 Stephane Glondu (1): Imported Upstream version 7.0.0 --- -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging annotated tag, upstream/7.0.2, created. upstream/7.0.2
The annotated tag, upstream/7.0.2 has been created at 3e057c5777b89309a248bd60ddd20956bad7e584 (tag) tagging 1bea41d483654556075b4a05482d02b58c3cb9e8 (commit) replaces upstream/7.0.1 tagged by Stephane Glondu on Wed May 8 16:37:07 2013 +0200 - Shortlog Upstream version 7.0.2 Stephane Glondu (1): Imported Upstream version 7.0.2 --- -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-1-g4a4ad61
The following commit has been merged in the master branch: commit 4a4ad612b8e9a2bd1e69b878ca70b5909123ba9b Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:36:02 2013 +0200 New debian/watch file by Bart Martens diff --git a/debian/watch b/debian/watch index 866a436..d6f099c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,3 @@ -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 - -http://www.ocaml.info/home/ocaml_sources.html http://hg.ocaml.info/release/pcre-ocaml/archive/release-(.*)\.tar\.gz +https://bitbucket.org/mmottl/pcre-ocaml/downloads/pcre-ocaml-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +# Bart Martens ba...@debian.org Sat, 23 Feb 2013 23:10:37 + -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch:
commit 26805dee1980413e95104fcad108caac20952119
Author: Stephane Glondu st...@glondu.net
Date: Wed May 8 16:56:00 2013 +0200
Adapt packaging to new build system
diff --git a/debian/control b/debian/control
index 329d3a0..a59ded2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
libpcre3-dev,
ocaml-nox (= 3.11.1-3~),
ocaml-findlib (= 1.2.5),
- cdbs,
dh-ocaml (= 0.9~)
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git
@@ -22,6 +21,8 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Provides: ${ocaml:Provides}
+Replaces: libpcre-ocaml-dev ( 7)
+Breaks: libpcre-ocaml-dev ( 7)
Description: OCaml bindings for PCRE (runtime)
This OCaml-library interfaces the PCRE (Perl-compatibility
regular expressions) C library. it can be used for matching
diff --git a/debian/libpcre-ocaml-dev.README.Debian
b/debian/libpcre-ocaml-dev.README.Debian
deleted file mode 100644
index 6f3419c..000
--- a/debian/libpcre-ocaml-dev.README.Debian
+++ /dev/null
@@ -1,13 +0,0 @@
-
- - About the examples
-
-Examples' Makefiles are built using OcamlMakefile and thus
-depend on it, to build them install the ocamlmakefile package
-that contains OcamlMakefile and change the OCAMLMAKEFILE
-variable defined in the various Makefiles making it point to
-/usr/share/ocamlmakefile/OCamlMakefile.
-
-E.g. OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
-
- -- Stéphane Glondu glo...@debian.org, Mon, 11 Apr 2011 13:35:43 +0200
-
diff --git a/debian/libpcre-ocaml-dev.doc-base
b/debian/libpcre-ocaml-dev.doc-base
new file mode 100644
index 000..93bbc38
--- /dev/null
+++ b/debian/libpcre-ocaml-dev.doc-base
@@ -0,0 +1,9 @@
+Document: libpcre-ocaml-dev
+Title: API for PCRE bindings
+Author: Markus Mottl
+Abstract: Ocamldoc-generated documentation for OCaml PCRE bindings
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libpcre-ocaml-dev/api/index.html
+Files: /usr/share/doc/libpcre-ocaml-dev/api/*.html
diff --git a/debian/libpcre-ocaml-dev.docs b/debian/libpcre-ocaml-dev.docs
index 71dfd5b..b43bf86 100644
--- a/debian/libpcre-ocaml-dev.docs
+++ b/debian/libpcre-ocaml-dev.docs
@@ -1 +1 @@
-README.txt
+README.md
diff --git a/debian/libpcre-ocaml-dev.install.in
b/debian/libpcre-ocaml-dev.install.in
index 215734d..d7c5051 100644
--- a/debian/libpcre-ocaml-dev.install.in
+++ b/debian/libpcre-ocaml-dev.install.in
@@ -1,4 +1,7 @@
-debian/tmp/@OCamlStdlibDir@/pcre/META
-debian/tmp/@OCamlStdlibDir@/pcre/*.a
-debian/tmp/@OCamlStdlibDir@/pcre/*.cm*
-debian/tmp/@OCamlStdlibDir@/pcre/*.ml*
+@OCamlStdlibDir@/pcre/META
+@OCamlStdlibDir@/pcre/*.a
+@OCamlStdlibDir@/pcre/*.ml*
+@OCamlStdlibDir@/pcre/*.cmi
+OPT: @OCamlStdlibDir@/pcre/*.cmx
+OPT: @OCamlStdlibDir@/pcre/*.cmxa
+usr/share/doc/pcre-ocaml/api usr/share/doc/libpcre-ocaml-dev
diff --git a/debian/libpcre-ocaml-dev.ocamldoc
b/debian/libpcre-ocaml-dev.ocamldoc
deleted file mode 100644
index 1bfdd46..000
--- a/debian/libpcre-ocaml-dev.ocamldoc
+++ /dev/null
@@ -1 +0,0 @@
-# This file must not be empty to be represented in .diff.gz!
diff --git a/debian/libpcre-ocaml.install.in b/debian/libpcre-ocaml.install.in
index 42fea44..67d462e 100644
--- a/debian/libpcre-ocaml.install.in
+++ b/debian/libpcre-ocaml.install.in
@@ -1 +1,4 @@
-@OCamlStdlibDir@/pcre/*.so @OCamlDllDir@
+@OCamlDllDir@/*.so @OCamlDllDir@
+@OCamlStdlibDir@/pcre/META
+@OCamlStdlibDir@/pcre/*.cma
+DYN: @OCamlStdlibDir@/pcre/*.cmxs
diff --git a/debian/patches/0001-enable-byte-only-build.patch
b/debian/patches/0001-enable-byte-only-build.patch
deleted file mode 100644
index e7b4778..000
--- a/debian/patches/0001-enable-byte-only-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Stefano Zacchiroli z...@upsilon.cc
-Date: Thu, 8 Apr 2010 22:05:57 +0200
-Subject: enable byte only build
-
-split the build process among native and non native targets, introducing the
-new opt target; it will be invoked only if /usr/bin/ocamlopt exists
- Makefile |5 +
- OCamlMakefile | 13 ++---
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 880d68f..a3c84ed 100644
a/Makefile
-+++ b/Makefile
-@@ -4,8 +4,13 @@ EXAMPLES = $(filter-out examples/OMakefile examples/CVS,
$(wildcard examples/*))
-
- .PHONY: all
- all:
-+ @cd lib $(MAKE) byte-code-library
-+
-+.PHONY: opt
-+opt:
- @cd lib $(MAKE) byte-code-library native-code-library
-
-+
- .PHONY: examples
- examples:
- @for dir in $(EXAMPLES); do (cd $$dir $(MAKE)); done
-diff --git a/OCamlMakefile b/OCamlMakefile
-index 7d42c88..5ba6928 100644
a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -525,8 +525,14 @@ ifndef STATIC
- endif
-
- ifndef LIBINSTALL_FILES
-- LIBINSTALL_FILES := $(RESULT).mli $(RESULT).cmi $(RESULT).cma \
--$(RESULT).cmxa $(RESULT).$(EXT_LIB) $(RES_CLIB)
-+ ifdef
[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch: commit a37229054b7ad8f3a6314debe2394b89160586c0 Merge: 4a4ad612b8e9a2bd1e69b878ca70b5909123ba9b 1bea41d483654556075b4a05482d02b58c3cb9e8 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:37:07 2013 +0200 Merge tag 'upstream/7.0.2' Upstream version 7.0.2 -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch: commit 8fc4cd0f85ef04d75747e9310334a7323dc6802f Author: Stephane Glondu st...@glondu.net Date: Wed May 8 16:37:21 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 3c94e10..8c1b808 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pcre-ocaml (7.0.2-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 16:37:12 +0200 + pcre-ocaml (6.2.5-1) unstable; urgency=low * New upstream release -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch: commit 647aec6ec4c9a03feb3c94b52c5d80387549184b Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:03:29 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index a59ded2..475b5d7 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: ocaml-nox (= 3.11.1-3~), ocaml-findlib (= 1.2.5), dh-ocaml (= 0.9~) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pcre-ocaml.git Homepage: http://www.ocaml.info/home/ocaml_sources.html -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch: commit cb08f9bb8c9ae0a3767cbe20aebd3702e0925b84 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:04:05 2013 +0200 Update changelog diff --git a/debian/changelog b/debian/changelog index 8c1b808..362402d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ pcre-ocaml (7.0.2-1) UNRELEASED; urgency=low * New upstream release + * Do no longer use CDBS + * 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 16:37:12 +0200 -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-10-gcb08f9b
The following commit has been merged in the master branch: commit c7a99575dc596be8e0bd077d8367c98e49dc537d Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:03:18 2013 +0200 Use format version 1.0 in debian/copyright diff --git a/debian/copyright b/debian/copyright index c488b9a..7ad42a5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,30 +1,26 @@ -This package was debianized by Stefano Zacchiroli z...@debian.org on -Thu, 2 May 2002 17:00:14 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Packaged-By: Stefano Zacchiroli z...@debian.org +Packaged-Date: Thu, 2 May 2002 17:00:14 +0200 +Source: https://bitbucket.org/mmottl/pcre-ocaml +Upstream-Contact: Markus Mottl markus.mo...@gmail.com -It was downloaded from: - http://www.ai.univie.ac.at/~markus/ocaml_sources - -Upstream Author: - Markus Mottl mar...@oefai.at - -Copyright: - © 1999-2006 Markus Mottl - -License: - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, - USA. - - On a Debian GNU/Linux system, the LGPL can be found as - /usr/share/common-licenses/LGPL-2.1. +Files: * +Copyright: 1999-2012, Markus Mottl markus.mo...@gmail.com +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + . + On a Debian GNU/Linux system, the LGPL can be found in + `/usr/share/common-licenses/LGPL-2.1'. -- pcre-ocaml packaging ___ 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] [SCM] react packaging branch, master, updated. debian/0.9.3-1-6-g27c8db6
The following commit has been merged in the master branch: commit 28c3148125184fb9cd2f988970607363df4cc857 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:29:12 2013 +0200 Adapt packaging to new build system diff --git a/debian/libreact-ocaml.install.in b/debian/libreact-ocaml.install.in index 6fdeba2..a1f27ff 100644 --- a/debian/libreact-ocaml.install.in +++ b/debian/libreact-ocaml.install.in @@ -1,3 +1,3 @@ @OCamlStdlibDir@/react/META @OCamlStdlibDir@/react/react.cma -DYN: _build/src/react.cmxs @OCamlStdlibDir@/react +DYN: @OCamlStdlibDir@/react/react.cmxs diff --git a/debian/rules b/debian/rules index 73282a1..6effe8a 100755 --- a/debian/rules +++ b/debian/rules @@ -18,9 +18,6 @@ override_dh_auto_configure: .PHONY: override_dh_auto_build override_dh_auto_build: ocaml setup.ml -build -ifeq ($(OCAML_NATDYNLINK),yes) - ocamlopt -shared -o _build/src/react.cmxs _build/src/react.cmx -endif .PHONY: override_dh_auto_test override_dh_auto_test: -- react packaging ___ 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] [SCM] react packaging branch, master, updated. debian/0.9.3-1-6-g27c8db6
The following commit has been merged in the master branch: commit 27c8db6494a5663fed228de9c6c6b67e8e9c1fb1 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:29:18 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index e176a28..fc6ab9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -react (0.9.4-1) UNRELEASED; urgency=low +react (0.9.4-1) unstable; urgency=low * New upstream release + * Bump Standards-Version to 3.9.4 - -- Stéphane Glondu glo...@debian.org Wed, 10 Apr 2013 10:31:35 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 17:26:50 +0200 react (0.9.3-1) unstable; urgency=low -- react packaging ___ 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] [SCM] react packaging annotated tag, debian/0.9.4-1, created. debian/0.9.4-1
The annotated tag, debian/0.9.4-1 has been created at f3f990aa2917ebc7a6a6fd701cd7fe38f12f3646 (tag) tagging 27c8db6494a5663fed228de9c6c6b67e8e9c1fb1 (commit) replaces debian/0.9.3-1 tagged by Stephane Glondu on Wed May 8 17:35:58 2013 +0200 - Shortlog react Debian release 0.9.4-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRinDeAAoJEHhT2k1JiBrTn/8P/i9Gdu1Y+bXGAI/34WcNPGrH 7yEW+0nzWPlZy5/nF/qFY9MCSl/EiFQAyzW8sbipiItpDQM6I7RC9ANdcBgABXLk 7eyA60bYlN/DmIjeRVGUVFNk15rF7LBlQXaWjoifKFn/aXiEpSnlvJhi1r+11lYP rMk01gRWZ9eFQzF20KvhZFYTlGyKR+Vdx+NlaJ3rRUtGyFkPLRNWFAy+lDBfkhjw +zHd0TbJuHBape76vkjDb0Cij/RBBvknlvlAceDDShLbih/uahrdtaAJAz4n6nA9 5YuI2BAIBdD86wtoUE0apeyhP9eBWnvTJE8ezASTIsbQOrQQXWiXrSlil3umAWwr w7tK8sNyzH3/P1lznH8BhTy0onq5V13Ef1jMWxk0f2ZZa10snjZn1qvwQJuLtqGF HMoYZ2XLnRTLTY0oLDe4ptJdyg2uhG6r/nKMWNQobTT6352uHh530Oxy90yuTY/S c9HjHRvygBPxuygpUiP3WoyVcImW8nZ5U6bsqXoQjq/tGkFWwc+9fRd55Oi9+GO8 +s7ly2tjd8V5jxOLk6C+N9h38aGDVMJud3yP5hOtO/5lsr4/JRcX+jFX6L5bx+g5 +MCXYNcfMWXVlvwRv47R5r5K4ALHx13MlgcLOCcOyj6elZ7SMrMSpe3kmC1IUNy3 Gcov7JLXtqEVHQMKvqsm =c3G/ -END PGP SIGNATURE- Stephane Glondu (6): Imported Upstream version 0.9.4 Merge tag 'upstream/0.9.4' New upstream release Bump Standards-Version to 3.9.4 Adapt packaging to new build system Update changelog and prepare upload to unstable --- -- react packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 5f7828e08f3583244ce7f1aa06af76caae69eb27 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:47:31 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 890aff0..7e91a3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq (8.4pl2dfsg-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 17:47:25 +0200 + coq (8.4pl1dfsg-1) experimental; urgency=low * New upstream release -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 0b14713e3efd7f8f1cc8a06555d0ec8fbe496130 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:49:57 2013 +0200 Update ABI diff --git a/debian/rules b/debian/rules index 29dfdc5..4a033c8 100755 --- a/debian/rules +++ b/debian/rules @@ -22,7 +22,7 @@ ADDPREF := COQINSTALLPREFIX=$(COQPREF) OLDROOT= PACKAGES := $(shell dh_listpackages) -COQ_VERSION := 8.4pl1 +COQ_VERSION := 8.4pl2 COQ_ABI := $(COQ_VERSION)+$(OCAML_ABI) CONFIGUREOPTS := --arch Linux --prefix /usr --mandir /usr/share/man \ -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 095eac936751bab72e3c6bbdfa3ede51f7198721 Merge: 4e6d6dab2ef2de6c1ad7972fc981e55a4fde7ae3 0b14713e3efd7f8f1cc8a06555d0ec8fbe496130 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 18:01:07 2013 +0200 Merge branch 'experimental/master' diff --combined debian/changelog index 5caa0f7,7e91a3d..91ce92b --- a/debian/changelog +++ b/debian/changelog @@@ -1,24 -1,63 +1,84 @@@ + coq (8.4pl2dfsg-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 17:47:25 +0200 + + coq (8.4pl1dfsg-1) experimental; urgency=low + + * New upstream release + - 0002-Fix-use-of-HASNATDYNLINK-in-coq_makefile-output.patch + has been merged upstream + - add ocaml-findlib to Build-Depends + + -- Stéphane Glondu glo...@debian.org Sat, 29 Dec 2012 15:56:53 +0100 + + coq (8.4dfsg-2) experimental; urgency=low + + * Upstream bugfix: Fix use of $(HASNATDYNLINK) in coq_makefile output + + -- Stéphane Glondu glo...@debian.org Sat, 22 Sep 2012 12:43:13 +0200 + + coq (8.4dfsg-1) experimental; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Mon, 20 Aug 2012 18:33:45 +0200 + + coq (8.4~gamma0+really8.4beta2+dfsg-1) experimental; urgency=low + + * New upstream beta release + + -- Stéphane Glondu glo...@debian.org Tue, 05 Jun 2012 07:38:25 +0200 + + coq (8.4~beta+dfsg-4) experimental; urgency=low + + * Recompile with camlp5 6.05 (no changes) + + -- Stéphane Glondu glo...@debian.org Fri, 06 Apr 2012 10:04:06 +0200 + + coq (8.4~beta+dfsg-3) experimental; urgency=low + + * Replace proofgeneral-coq by proofgeneral in dependencies + * Disable a test that uses too much memory, causing random FTBFS + + -- Stéphane Glondu glo...@debian.org Sun, 15 Jan 2012 12:37:23 +0100 + + coq (8.4~beta+dfsg-2) experimental; urgency=low + + * Fix a typo that caused decl_mode_plugin.cmxs not being installed, + making coqtop.opt useless + * Fix an ordering issue that was causing a test to fail in bytecode + + -- Stéphane Glondu glo...@debian.org Sat, 14 Jan 2012 11:11:48 +0100 + + coq (8.4~beta+dfsg-1) experimental; urgency=low + + * New upstream beta release + + -- Stéphane Glondu glo...@debian.org Thu, 12 Jan 2012 18:53:08 +0100 + +coq (8.3.pl4+dfsg-2) unstable; urgency=low + + * Recompile with camlp5 6.06 (no changes) + + -- Stéphane Glondu glo...@debian.org Wed, 06 Jun 2012 07:35:26 +0200 + +coq (8.3.pl4+dfsg-1) unstable; urgency=low + + * New upstream release + * Replace proofgeneral-coq by proofgeneral in dependencies + * Switch debian/copyright to format 1.0 + * Bump Standards-Version to 3.9.3 + + -- Stéphane Glondu glo...@debian.org Tue, 27 Mar 2012 07:59:07 +0200 + +coq (8.3.pl3+dfsg-2) unstable; urgency=low + + * Recompile with camlp5 6.04 (no changes) + + -- Stéphane Glondu glo...@debian.org Sun, 04 Mar 2012 18:59:12 +0100 + coq (8.3.pl3+dfsg-1) unstable; urgency=low * New upstream release diff --combined debian/gbp.conf index cec628c,68cfceb..126a7b7 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@@ -1,2 -1,20 +1,18 @@@ [DEFAULT] pristine-tar = True + filter-pristine-tar = True + filter = [ + doc/common/styles/html/coqremote/cover.html, + doc/common/styles/html/coqremote/hevea.css, + doc/common/styles/html/coqremote/styles.hva, + doc/common/styles/html/simple/cover.html, + doc/common/styles/html/simple/hevea.css, + doc/common/styles/html/simple/styles.hva, + doc/common/macros.tex, + doc/common/title.tex, + doc/RecTutorial, + doc/faq, + doc/refman, + doc/rt, + doc/tools, + doc/tutorial ] -upstream-branch=experimental/upstream -debian-branch=experimental/master -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 7a1180e02623fde86faf0dc0587641473b089db5 Merge: 095eac936751bab72e3c6bbdfa3ede51f7198721 db38bb4ad9aff74576d3b7f00028d48f0447d5bd Author: Stephane Glondu st...@glondu.net Date: Wed May 8 18:05:00 2013 +0200 Merge branch 'upstream' -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 0c6687c12b628881d5660d57707f0e7ca9e521b7 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:45:24 2013 +0200 New debian/watch file by Bart Martens diff --git a/debian/watch b/debian/watch index 07bcf5f..5d9c70d 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 - -opts=dversionmangle=s/dfsg$// \ -http://coq.inria.fr/download .*/coq-(.*)\.tar\.gz +opts=dversionmangle=s/\+?(debian|dfsg|ds|deb)\d*$// \ +http://coq.inria.fr/download .*/coq-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +# Bart Martens ba...@debian.org Sun, 30 Dec 2012 20:22:30 + -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-18-g7a1180e
The following commit has been merged in the master branch: commit 813d651c75cb954677a483b60d880600b421e011 Merge: 0c6687c12b628881d5660d57707f0e7ca9e521b7 499a11a45b5711d4eaabe84a80f0ad3ae539d500 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 17:47:16 2013 +0200 Merge tag 'upstream/8.4pl2dfsg' into experimental/master Upstream version 8.4pl2dfsg -- coq packaging ___ 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] [SCM] coq packaging branch, master, updated. debian/8.4pl1dfsg-1-19-g794da28
The following commit has been merged in the master branch: commit 794da2871ba5b67ccc4c3b1663b9c5f0996cc1c7 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 18:10:35 2013 +0200 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 91ce92b..a72430c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -coq (8.4pl2dfsg-1) UNRELEASED; urgency=low +coq (8.4pl2dfsg-1) unstable; urgency=low * New upstream release + * Upload to unstable - -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 17:47:25 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 18:10:14 +0200 coq (8.4pl1dfsg-1) experimental; urgency=low -- coq packaging ___ 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] [SCM] coq packaging annotated tag, upstream/8.4pl2dfsg, created. upstream/8.4pl2dfsg
The annotated tag, upstream/8.4pl2dfsg has been created at 1aaf911ce23e51226be86dd06d2c2ecabb227f91 (tag) tagging 499a11a45b5711d4eaabe84a80f0ad3ae539d500 (commit) replaces upstream/8.4pl1dfsg tagged by Stephane Glondu on Wed May 8 17:47:15 2013 +0200 - Shortlog Upstream version 8.4pl2dfsg Stephane Glondu (1): Imported Upstream version 8.4pl2dfsg --- -- coq packaging ___ 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] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-6-g3d594f9
The following commit has been merged in the master branch: commit 6a927d09b2b1d3fff9a71f2e7e8a8f5d794e5402 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 19:58:06 2013 +0200 New debian/watch file by Bart Martens diff --git a/debian/watch b/debian/watch index c4f7d47..8b79fe6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 - -http://ocaml.info/ocaml_sources/postgresql-ocaml-(.*)\.tar\.gz +https://bitbucket.org/mmottl/postgresql-ocaml/downloads/postgresql-ocaml-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) +# Bart Martens ba...@debian.org Sun, 24 Feb 2013 07:23:41 + -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-6-g3d594f9
The following commit has been merged in the master branch: commit 3d594f906c19a6bc0cc3a46e5079178be27c01ff Author: Stephane Glondu st...@glondu.net Date: Wed May 8 20:00:08 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 15604f4..415072c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +postgresql-ocaml (2.0.2-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 20:00:05 +0200 + postgresql-ocaml (1.18.0-1) unstable; urgency=low * New upstream release -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, pristine-tar, updated. 322fb5cf020e930eac8a1be43ce06b0ba5011df4
The following commit has been merged in the pristine-tar branch: commit 1c700709c51485d74eaa755eb3d820b384b4e426 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 19:59:40 2013 +0200 pristine-tar data for postgresql-ocaml_2.0.0.orig.tar.gz diff --git a/postgresql-ocaml_2.0.0.orig.tar.gz.delta b/postgresql-ocaml_2.0.0.orig.tar.gz.delta new file mode 100644 index 000..c498086 Binary files /dev/null and b/postgresql-ocaml_2.0.0.orig.tar.gz.delta differ diff --git a/postgresql-ocaml_2.0.0.orig.tar.gz.id b/postgresql-ocaml_2.0.0.orig.tar.gz.id new file mode 100644 index 000..7e7981c --- /dev/null +++ b/postgresql-ocaml_2.0.0.orig.tar.gz.id @@ -0,0 +1 @@ +00776f4a628ef1a0856b036152295da6b5b9403a -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, pristine-tar, updated. 322fb5cf020e930eac8a1be43ce06b0ba5011df4
The following commit has been merged in the pristine-tar branch: commit 322fb5cf020e930eac8a1be43ce06b0ba5011df4 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 19:59:49 2013 +0200 pristine-tar data for postgresql-ocaml_2.0.2.orig.tar.gz diff --git a/postgresql-ocaml_2.0.2.orig.tar.gz.delta b/postgresql-ocaml_2.0.2.orig.tar.gz.delta new file mode 100644 index 000..d184954 Binary files /dev/null and b/postgresql-ocaml_2.0.2.orig.tar.gz.delta differ diff --git a/postgresql-ocaml_2.0.2.orig.tar.gz.id b/postgresql-ocaml_2.0.2.orig.tar.gz.id new file mode 100644 index 000..cf15285 --- /dev/null +++ b/postgresql-ocaml_2.0.2.orig.tar.gz.id @@ -0,0 +1 @@ +3202883a381a78e90b48598968a534a8aa8f188d -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-6-g3d594f9
The following commit has been merged in the master branch: commit a23e6d914d9a8dac33588abbf84135e0ea89cea5 Merge: 6a927d09b2b1d3fff9a71f2e7e8a8f5d794e5402 9fbe4e4c09b02bf095452f76c1a0ac0451d19862 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 19:59:49 2013 +0200 Merge tag 'upstream/2.0.2' Upstream version 2.0.2 -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging annotated tag, upstream/2.0.0, created. upstream/2.0.0
The annotated tag, upstream/2.0.0 has been created at 58322076080b631ce781407c2b6e571ebd4dc3b5 (tag) tagging 6d3a7bb5d789425d2d085bea024208e70cc0867e (commit) replaces upstream/1.18.0 tagged by Stephane Glondu on Wed May 8 19:59:40 2013 +0200 - Shortlog Upstream version 2.0.0 Stephane Glondu (1): Imported Upstream version 2.0.0 --- -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging annotated tag, upstream/2.0.2, created. upstream/2.0.2
The annotated tag, upstream/2.0.2 has been created at 8e16aa0452132465305632bca2beb349e221fe15 (tag) tagging 9fbe4e4c09b02bf095452f76c1a0ac0451d19862 (commit) replaces upstream/2.0.0 tagged by Stephane Glondu on Wed May 8 19:59:49 2013 +0200 - Shortlog Upstream version 2.0.2 Stephane Glondu (1): Imported Upstream version 2.0.2 --- -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-9-g6f8cd6d
The following commit has been merged in the master branch: commit 3b6dc8cbd544a162f902c5353a6b2e8e8a43a53a Author: Stephane Glondu st...@glondu.net Date: Wed May 8 20:13:45 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index b74395f..5730073 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: ocaml-findlib (= 1.2.5), libpq-dev, dh-ocaml (= 0.9.6~) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/postgresql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/postgresql-ocaml.git Homepage: http://www.ocaml.info/home/ocaml_sources.html#postgresql-ocaml -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-9-g6f8cd6d
The following commit has been merged in the master branch: commit 8c24aa3c55bc98acd4cd20dd95b5dd3331db122a Author: Stephane Glondu st...@glondu.net Date: Wed May 8 20:11:36 2013 +0200 Adapt packaging to new build system diff --git a/debian/control b/debian/control index ccef075..b74395f 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,7 @@ Build-Depends: ocaml-nox (= 3.11.1-3~), ocaml-findlib (= 1.2.5), libpq-dev, - dh-ocaml (= 0.9.6~), - cdbs + dh-ocaml (= 0.9.6~) Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/postgresql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/postgresql-ocaml.git diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 71dfd5b..000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.txt diff --git a/debian/libpostgresql-ocaml-dev.doc-base b/debian/libpostgresql-ocaml-dev.doc-base new file mode 100644 index 000..eef8075 --- /dev/null +++ b/debian/libpostgresql-ocaml-dev.doc-base @@ -0,0 +1,9 @@ +Document: libpostgresql-ocaml-dev +Title: API for PostgreSQL bindings +Author: Markus Mottl +Abstract: Ocamldoc-generated documentation for OCaml PostgreSQL bindings +Section: Programming/OCaml + +Format: HTML +Index: /usr/share/doc/libpostgresql-ocaml-dev/api/index.html +Files: /usr/share/doc/libpostgresql-ocaml-dev/api/*.html diff --git a/debian/libpostgresql-ocaml-dev.docs b/debian/libpostgresql-ocaml-dev.docs new file mode 100644 index 000..b43bf86 --- /dev/null +++ b/debian/libpostgresql-ocaml-dev.docs @@ -0,0 +1 @@ +README.md diff --git a/debian/libpostgresql-ocaml-dev.install.in b/debian/libpostgresql-ocaml-dev.install.in index 99505d1..7b22a4b 100644 --- a/debian/libpostgresql-ocaml-dev.install.in +++ b/debian/libpostgresql-ocaml-dev.install.in @@ -3,4 +3,5 @@ @OCamlStdlibDir@/postgresql/lib*.a OPT: @OCamlStdlibDir@/postgresql/*.a OPT: @OCamlStdlibDir@/postgresql/*.cmxa -OPT: lib/postgresql.cmx @OCamlStdlibDir@/postgresql +OPT: @OCamlStdlibDir@/postgresql/*.cmx +usr/share/doc/postgresql-ocaml/api usr/share/doc/libpostgresql-ocaml-dev/ diff --git a/debian/libpostgresql-ocaml-dev.ocamldoc b/debian/libpostgresql-ocaml-dev.ocamldoc deleted file mode 100644 index 1bfdd46..000 --- a/debian/libpostgresql-ocaml-dev.ocamldoc +++ /dev/null @@ -1 +0,0 @@ -# This file must not be empty to be represented in .diff.gz! diff --git a/debian/libpostgresql-ocaml.install.in b/debian/libpostgresql-ocaml.install.in index 2b649b9..a1440f3 100644 --- a/debian/libpostgresql-ocaml.install.in +++ b/debian/libpostgresql-ocaml.install.in @@ -1,4 +1,4 @@ -debian/tmp@OCamlStdlibDir@/postgresql/*.so @OCamlDllDir@ +@OCamlDllDir@/*.so @OCamlDllDir@ @OCamlStdlibDir@/postgresql/META @OCamlStdlibDir@/postgresql/*.cma -DYN: lib/postgresql.cmxs @OCamlStdlibDir@/postgresql +DYN: @OCamlStdlibDir@/postgresql/*.cmxs diff --git a/debian/patches/0001-DESTDIR-in-Makefiles.patch b/debian/patches/0001-DESTDIR-in-Makefiles.patch deleted file mode 100644 index ca70815..000 --- a/debian/patches/0001-DESTDIR-in-Makefiles.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Stephane Glondu st...@glondu.net -Date: Mon, 7 Sep 2009 09:47:23 +0200 -Subject: DESTDIR in Makefiles - -Enable passing target installation directory from debian/rules. - -Signed-off-by: Stefano Zacchiroli z...@debian.org -Signed-off-by: Stephane Glondu st...@glondu.net - OCamlMakefile |3 +++ - lib/Makefile |2 ++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/OCamlMakefile b/OCamlMakefile -index b8898ad..2ba893d 100644 a/OCamlMakefile -+++ b/OCamlMakefile -@@ -1211,12 +1211,14 @@ subprojs: $(SUBPROJS:%=subproj_%) - .PHONY: libinstall - libinstall: all - $(QUIET)printf \nInstalling library with ocamlfind\n -+ test -d $(DESTDIR) || mkdir -p $(DESTDIR) - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META $(LIBINSTALL_FILES) - $(QUIET)printf \nInstallation successful.\n - - .PHONY: libinstall-byte-code - libinstall-byte-code: all - $(QUIET)printf \nInstalling byte-code library with ocamlfind\n -+ test -d $(DESTDIR) || mkdir -p $(DESTDIR) - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \ - $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES)) - $(QUIET)printf \nInstallation successful.\n -@@ -1224,6 +1226,7 @@ libinstall-byte-code:all - .PHONY: libinstall-native-code - libinstall-native-code: all - $(QUIET)printf \nInstalling native-code library with ocamlfind\n -+ test -d $(DESTDIR) || mkdir -p $(DESTDIR) - $(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \ - $(filter-out $(DLLSONAME) $(RESULT).cma, $(LIBINSTALL_FILES)) - $(QUIET)printf \nInstallation successful.\n -diff --git a/lib/Makefile b/lib/Makefile -index 008e028..c458f4e 100644 a/lib/Makefile -+++ b/lib/Makefile -@@ -10,6 +10,8 @@ CLIBS = pq - LIBS= threads - RESULT = postgresql -
[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.18.0-1-9-g6f8cd6d
The following commit has been merged in the master branch: commit 6f8cd6d2b8fa2d2418e9949a5dac05c0b965227e Author: Stephane Glondu st...@glondu.net Date: Wed May 8 20:14:19 2013 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 415072c..fa24b6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -postgresql-ocaml (2.0.2-1) UNRELEASED; urgency=low +postgresql-ocaml (2.0.2-1) unstable; urgency=low * New upstream release + * Do no longer use CDBS + * Bump Standards-Version to 3.9.4 - -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 20:00:05 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 20:14:08 +0200 postgresql-ocaml (1.18.0-1) unstable; urgency=low -- postgresql-ocaml packaging ___ 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] [SCM] postgresql-ocaml packaging annotated tag, debian/2.0.2-1, created. debian/2.0.2-1
The annotated tag, debian/2.0.2-1 has been created at a4ea18e5d834715fcdbb907c50c8aea209b1d5c3 (tag) tagging 6f8cd6d2b8fa2d2418e9949a5dac05c0b965227e (commit) replaces debian/1.18.0-1 tagged by Stephane Glondu on Wed May 8 20:18:30 2013 +0200 - Shortlog postgresql-ocaml Debian release 2.0.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRipb2AAoJEHhT2k1JiBrT7R4P/27U2O3RPz6ebFFrqYougSu6 EySoUHMW690/KBGSwNyBErrMKWB6b8IMJCynvfNmLOj0DYbqNmEsbyU4NrE9qMje fUCpTAjq3hncP6WeoDb+ERZF45UapVu3dCRrMkD2pm0Ppu/yrl2emgg1VHej32O8 3oXgaZFudJYPbWsT5ptFlR1jdPCPINtxDxC8kj3CbmFcNNTkx9nr02AcmOsBzSoo yVKUyLN694PVVvAsgd9fBgpuKrzKQIS8Re6vY25y+DNaNdb06IzQf1QY2WFHwGTP OF3w4ZgtGHkxGLW9vd2x2krW7R1ZWHgU9F/ZKL+8BOlmyah4MDHRM3sp6usnuAWw ASXMfmFAaFFIjgM08/ObqSkI8KWUoCxqk4uZ5TBjBKA47pDhxKEzl5hw4/gv9rVl F5iXUxldsJV6HjcrML6lmLcWc9edL5K5KI8Ufx6UCbl0FqB1uuMvVE0VFiMMFW/6 3fFoAcRpnna4joy78sjCISnVIdpePPqqW7mHvy7tft41hPk6bcPCXz4BmfJ+v98T DEk/h32LJ3U/J16Domk72rqkDl8ybZyOMA5RzQrxKDfQ09Xa4+Kr9Z+rwreWAylo 1lME9xEL8dahEV7QlQu4WLsNRAYwK8EE4yTiklnXx1X52obkAoVwjd7k9jPxtEKK ngfNjoZV4W3SbVsjuPf7 =062O -END PGP SIGNATURE- Stephane Glondu (8): New debian/watch file by Bart Martens Imported Upstream version 2.0.0 Imported Upstream version 2.0.2 Merge tag 'upstream/2.0.2' New upstream release Adapt packaging to new build system Bump Standards-Version to 3.9.4 Update changelog and prepare upload to unstable --- -- postgresql-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.5-1-11-gcd0ddef
The following commit has been merged in the master branch: commit cd0ddef8f2a2ec75261bfa5434a4f6f585fbc522 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 20:19:14 2013 +0200 Prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 362402d..1644af4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -pcre-ocaml (7.0.2-1) UNRELEASED; urgency=low +pcre-ocaml (7.0.2-1) unstable; urgency=low * New upstream release * Do no longer use CDBS * 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 16:37:12 +0200 + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 20:19:11 +0200 pcre-ocaml (6.2.5-1) unstable; urgency=low -- pcre-ocaml packaging ___ 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] [SCM] pcre-ocaml packaging annotated tag, debian/7.0.2-1, created. debian/7.0.2-1
The annotated tag, debian/7.0.2-1 has been created at 25f9ebaad388fca113a9a86bee2d9992491a6c9e (tag) tagging cd0ddef8f2a2ec75261bfa5434a4f6f585fbc522 (commit) replaces debian/6.2.5-1 tagged by Stephane Glondu on Wed May 8 20:21:09 2013 +0200 - Shortlog pcre-ocaml Debian release 7.0.2-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRipeVAAoJEHhT2k1JiBrTKIUQALfv4NeAVVMCKXyc+NqNyEa3 egFwOPxEvsCFWVHOYlJ9UwPhMdE8CsDeJTrRN7qwJnwanq/myl+M9zlWEbyWE7PV N+LHbbw9HdMrKO8IRKVdDYELf/ZodBNSTx5vKCrvVwvUX1fogF85Un+FEjpIVi7r zI3FHbHFGFR/4xMsV252jmsCH7htpcPgv0+ngoJJ3Io0XsJlBgl1QX+A75uHiVY9 +OfhFCq+8c5xBYz4UKO3Pl76ziSJlwQlWDSTA4q/YMX4hTwFXa66mPjKePXGM8M4 2qaOj/MAfz5J1wOpztqpEs7JBUSRibFsI/ZpCriS2F7I9AO5kXhTR11t7W9cRog8 Kdscs5Hesf/WYXBFBfvGDFtusECd8xDA0nZOe6BdIKaPY0OST9ztmMtGBkAf/MlM Gax5Rev4YHGmzj2Mj8Irzcact2Qh9Mti5FS3rTm8FTiYbz3TqLIOea32VcwvkQc8 fKt0mRRxe+Nz2B8iU3IdyKV6ECWf31xyPwPJxo6IpIOSWhhnrrcXezBEFfdyWpIY 9AthfNwq16jD8F9KyiMg0SYG/eq9qX5XtFjBHHuLXP1zJFQiNXzZBiNrn00ArtMZ XjyrK4jiVw/mH+Eq3p0uJoGsEB2iL9y0fikhdUnxDqnRbOUv+qGSW851BfIq2xBq AuT6YtwV0LUDOqBKnRYS =O4Gg -END PGP SIGNATURE- Stephane Glondu (11): New debian/watch file by Bart Martens Imported Upstream version 7.0.0 Imported Upstream version 7.0.1 Imported Upstream version 7.0.2 Merge tag 'upstream/7.0.2' New upstream release Adapt packaging to new build system Use format version 1.0 in debian/copyright Bump Standards-Version to 3.9.4 Update changelog Prepare upload to unstable --- -- pcre-ocaml packaging ___ 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] [SCM] coq-float packaging branch, master, updated. debian/1%8.3pl1-4-7-g724af20
The following commit has been merged in the master branch: commit b52f42e5f2175cd26fa085ecd6a34a8aa75acb93 Merge: 848fff6e04bf956cb06579cfc917c1c1d226e161 7acde75d333cf94031367620e32b91714f5adb2c Author: Stephane Glondu st...@glondu.net Date: Wed May 8 23:24:10 2013 +0200 Merge tag 'upstream/8.4' Upstream version 8.4 -- coq-float packaging ___ 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] [SCM] coq-float packaging branch, master, updated. debian/1%8.3pl1-4-7-g724af20
The following commit has been merged in the master branch: commit c5df335a1c4607f8e238f347ec40710bd3532419 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 23:24:42 2013 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 63537b6..1572341 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coq-float (1:8.4-1) UNRELEASED; urgency=low + + * New upstream release + + -- Stéphane Glondu glo...@debian.org Wed, 08 May 2013 23:24:23 +0200 + coq-float (1:8.3pl1-4) unstable; urgency=low * Recompile with camlp5 6.06 (no changes) -- coq-float packaging ___ 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] [SCM] coq-float packaging branch, master, updated. debian/1%8.3pl1-4-7-g724af20
The following commit has been merged in the master branch: commit 4b875655d21eca19ad611aa4ba46aaaff96e41d0 Author: Stephane Glondu st...@glondu.net Date: Wed May 8 23:27:42 2013 +0200 Bump Standards-Version to 3.9.4 diff --git a/debian/control b/debian/control index e77dc1d..f523d2c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Samuel Mimram smim...@debian.org, Stéphane Glondu glo...@debian.org Build-Depends: debhelper (= 7.0.50~), coq (= 8.3) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://lipforge.ens-lyon.fr/www/pff/ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/coq-float.git Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/coq-float.git -- coq-float packaging ___ 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] [SCM] coq-float packaging branch, master, updated. debian/1%8.3pl1-4-7-g724af20
The following commit has been merged in the master branch: commit 7bf226a7f0a8599f4d59d6500b537ecebd272a1f Author: Stephane Glondu st...@glondu.net Date: Wed May 8 23:27:28 2013 +0200 Use format version 1.0 in debian/copyright diff --git a/debian/copyright b/debian/copyright index 6bb25f7..267ab61 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,41 +1,40 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Packaged-By: Samuel Mimram smim...@debian.org Packaged-Date: Fri, 10 Aug 2007 14:48:56 + -Upstream-Author: - Laurent Théry th...@sophia.inria.fr, - Sylvie Boldo sylvie.bo...@ens-lyon.fr, - Laurence Rideau l...@sophia.inria.fr, - Laurent Fousse -Original-Source-Location: http://lipforge.ens-lyon.fr/www/pff/ +Upstream-Contact: + Laurent Théry th...@sophia.inria.fr, + Sylvie Boldo sylvie.bo...@ens-lyon.fr, + Laurence Rideau l...@sophia.inria.fr, + Laurent Fousse +Source: http://lipforge.ens-lyon.fr/www/pff/ Files: * -Copyright: © 2001-2002 Sylvie Boldo - © 2001 Laurent Théry - © 2001 Laurence Rideau - © 2001 Laurent Fousse +Copyright: 2001-2002, Sylvie Boldo + 2001, Laurent Théry + 2001, Laurence Rideau + 2001, Laurent Fousse License: LGPL-2+ - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This package is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 - USA - - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in `/usr/share/common-licenses/LGPL-2'. + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + USA + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2'. Files: debian/* -Copyright: © 2007 Samuel Mimram smim...@debian.org - © 2009 Stéphane Glondu st...@glondu.net +Copyright: 2007, Samuel Mimram smim...@debian.org + 2009, Stéphane Glondu st...@glondu.net License: GPL-2+ - - The Debian packaging is licensed under the GPL, see - `/usr/share/common-licenses/GPL-2'. + The Debian packaging is licensed under the GPL, see + `/usr/share/common-licenses/GPL-2'. -- coq-float packaging ___ 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] [SCM] coq-float packaging annotated tag, upstream/8.4, created. upstream/8.4
The annotated tag, upstream/8.4 has been created at 052e6b2b66ce44041a8ef0158243d172e0463434 (tag) tagging 7acde75d333cf94031367620e32b91714f5adb2c (commit) replaces upstream/8.3pl1 tagged by Stephane Glondu on Wed May 8 23:24:09 2013 +0200 - Shortlog Upstream version 8.4 Stephane Glondu (1): Imported Upstream version 8.4 --- -- coq-float packaging ___ 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] [SCM] coq-float packaging annotated tag, debian/1%8.4-1, created. debian/1%8.4-1
The annotated tag, debian/1%8.4-1 has been created at deea4a0c2d262775f41d77d4bd02ea40c98a44e4 (tag) tagging 724af201581b03b63d7f7d9634c38d3f25883bc4 (commit) replaces debian/1%8.3pl1-4 tagged by Stephane Glondu on Thu May 9 00:49:27 2013 +0200 - Shortlog coq-float Debian release 1:8.4-1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABCgAGBQJRitZ3AAoJEHhT2k1JiBrToa8P/RTejD/wvdEVjDWVCgtThjZN RfoFJI5/kyhMD6+Yh1OwKAVDyI7dGAisFZajf9jiD691qT1cTrSHOua/DU9rJsf3 YeTykalPUotJ4Sdg+2Vekk2hPT3Wp2f/p/QUsEGJyUH0cPI8TisGeRckA/DpLhjZ mO9d1rabe0ZbsNN135uuIRyqXdNnlXoq30TTAcV/Lw/D0CbSyydv5uzFDPjPacgH sMQ3sniYCyiK02va9KQXywo8+gGd8ujZL4b8rXepDKVH5BxMk9ezthRJMjYOh/Tx EOyMQjbLJ4VGVCXiogSnH+VrnXc56DKOGtFcWkYNJ0HBJTaWVOt6UDRJfUquIbt3 prC0muAjevIhCdRtTHBbcW86oWEzGgIvMfk1DCwVs89BF53KQ/+nJkQ3OCz3F5zJ jMFSBGVd2IojArTm0P3yOH2PopmD6S+HHKuPjFteakuIiS5WqoNTYE3qmnW2Cdhr MiGcbjJ7hnkY63rTKbIFpDojO4r6fShA3ku0sUb4nI7isgU/Txm7E3SrlrsV/+Zz 4Jl/1IBJGXpAX7u+IVyys/c4k2aICZ0JgednKGS7q77FqBXF/ZpP2x1n98BOJ/Ro M+I3kXkbFavwCj/eqZJjFMt3IERFNrwFGpxMbKMivr/Ak6VLCw9iRZXerupKsZ6q o9bZeHUADxBbJNPNmV2H =/qyo -END PGP SIGNATURE- Stephane Glondu (7): Imported Upstream version 8.4 Merge tag 'upstream/8.4' New upstream release Use format version 1.0 in debian/copyright Bump Standards-Version to 3.9.4 Bump debhelper compat level to 9 Update changelog and prepare upload to unstable --- -- coq-float packaging ___ 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] [SCM] ocaml-bjack packaging branch, master, updated. debian/0.1.4-1-1-g9ef434b
The following commit has been merged in the master branch: commit 9ef434b0cca7c649171135799513d14d85052399 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:51:24 2013 -0500 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 76bfc9d..06b1962 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-bjack (0.1.4-2) unstable; urgency=low + + * Upload to unstable. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 18:51:04 -0500 + ocaml-bjack (0.1.4-1) experimental; urgency=low * New upstream release. -- ocaml-bjack packaging ___ 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] [SCM] ocaml-bjack packaging annotated tag, debian/0.1.4-2, created. debian/0.1.4-2
The annotated tag, debian/0.1.4-2 has been created at 9840d963f57587cd50bbba40335170a56ff0d7f1 (tag) tagging 9ef434b0cca7c649171135799513d14d85052399 (commit) replaces debian/0.1.4-1 tagged by Romain Beauxis on Wed May 8 18:52:28 2013 -0500 - Shortlog Debian release 0.1.4-2 Romain Beauxis (1): Upload to unstable. --- -- ocaml-bjack packaging ___ 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] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit 2a6ec81aa2b72a7c07c99b627cb0ad16c2fc2987 Merge: dfe8006376b3f2cbf163cda89cd422028c691a51 c4bfa358a86bdd9ee2911b30d9283b9ac26ca465 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 4 23:28:34 2013 -0600 Merge tag 'upstream/0.5.0' Upstream version 0.5.0 -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch:
commit 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169
Author: Romain Beauxis to...@rastageeks.org
Date: Wed May 8 18:55:47 2013 -0500
Imported Upstream version 0.5.1
diff --git a/CHANGES b/CHANGES
index 87fd795..8519488 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.5.1 (05-08-2013)
+=
+* Removed win32 select work-around: patch applied upstream.
+
0.5.0 (04-03-2013)
=
* Remove Panic exception and let original exception bubble through.
diff --git a/configure b/configure
index d2503fe..d18d7a1 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.0.
+# Generated by GNU Autoconf 2.69 for ocaml-duppy 0.5.1.
#
# Report bugs to savonet-us...@lists.sourceforge.net.
#
@@ -639,8 +639,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ocaml-duppy'
PACKAGE_TARNAME='ocaml-duppy'
-PACKAGE_VERSION='0.5.0'
-PACKAGE_STRING='ocaml-duppy 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='ocaml-duppy 0.5.1'
PACKAGE_BUGREPORT='savonet-us...@lists.sourceforge.net'
PACKAGE_URL=''
@@ -673,9 +673,11 @@ OCAMLLEXDOTOPT
OCAMLLEX
CAMLIDL
OCAMLBUILD
+OCAMLDOCOPT
OCAMLDOC
OCAMLMKLIB
OCAMLMKTOP
+OCAMLDEPOPT
OCAMLDEP
OCAML
OCAMLOPTDOTOPT
@@ -1309,7 +1311,7 @@ if test $ac_init_help = long; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat _ACEOF
-\`configure' configures ocaml-duppy 0.5.0 to adapt to many kinds of systems.
+\`configure' configures ocaml-duppy 0.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1374,7 +1376,7 @@ fi
if test -n $ac_init_help; then
case $ac_init_help in
- short | recursive ) echo Configuration of ocaml-duppy 0.5.0:;;
+ short | recursive ) echo Configuration of ocaml-duppy 0.5.1:;;
esac
cat \_ACEOF
@@ -1478,7 +1480,7 @@ fi
test -n $ac_init_help exit $ac_status
if $ac_init_version; then
cat \_ACEOF
-ocaml-duppy configure 0.5.0
+ocaml-duppy configure 0.5.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1564,7 +1566,7 @@ cat config.log _ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ocaml-duppy $as_me 0.5.0, which was
+It was created by ocaml-duppy $as_me 0.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3956,6 +3958,48 @@ fi
if test $OCAMLDEP = no; then
as_fn_error $? Cannot find ocamlmklib. $LINENO 5
+ else
+# Extract the first word of ${ac_tool_prefix}ocamldep.opt, so it can be
a program name with args.
+set dummy ${ac_tool_prefix}ocamldep.opt; ac_word=$2
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $ac_word 5
+$as_echo_n checking for $ac_word... 6; }
+if ${ac_cv_prog_OCAMLDEPOPT+:} false; then :
+ $as_echo_n (cached) 6
+else
+ if test -n $OCAMLDEPOPT; then
+ ac_cv_prog_OCAMLDEPOPT=$OCAMLDEPOPT # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z $as_dir as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p $as_dir/$ac_word$ac_exec_ext; then
+ac_cv_prog_OCAMLDEPOPT=${ac_tool_prefix}ocamldep.opt
+$as_echo $as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext
5
+break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z $ac_cv_prog_OCAMLDEPOPT ac_cv_prog_OCAMLDEPOPT=no
+fi
+fi
+OCAMLDEPOPT=$ac_cv_prog_OCAMLDEPOPT
+if test -n $OCAMLDEPOPT; then
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: $OCAMLDEPOPT 5
+$as_echo $OCAMLDEPOPT 6; }
+else
+ { $as_echo $as_me:${as_lineno-$LINENO}: result: no 5
+$as_echo no 6; }
+fi
+
+
+if test $OCAMLDEPOPT != no; then
+ OCAMLDEP=$OCAMLDEPOPT
+fi
fi
@@ -4140,6 +4184,103 @@ else
OCAMLDOC=$ac_cv_prog_OCAMLDOC
fi
+ if test $OCAMLDOC != no; then
+if test -n $ac_tool_prefix; then
+ # Extract the first word of ${ac_tool_prefix}ocamldoc.opt, so it can be a
program name with args.
+set dummy ${ac_tool_prefix}ocamldoc.opt; ac_word=$2
+{ $as_echo $as_me:${as_lineno-$LINENO}: checking for $ac_word 5
+$as_echo_n checking for $ac_word... 6; }
+if ${ac_cv_prog_OCAMLDOCOPT+:} false; then :
+ $as_echo_n (cached) 6
+else
+ if test -n $OCAMLDOCOPT; then
+ ac_cv_prog_OCAMLDOCOPT=$OCAMLDOCOPT # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z $as_dir as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p $as_dir/$ac_word$ac_exec_ext; then
+ac_cv_prog_OCAMLDOCOPT=${ac_tool_prefix}ocamldoc.opt
+$as_echo $as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext
5
+
[Pkg-ocaml-maint-commits] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit b360bd0036eb883a83e49d05f2a05ad985c6638b Merge: 2a6ec81aa2b72a7c07c99b627cb0ad16c2fc2987 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:55:48 2013 -0500 Merge tag 'upstream/0.5.1' Upstream version 0.5.1 -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, master, updated. debian/0.5.0-1-6-gb988c94
The following commit has been merged in the master branch: commit 4745a10760700723b2b50eaa0ba2117bbd9110a5 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:56:40 2013 -0500 New upstream release. diff --git a/debian/changelog b/debian/changelog index 651cf03..73c18bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml-duppy (0.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Romain Beauxis to...@rastageeks.org Wed, 08 May 2013 18:55:54 -0500 + ocaml-duppy (0.4.2-1) unstable; urgency=low * New upstream release. -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 88d475c3569b56b1321d57a7bd33add7694621e5 Author: Romain Beauxis to...@rastageeks.org Date: Mon Mar 4 23:28:33 2013 -0600 pristine-tar data for ocaml-duppy_0.5.0.orig.tar.gz diff --git a/ocaml-duppy_0.5.0.orig.tar.gz.delta b/ocaml-duppy_0.5.0.orig.tar.gz.delta new file mode 100644 index 000..5f756e7 Binary files /dev/null and b/ocaml-duppy_0.5.0.orig.tar.gz.delta differ diff --git a/ocaml-duppy_0.5.0.orig.tar.gz.id b/ocaml-duppy_0.5.0.orig.tar.gz.id new file mode 100644 index 000..14f05ae --- /dev/null +++ b/ocaml-duppy_0.5.0.orig.tar.gz.id @@ -0,0 +1 @@ +555c800a1382b41bd5730eaecd29fb9f553d8714 -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 1c13a5c47990f046e29ffd186592756de5fdcbda Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 18:55:47 2013 -0500 pristine-tar data for ocaml-duppy_0.5.1.orig.tar.gz diff --git a/ocaml-duppy_0.5.1.orig.tar.gz.delta b/ocaml-duppy_0.5.1.orig.tar.gz.delta new file mode 100644 index 000..31779df Binary files /dev/null and b/ocaml-duppy_0.5.1.orig.tar.gz.delta differ diff --git a/ocaml-duppy_0.5.1.orig.tar.gz.id b/ocaml-duppy_0.5.1.orig.tar.gz.id new file mode 100644 index 000..b5b1bb5 --- /dev/null +++ b/ocaml-duppy_0.5.1.orig.tar.gz.id @@ -0,0 +1 @@ +901409500ffe5a1dfe28a87d8b3719174713b8c3 -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, pristine-tar, updated. 8de83c3c674f3eaa2f3d4c280d035788c9801c26
The following commit has been merged in the pristine-tar branch: commit 8de83c3c674f3eaa2f3d4c280d035788c9801c26 Merge: 1c13a5c47990f046e29ffd186592756de5fdcbda d275606a619e15cc0f8fdfbde9ee439b0ae2c79d Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:01:01 2013 -0500 Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy into pristine-tar -- ocaml-duppy packaging ___ 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] [SCM] ocaml-duppy packaging branch, upstream, updated. upstream/0.5.0-3-g68fa9f0
The following commit has been merged in the upstream branch: commit 68fa9f0ed802fb804a82c3754aa6ba8be893043b Merge: 8a6d6c8b0dbf5d491f71cabb884c8fcf6657f169 0606ca88badfe2c2ab9015af8496ec2f2ec55056 Author: Romain Beauxis to...@rastageeks.org Date: Wed May 8 19:01:11 2013 -0500 Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-duppy into upstream -- ocaml-duppy packaging ___ 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
