[Pkg-ocaml-maint-commits] [SCM] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.1-1-5-g3281c74

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 2e0c0a04560b0fa2e31ae0f4f0f1179c02a40085
Merge: 374eb828d863f84e09413877c40ca17e60f62e07 
06a53414622712cda6316bfd75f83a53c3da60db
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 10:09:20 2011 +0100

Merge commit 'upstream/2.3.2'


-- 
Cooperative light-weight thread library for OCaml

___
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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.1-1-5-g3281c74

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit f7ae39a5a610050b2653294986c66d6427bb25d3
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 10:09:34 2011 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index cb203bc..8eb7715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lwt (2.3.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 10:09:28 +0100
+
 lwt (2.3.1-1) unstable; urgency=low
 
   * New upstream release

-- 
Cooperative light-weight thread library for OCaml

___
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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.1-1-5-g3281c74

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 3281c74f058dc36ab619008cc852301f6bf66ced
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 10:10:09 2011 +0100

Refresh patches

diff --git a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch 
b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
index 05af968..3a8b94e 100644
--- a/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
+++ b/debian/patches/0001-Do-not-build-manual-manual.pdf.patch
@@ -7,7 +7,7 @@ Subject: Do not build manual/manual.pdf
  1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/setup.ml b/setup.ml
-index 8e925d1..91ad1db 100644
+index f799762..89f1a90 100644
 --- a/setup.ml
 +++ b/setup.ml
 @@ -5160,7 +5160,7 @@ let setup_t =
diff --git a/debian/patches/0002-fix-a-race-condition-in-Lwt_io.patch 
b/debian/patches/0002-fix-a-race-condition-in-Lwt_io.patch
deleted file mode 100644
index 2dac1fe..000
--- a/debian/patches/0002-fix-a-race-condition-in-Lwt_io.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From: Jeremie Dimino jere...@dimino.org
-Date: Thu, 28 Jul 2011 13:23:03 +0200
-Subject: fix a race condition in Lwt_io
-
-Origin: 
http://ocsigen.org/darcsweb/?r=lwt;a=commit;h=20110718145731-c41ad-7ced2812fef6069e83864996a274e5e55db1aaf4.gz

- src/unix/lwt_io.ml |   30 ++
- 1 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/src/unix/lwt_io.ml b/src/unix/lwt_io.ml
-index ce2b36c..28d8935 100644
 a/src/unix/lwt_io.ml
-+++ b/src/unix/lwt_io.ml
-@@ -58,6 +58,9 @@ type 'mode state =
-   (* An atomic operations is being performed on the channel. The
-  argument is the temporary atomic wrapper. *)
- 
-+  | Waiting_for_busy
-+  (* A queued operation has not yet started. *)
-+
-   | Idle
-   (* The channel is unused *)
- 
-@@ -169,7 +172,7 @@ let is_busy ch =
- raise (invalid_channel ch.channel)
- | Idle | Closed -
- false
--| Busy_primitive | Busy_atomic _ -
-+| Busy_primitive | Busy_atomic _ | Waiting_for_busy -
- true
- 
- (* Flush/refill the buffer. No race condition could happen because
-@@ -226,7 +229,7 @@ let perform_io ch = match ch.main.state with
-   | Invalid -
-   raise_lwt (invalid_channel ch)
- 
--  | Idle -
-+  | Idle | Waiting_for_busy -
-   assert false
- 
- let refill = perform_io
-@@ -259,7 +262,7 @@ let auto_flush oc =
-   lwt () = Lwt.pause () in
-   let wrapper = deepest_wrapper oc in
-   match wrapper.state with
--| Busy_primitive -
-+| Busy_primitive | Waiting_for_busy -
- (* The channel is used, cancel auto flushing. It will be
-restarted when the channel returns to the [Idle] state: *)
- oc.auto_flushing - false;
-@@ -287,9 +290,12 @@ let auto_flush oc =
- 
- let unlock wrapper = match wrapper.state with
-   | Busy_primitive | Busy_atomic _ -
--  wrapper.state - Idle;
--  if not (Lwt_sequence.is_empty wrapper.queued) then
--wakeup_later (Lwt_sequence.take_l wrapper.queued) ();
-+  if Lwt_sequence.is_empty wrapper.queued then
-+wrapper.state - Idle
-+  else begin
-+wrapper.state - Waiting_for_busy;
-+wakeup_later (Lwt_sequence.take_l wrapper.queued) ()
-+  end;
-   (* Launches the auto-flusher: *)
-   let ch = wrapper.channel in
-   if (* Launch the auto-flusher only if the channel is not busy: *)
-@@ -309,7 +315,7 @@ let unlock wrapper = match wrapper.state with
-   if not (Lwt_sequence.is_empty wrapper.queued) then
- wakeup_later (Lwt_sequence.take_l wrapper.queued) ()
- 
--  | Idle -
-+  | Idle | Waiting_for_busy -
-   (* We must never unlock an unlocked channel *)
-   assert false
- 
-@@ -323,7 +329,7 @@ let primitive f wrapper = match wrapper.state with
- unlock wrapper;
- return ()
- 
--  | Busy_primitive | Busy_atomic _ -
-+  | Busy_primitive | Busy_atomic _ | Waiting_for_busy -
-   let (res, w) = task () in
-   let node = Lwt_sequence.add_r w wrapper.queued in
-   Lwt.on_cancel res (fun _ - Lwt_sequence.remove node);
-@@ -334,7 +340,7 @@ let primitive f wrapper = match wrapper.state with
- unlock wrapper;
- raise_lwt (closed_channel wrapper.channel)
- 
--| Idle -
-+| Idle | Waiting_for_busy -
- wrapper.state - Busy_primitive;
- try_lwt
-   f wrapper.channel
-@@ -370,7 +376,7 @@ let atomic f wrapper = match wrapper.state with
- unlock wrapper;
- return ()
- 
--  | Busy_primitive | Busy_atomic _ -
-+  | Busy_primitive | Busy_atomic _ | Waiting_for_busy -
-   let (res, w) = task () in
-   let node = Lwt_sequence.add_r w wrapper.queued in
-   Lwt.on_cancel res (fun _ - Lwt_sequence.remove node);
-@@ -381,7 +387,7 @@ let atomic f wrapper = match wrapper.state with
- unlock wrapper;
- raise_lwt (closed_channel wrapper.channel)
- 
--| Idle -
-+| Idle |

[Pkg-ocaml-maint-commits] [SCM] Cooperative light-weight thread library for OCaml branch, pristine-tar, updated. 6ba2d1011fdd66189d86e92821544e7864d2ebc0

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the pristine-tar branch:
commit 6ba2d1011fdd66189d86e92821544e7864d2ebc0
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 10:09:20 2011 +0100

pristine-tar data for lwt_2.3.2.orig.tar.gz

diff --git a/lwt_2.3.2.orig.tar.gz.delta b/lwt_2.3.2.orig.tar.gz.delta
new file mode 100644
index 000..a2f2c93
Binary files /dev/null and b/lwt_2.3.2.orig.tar.gz.delta differ
diff --git a/lwt_2.3.2.orig.tar.gz.id b/lwt_2.3.2.orig.tar.gz.id
new file mode 100644
index 000..0d2a3aa
--- /dev/null
+++ b/lwt_2.3.2.orig.tar.gz.id
@@ -0,0 +1 @@
+06a53414622712cda6316bfd75f83a53c3da60db

-- 
Cooperative light-weight thread library for OCaml

___
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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.1-1-7-g680ad25

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 253521a231fbcfa83b8a9ccc5a6d8f5187627319
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 12:32:52 2011 +0100

Remove buggy dependencies causing FTBFS on no-natdynlink archs

diff --git 
a/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
 
b/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
new file mode 100644
index 000..76d34fd
--- /dev/null
+++ 
b/debian/patches/0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
@@ -0,0 +1,42 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sat, 31 Dec 2011 12:31:28 +0100
+Subject: Remove buggy dependencies causing FTBFS on no-natdynlink archs
+
+---
+ _tags |9 -
+ 1 files changed, 0 insertions(+), 9 deletions(-)
+
+diff --git a/_tags b/_tags
+index 81f7f8e..1c24e3b 100644
+--- a/_tags
 b/_tags
+@@ -141,18 +141,12 @@
+ examples/unix/relay.{native,byte}: use_lwt-unix
+ examples/unix/relay.{native,byte}: use_lwt
+ examples/unix/relay.{native,byte}: pkg_unix
+-examples/unix/relay.{native,byte}: pkg_camlp4.quotations.o
+-examples/unix/relay.{native,byte}: pkg_camlp4.lib
+-examples/unix/relay.{native,byte}: pkg_camlp4.extend
+ examples/unix/relay.{native,byte}: pkg_bigarray
+ # Executable logging
+ examples/unix/logging.{native,byte}: use_lwt-syntax
+ examples/unix/logging.{native,byte}: use_lwt-unix
+ examples/unix/logging.{native,byte}: use_lwt
+ examples/unix/logging.{native,byte}: pkg_unix
+-examples/unix/logging.{native,byte}: pkg_camlp4.quotations.o
+-examples/unix/logging.{native,byte}: pkg_camlp4.lib
+-examples/unix/logging.{native,byte}: pkg_camlp4.extend
+ examples/unix/logging.{native,byte}: pkg_bigarray
+ # Library lwt-syntax-log
+ syntax/lwt-syntax-log.cmxs: use_lwt-syntax-log
+@@ -184,9 +178,6 @@
+ examples/unix/parallelize.{native,byte}: use_lwt-unix
+ examples/unix/parallelize.{native,byte}: use_lwt
+ examples/unix/parallelize.{native,byte}: pkg_unix
+-examples/unix/parallelize.{native,byte}: pkg_camlp4.quotations.o
+-examples/unix/parallelize.{native,byte}: pkg_camlp4.lib
+-examples/unix/parallelize.{native,byte}: pkg_camlp4.extend
+ examples/unix/parallelize.{native,byte}: pkg_bigarray
+ examples/unix/*.ml{,i}: use_lwt-syntax
+ examples/unix/*.ml{,i}: use_lwt-unix
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 97db22b..8f6c51e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Do-not-build-manual-manual.pdf.patch
+0002-Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch

-- 
Cooperative light-weight thread library for OCaml

___
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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.1-1-7-g680ad25

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 680ad2508ac649ebb9697160a55a020a0c948c5d
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 11:03:23 2011 +0100

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8eb7715..79f4996 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-lwt (2.3.2-1) UNRELEASED; urgency=low
+lwt (2.3.2-1) unstable; urgency=low
 
   * New upstream release
+- remove fix-a-race-condition-in-Lwt_io.patch (applied upstream)
+- remove fix-data-corruption-in-Lwt_io.patch (applied upstream)
+- add Remove-buggy-dependencies-causing-FTBFS-on-no-natdyn.patch
+  * Update debian/watch
 
- -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 10:09:28 +0100
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 12:37:11 +0100
 
 lwt (2.3.1-1) unstable; urgency=low
 

-- 
Cooperative light-weight thread library for OCaml

___
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] obrowser packaging branch, master, updated. debian/1.1.1+dfsg-1-2-gd1490e2

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit d1490e2370b5f6b656ca317177bbbc6fea284025
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:36:14 2011 +0100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index 872150d..008c3e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+obrowser (1.1.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Update debian/watch
+
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 13:36:06 +0100
+
 obrowser (1.1.1+dfsg-1) unstable; urgency=low
 
   * New upstream release

-- 
obrowser 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] ocsigen packaging branch, master, updated. debian/1.3.4-2-2-g95b4e77

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 5c167057901470b6ae70940f24beb125fc99c45d
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:37:36 2011 +0100

Update debian/watch

diff --git a/debian/watch b/debian/watch
index 0cbb386..ebd9aed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=uversionmangle=s/RC/~rc/ \
-  http://ocsigen.org/ocsigenserver/install 
../download/ocsigen-(.*)\.tar\.gz
+  http://ocsigen.org/download/ocsigen-(1\.[1-7].*)\.tar\.gz

-- 
ocsigen 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] ocsigen packaging branch, master, updated. debian/1.3.4-2-2-g95b4e77

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 95b4e7791f8a934e7237c80f49be4c95dfe40f38
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:39:14 2011 +0100

Update changelog

diff --git a/debian/changelog b/debian/changelog
index d6ae883..2e0b6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocsigen (1.3.4-3) UNRELEASED; urgency=low
+
+  * Update debian/watch
+
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 13:39:09 +0100
+
 ocsigen (1.3.4-2) unstable; urgency=low
 
   * Fix wrong decoding of + in URL paths (cherry-picked from upstream)

-- 
ocsigen 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-deriving-ocsigen packaging branch, master, updated. debian/0.3b-1-4-g468a905

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 0fb5557bd04761de80db8556b29cd4582a360f8a
Merge: 70b7cce5a0103413ffee9355a22799241cb6e726 
2c3d8cb317cd7672c9ee3d2f5a367a6ec9b69c7d
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:43:44 2011 +0100

Merge commit 'upstream/0.3c'


-- 
ocaml-deriving-ocsigen 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-deriving-ocsigen packaging branch, master, updated. debian/0.3b-1-4-g468a905

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 5d4e48beea9fd073cc21136f92e1c7621a289541
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:43:54 2011 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 2214faf..b318c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-deriving-ocsigen (0.3c-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 13:43:46 +0100
+
 ocaml-deriving-ocsigen (0.3b-1) unstable; urgency=low
 
   * New upstream release

-- 
ocaml-deriving-ocsigen 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-deriving-ocsigen packaging branch, master, updated. debian/0.3b-1-4-g468a905

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 468a9052dff416aff3ea31603eed0c79b3e2335b
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:44:55 2011 +0100

Prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index b318c79..94848ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-ocaml-deriving-ocsigen (0.3c-1) UNRELEASED; urgency=low
+ocaml-deriving-ocsigen (0.3c-1) unstable; urgency=low
 
   * New upstream release
 
- -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 13:43:46 +0100
+ -- Stéphane Glondu glo...@debian.org  Sat, 31 Dec 2011 13:44:51 +0100
 
 ocaml-deriving-ocsigen (0.3b-1) unstable; urgency=low
 

-- 
ocaml-deriving-ocsigen 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-deriving-ocsigen packaging branch, pristine-tar, updated. d29ea8b2c5d97ecddf24f35b110bbea7f44f9b4a

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the pristine-tar branch:
commit d29ea8b2c5d97ecddf24f35b110bbea7f44f9b4a
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:43:44 2011 +0100

pristine-tar data for ocaml-deriving-ocsigen_0.3c.orig.tar.gz

diff --git a/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.delta 
b/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.delta
new file mode 100644
index 000..bc47e6f
Binary files /dev/null and b/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.delta 
differ
diff --git a/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.id 
b/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.id
new file mode 100644
index 000..0cf9b3f
--- /dev/null
+++ b/ocaml-deriving-ocsigen_0.3c.orig.tar.gz.id
@@ -0,0 +1 @@
+2c3d8cb317cd7672c9ee3d2f5a367a6ec9b69c7d

-- 
ocaml-deriving-ocsigen 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-deriving-ocsigen packaging annotated tag, debian/0.3c-1, created. debian/0.3c-1

2011-12-31 Thread Stephane Glondu 
The annotated tag, debian/0.3c-1 has been created
at  56342d0857458514cd2b8b1130779e9324a5aa89 (tag)
   tagging  468a9052dff416aff3ea31603eed0c79b3e2335b (commit)
  replaces  debian/0.3b-1
 tagged by  Stephane Glondu
on  Sat Dec 31 13:48:13 2011 +0100

- Shortlog 
Debian release 0.3c-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCgAGBQJO/wSNAAoJEHhT2k1JiBrTMBwP/j777Z380+txHRsb9HwfMxF+
MpJwd+x8j/39VKTVJHkcuPjsKvzDkimywsuQ3o8UZPJKyYLQzsM5KUacuKrqnwDa
4YJr2tkB9huWgmMzpT48bFObZ4x73Q6wKf2Yxt1EY4AiZ/J9NTi3qi0J7XkG+bfj
MBfQmQ8jE5p4tGYAfiitzHjxp/55F+XcPAjsytbq0E2yneH7CkGtAdPXJ6cbg07M
ST5r/e30UXgf2AD2B+iHw9iV2Uwmpc7VBFVokJ3d/s+qVuXiZ6fq+wcRNUz0LpAV
VWNmiiaxpMZXRltdRmEIn/cJzs98jgvzG6RUvQES2QM8mRXbRADs30S9SDD1fk6K
hWVCCK9fqCMP7Ky7Atk92KiPViOM0mOLkuUJ65JT190k0odw/2KtHuaKTGWhUGU4
U1e8NQ5JcgkP2vjcjSbHHGeR6Ba+6dUIJTCl/dDPVs8+zvWOr0joiy/d2ZpIByR6
eR8797Fnq59SoyS8XWJx8Th1m5beyerf7Bwcr3BJoz5zjo89VOk+T3NigAykltoO
qWPNlfzdEa60gbMYcedPoDKAf4fw7bJe5B6+LXBQ4yN27yIR9hDbcRX1rsdrB9sp
lHnEKDIg6cpInC92gSVJm97W3V1RCVr7x2yDpqT0V3WrUtk2A6JKOKVN2fT+wqED
wtqIlucxJ1TLk+umJPBo
=UCqx
-END PGP SIGNATURE-

Stephane Glondu (4):
  Imported Upstream version 0.3c
  Merge commit 'upstream/0.3c'
  New upstream release
  Prepare upload to unstable

---

-- 
ocaml-deriving-ocsigen 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-deriving-ocsigen packaging annotated tag, upstream/0.3c, created. upstream/0.3c

2011-12-31 Thread Stephane Glondu 
The annotated tag, upstream/0.3c has been created
at  8c129f03409694967cf2bb6447789a8b1e5746b3 (tag)
   tagging  2c3d8cb317cd7672c9ee3d2f5a367a6ec9b69c7d (commit)
  replaces  upstream/0.3b
 tagged by  Stephane Glondu
on  Sat Dec 31 13:43:44 2011 +0100

- Shortlog 
Upstream version 0.3c

Stephane Glondu (1):
  Imported Upstream version 0.3c

---

-- 
ocaml-deriving-ocsigen 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] tyxml packaging branch, master, updated. debian/2.0.1-1-7-g053a7d7

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit d0918f40f69faf80fa0ed21eacedf7371bbb1970
Merge: 1da9824285c351c37db65c8a98347581db6ca9eb 
cf0950230ccd0d729666538282a7bbc95436fc11
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:01:20 2011 +0100

Merge commit 'upstream/2.0.1c'


-- 
tyxml 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] tyxml packaging branch, master, updated. debian/2.0.1-1-7-g053a7d7

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the master branch:
commit 1a76e0e9a055174144fde7c0383fa32c39d1df72
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:32:45 2011 +0100

Fix typo causing FTBFS with ocamlduce

diff --git a/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch 
b/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch
new file mode 100644
index 000..67c43ce
--- /dev/null
+++ b/debian/patches/0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu st...@glondu.net
+Date: Sat, 31 Dec 2011 13:32:01 +0100
+Subject: Fix typo causing FTBFS with ocamlduce
+
+---
+ doc/Makefile |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/doc/Makefile b/doc/Makefile
+index 79b10bb..0e8d503 100644
+--- a/doc/Makefile
 b/doc/Makefile
+@@ -3,7 +3,7 @@ include ../Makefile.filelist
+ 
+ LIB := -I ../lib -I ../syntax
+ 
+-ifeq ${OCAMLDUCE} YES
++ifeq ${OCAMLDUCE} yes
+ OCAMLDOC := ${OCAMLDUCEFIND} ocamldoc -package ocamlduce
+ else
+ OCAMLDOC := ${OCAMLFIND} ocamldoc
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..bc45bd8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-typo-causing-FTBFS-with-ocamlduce.patch

-- 
tyxml 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] tyxml packaging branch, pristine-tar, updated. 2a0e845bac0f8616e37df5dfe68e845a3081992c

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the pristine-tar branch:
commit 22c7e0ff87168dff0fe261b170eec0f96b79cc67
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:01:09 2011 +0100

pristine-tar data for tyxml_2.0.1b.orig.tar.gz

diff --git a/tyxml_2.0.1b.orig.tar.gz.delta b/tyxml_2.0.1b.orig.tar.gz.delta
new file mode 100644
index 000..4c54c2a
Binary files /dev/null and b/tyxml_2.0.1b.orig.tar.gz.delta differ
diff --git a/tyxml_2.0.1b.orig.tar.gz.id b/tyxml_2.0.1b.orig.tar.gz.id
new file mode 100644
index 000..749b08c
--- /dev/null
+++ b/tyxml_2.0.1b.orig.tar.gz.id
@@ -0,0 +1 @@
+c586038c1507118743d4cba7e898410436d9d6f8

-- 
tyxml 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] tyxml packaging branch, pristine-tar, updated. 2a0e845bac0f8616e37df5dfe68e845a3081992c

2011-12-31 Thread Stephane Glondu 
The following commit has been merged in the pristine-tar branch:
commit 2a0e845bac0f8616e37df5dfe68e845a3081992c
Author: Stephane Glondu st...@glondu.net
Date:   Sat Dec 31 13:01:20 2011 +0100

pristine-tar data for tyxml_2.0.1c.orig.tar.gz

diff --git a/tyxml_2.0.1c.orig.tar.gz.delta b/tyxml_2.0.1c.orig.tar.gz.delta
new file mode 100644
index 000..c48da1a
Binary files /dev/null and b/tyxml_2.0.1c.orig.tar.gz.delta differ
diff --git a/tyxml_2.0.1c.orig.tar.gz.id b/tyxml_2.0.1c.orig.tar.gz.id
new file mode 100644
index 000..e129c73
--- /dev/null
+++ b/tyxml_2.0.1c.orig.tar.gz.id
@@ -0,0 +1 @@
+cf0950230ccd0d729666538282a7bbc95436fc11

-- 
tyxml 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] tyxml packaging annotated tag, debian/2.0.1c-1, created. debian/2.0.1c-1

2011-12-31 Thread Stephane Glondu 
The annotated tag, debian/2.0.1c-1 has been created
at  d6b3cf07ed886fc7a4ba8f914621e32f6f6200c2 (tag)
   tagging  053a7d79daed42c79f9d9923a5482af602179444 (commit)
  replaces  debian/2.0.1-1
 tagged by  Stephane Glondu
on  Sat Dec 31 13:50:24 2011 +0100

- Shortlog 
Debian release 2.0.1c-1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCgAGBQJO/wUQAAoJEHhT2k1JiBrTETIQALI0Qv40qu2z7RVwkANwrrIj
AsgmjO4XPwMyYKMO12wT6084+aJzcrvpZRlz7eYEgnyAUeRg77konkptrlVL49FB
EaMNm4klzW/KGAIkR2r02wSiA+3hSvo/+958eA5UIZxhY36gIgtVXwP687F7o8rj
CKe4ktmjADanFmQz8VGFSnVfCSl+sVhPji0n2laZanoBNrV8A1yywk9s9QLaoKdJ
vkZxMTij35r8OUGjSv1vf7t9BCHSNHnW3gZNu6SRvBF5+Gcc3EnBgUZtIGpRvosk
IBItDVTAwwXkI2+j1VRhm+1Mn2peWfq7HZR0uQORCeWZS1avPRnXW06oPwVXQ9SO
LgSy8Q9ung8DRAg6Qd14gBLsU7o1teLGtm9JayhvFFmPUL3AMvTMxRMzZROAnkrb
H54qlyGM6X2G+FAmV+YI16tW4rdH4pu/g7YffXgCwc2kVTGfCyrFj4vycFA5+dpO
FLj9DIHx+dUmkJEDc0l8/JidtlJTO2FVj+zfKWm29yEq3bjnVtxEzC+8u4+L+lBV
/KWZL5msRHS1E20JmjmZlhYvZ7dFh9TqZ2LbVDh6xEI0HVeerfsURYITucEq9NDH
7iartnIz26y+2Ijgyn9AyYMyfCJySNciX/8RV+JSauFqkfd8PLnCF98HT3KRwapa
FIPkpzCwPvm5Oukiu9rD
=tY8W
-END PGP SIGNATURE-

Stephane Glondu (7):
  Update debian/watch
  Imported Upstream version 2.0.1b
  Imported Upstream version 2.0.1c
  Merge commit 'upstream/2.0.1c'
  New upstream release
  Fix typo causing FTBFS with ocamlduce
  Update changelog and prepare upload to unstable

---

-- 
tyxml 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] tyxml packaging annotated tag, upstream/2.0.1b, created. upstream/2.0.1b

2011-12-31 Thread Stephane Glondu 
The annotated tag, upstream/2.0.1b has been created
at  6e8faab197a3e92a9c51d69ed2501006da025326 (tag)
   tagging  c586038c1507118743d4cba7e898410436d9d6f8 (commit)
  replaces  upstream/2.0.1
 tagged by  Stephane Glondu
on  Sat Dec 31 13:01:09 2011 +0100

- Shortlog 
Upstream version 2.0.1b

Stephane Glondu (1):
  Imported Upstream version 2.0.1b

---

-- 
tyxml 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] tyxml packaging annotated tag, upstream/2.0.1c, created. upstream/2.0.1c

2011-12-31 Thread Stephane Glondu 
The annotated tag, upstream/2.0.1c has been created
at  670b4d7535ac4f3969d26b23818e1d036fa913b0 (tag)
   tagging  cf0950230ccd0d729666538282a7bbc95436fc11 (commit)
  replaces  upstream/2.0.1b
 tagged by  Stephane Glondu
on  Sat Dec 31 13:01:20 2011 +0100

- Shortlog 
Upstream version 2.0.1c

Stephane Glondu (1):
  Imported Upstream version 2.0.1c

---

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