[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.4-1-2-g70fa3b8

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 70fa3b8f5d5847da215cb958fba4b6e8aa7baac5
Author: Stephane Glondu 
Date:   Thu Jul 7 16:54:31 2011 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 5c398e1..d6ae883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocsigen (1.3.4-2) unstable; urgency=low
+
+  * Fix wrong decoding of + in URL paths (cherry-picked from upstream)
+
+ -- Stéphane Glondu   Tue, 12 Jul 2011 20:38:51 +0200
+
 ocsigen (1.3.4-1) unstable; urgency=low
 
   * New upstream release

-- 
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 annotated tag, debian/1.3.4-2, created. debian/1.3.4-2

2011-07-12 Thread Stephane Glondu
The annotated tag, debian/1.3.4-2 has been created
at  aa2416c556ad3cbf3a2c13b0e2919ca36c6792c1 (tag)
   tagging  70fa3b8f5d5847da215cb958fba4b6e8aa7baac5 (commit)
  replaces  debian/1.3.4-1
 tagged by  Stephane Glondu
on  Tue Jul 12 21:01:11 2011 +0200

- Shortlog 
Debian release 1.3.4-2
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCgAGBQJOHJn3AAoJEHhT2k1JiBrTtCgP/j8DrYWM8w38dC6b3DOsMyGL
lwJN2R3W18WM5gjyvVchg5vpmPuH9tuWLzWY63+ZD20/bTgZX+syWW39LDXoqvjI
EoXqreF6Cs2y1y8bpECjcK/pqz/DSum82m7fDNfcfEmo7PDIZO6H6LsxObJgwWtR
B2ymCw7UkHp5C61kd9Qwj/PaiCK+jal/hfyPb53vdzxF7JsDyHVLgJWdfzp1c2Ud
45/pSTGY/eNXCPlY+yG0+dVaY+7xnwkpYcqUqD5NxyFa/PQAyT2TL+dlQcMjr9Gh
wiCdfEtieaV+fBQ220sxQgw8DK384Ysqi1Y1P9MmXR/o+FYH1FkrcPHba+dtX4NJ
rHvC4zXYXWPiy1OKjMu4qjtCnnNcYpZWBy4Lv70WDNzP1joD9C8QU5g82JNOiAAQ
bxUVBFqpuo66Ts72Fnr331GJrCS0eaaAeKgJRBgqpxj0daPuXEBldrZzQycNsJN1
sK/0WNyJRet9s4ntc1t7PLcOLG4iWZH4tNiNPhQI96IUlp9PpUi9ZzD9Q4O3q5ZX
xeVNhjxhgYzp30pGM7T6TMaoPA8ca8AuX3bFVdWpIU12VMGyS97rsTB5pa4m/6ke
AaFjO/kr+7Yi7OkzpLqWZG1dOYP3FvuuMsm1oBYkJjVILmEy4STGBTfLClVFZprZ
ndWwRfX755B7eCup8z1o
=Xzch
-END PGP SIGNATURE-

Stephane Glondu (2):
  Fix wrong decoding of + in URL paths
  Update changelog and prepare upload to unstable

---

-- 
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-1-2-g70fa3b8

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit d05529adf7016503e7c9d933e5d4d2972d31c21a
Author: Stephane Glondu 
Date:   Thu Jul 7 16:46:01 2011 +0200

Fix wrong decoding of + in URL paths

diff --git a/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch 
b/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch
new file mode 100644
index 000..77198fc
--- /dev/null
+++ b/debian/patches/0002-Fix-wrong-decoding-of-in-URL-paths.patch
@@ -0,0 +1,46 @@
+From: Stephane Glondu 
+Date: Thu, 7 Jul 2011 16:47:00 +0200
+Subject: Fix wrong decoding of + in URL paths
+
+Cherry-picked from upstream.
+---
+ baselib/ocsigen_lib.ml |   11 +--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/baselib/ocsigen_lib.ml b/baselib/ocsigen_lib.ml
+index 376fe3a..15af400 100644
+--- a/baselib/ocsigen_lib.ml
 b/baselib/ocsigen_lib.ml
+@@ -509,7 +509,8 @@ let string_of_url_path ~encode l =
+   then
+ fixup_url_string (String.concat "/"
+ (List.map (*Netencoding.Url.encode*) 
+-   MyUrl.encode l))
++   (MyUrl.encode ~plus:false) l))
++(* ' ' are not encoded to '+' in paths *)
+   else String.concat "/" l (* BYXXX : check illicit characters *)
+ 
+ let parse_url =
+@@ -561,6 +562,12 @@ let parse_url =
+ 
+ (* Note that the fragment (string after #) is not sent by browsers *)
+ 
++(*20110707 ' ' is encoded to '+' in queries, but not in paths. 
++  Warning: if we write the URL manually, we must encode ' ' to '+' manually
++  (not done by the browser).
++  --Vincent
++*)
++
+ let get_params =
+   lazy begin
+ let params_string = match query with None -> "" | Some s -> s in
+@@ -570,7 +577,7 @@ let parse_url =
+   end
+ in
+ 
+-let path = List.map Netencoding.Url.decode (Neturl.split_path pathstring) 
in
++let path = List.map (Netencoding.Url.decode ~plus:false) 
(Neturl.split_path pathstring) in
+ 
+ let path = remove_dotdot path (* and remove "//" *)
+ (* here we remove .. from paths, as it is dangerous.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 6a3af06..bc43ddc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Disable-install-of-lwt_obrowser.patch
+0002-Fix-wrong-decoding-of-in-URL-paths.patch

-- 
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] camlimages packaging branch, master, updated. debian/1%4.0.1-2-1-ga36cac5

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit a36cac5b0e86cb9a69ecd6d42c4affc1389136be
Author: Stephane Glondu 
Date:   Tue Jul 12 15:19:52 2011 +0200

Depends on libjpeg-dev instead of libjpeg62-dev (Closes: #633646)

diff --git a/debian/changelog b/debian/changelog
index f3a9a7b..4dd1de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+camlimages (1:4.0.1-3) unstable; urgency=low
+
+  * Team upload
+  * Depends on libjpeg-dev instead of libjpeg62-dev (Closes: #633646)
+
+ -- Stéphane Glondu   Tue, 12 Jul 2011 15:19:42 +0200
+
 camlimages (1:4.0.1-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 220bf74..ce69efc 100644
--- a/debian/control
+++ b/debian/control
@@ -61,7 +61,7 @@ Section: ocaml
 Depends:
  ${ocaml:Depends},
  libpng12-dev,
- libjpeg62-dev,
+ libjpeg-dev,
  libtiff4-dev,
  libxpm-dev,
  libfreetype6-dev,

-- 
camlimages 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] camlimages packaging annotated tag, debian/1%4.0.1-3, created. debian/1%4.0.1-3

2011-07-12 Thread Stephane Glondu
The annotated tag, debian/1%4.0.1-3 has been created
at  01ecae1905c6b0d656bdf3a35eaf93ac0e5f0a05 (tag)
   tagging  a36cac5b0e86cb9a69ecd6d42c4affc1389136be (commit)
  replaces  debian/1%4.0.1-2
 tagged by  Stephane Glondu
on  Tue Jul 12 20:36:05 2011 +0200

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

iQIcBAABCgAGBQJOHJQVAAoJEHhT2k1JiBrTdGgP/3+0SGmY3w7cR1QNP4+EHxQZ
pKyBvaxfQbGwljN4NZbSzhqhN9S6EG88/eHHph7mVkM6Iy473WQI8K2MCPn4cz9m
R4TBR/vlcjxoC26NHgSKfQqddJXqvY4dQDrWfcNiEBJuOWegpd/vNbqeud571P1Z
02ZXYrE913GShrRvUYoawalv/6uLgzVi5HCLRbZG/kWUMT8dV3uylAo5CeoivMeZ
akWoIq14ucCAI9kMQdWWrmYv4d1+rVzLug03JnLu8nt6CjU1uZXnRrKnNdnivL5H
ZKTMsOWzWE9sr1rbjbCjdz6NCwgBQBOEg7ex1xZcu7iNYit7bH24GQZmKvdjnKjR
HgF2OAD4LL91ia5wSSLcP4hHQnDn9L0UocVFaDtqY5VpGf3vZVahDFl725XFxCeT
7UtE7SuSaP1yeUEWeui9s3LJT5sZX1tAlrw+u5wcPZKp4/4VrIwlSH32NcpulT6h
YIDoEuXsBBqw3wfiHb+GS87kLaXobnnLE/Uj5NTHPGPq9kajaMt7LtJHPU4c5dRY
9+5G7x7vBISzY1KH1jx2F5//7C7ybQvtsqizRa7lDCk3O0aJ9C2FrYD5zcMHXtBg
W8ddbT3z1SlzF6jypnCFIYfRWsQCfNnNzrADYmFGyRsjdVF5CD3+qYtbye/vmw0O
ybMJ6krjakogc1thuTw0
=9ZCN
-END PGP SIGNATURE-

Stephane Glondu (1):
  Depends on libjpeg-dev instead of libjpeg62-dev (Closes: #633646)

---

-- 
camlimages 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-extunix packaging branch, pristine-tar, updated. 31d4c0fca5a9967148b63662c53fafdfdb406e86

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit 31d4c0fca5a9967148b63662c53fafdfdb406e86
Author: Stephane Glondu 
Date:   Tue Jul 12 18:32:52 2011 +0200

pristine-tar data for ocaml-extunix_0.0.3.orig.tar.gz

diff --git a/ocaml-extunix_0.0.3.orig.tar.gz.delta 
b/ocaml-extunix_0.0.3.orig.tar.gz.delta
new file mode 100644
index 000..a8e070c
Binary files /dev/null and b/ocaml-extunix_0.0.3.orig.tar.gz.delta differ
diff --git a/ocaml-extunix_0.0.3.orig.tar.gz.id 
b/ocaml-extunix_0.0.3.orig.tar.gz.id
new file mode 100644
index 000..2a5c471
--- /dev/null
+++ b/ocaml-extunix_0.0.3.orig.tar.gz.id
@@ -0,0 +1 @@
+cb4e80cb1acde4b413d6b826d07a0d25ebf6104b

-- 
ocaml-extunix 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-extunix packaging annotated tag, upstream/0.0.3, created. upstream/0.0.3

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/0.0.3 has been created
at  c2b4462d73a0dce91fd441b343b0b34dbe05e109 (tag)
   tagging  cb4e80cb1acde4b413d6b826d07a0d25ebf6104b (commit)
  replaces  upstream/0.0.2
 tagged by  Stephane Glondu
on  Tue Jul 12 18:32:52 2011 +0200

- Shortlog 
Upstream version 0.0.3

Stephane Glondu (1):
  Imported Upstream version 0.0.3

---

-- 
ocaml-extunix 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-extunix packaging annotated tag, debian/0.0.3-1, created. debian/0.0.3-1

2011-07-12 Thread Stephane Glondu
The annotated tag, debian/0.0.3-1 has been created
at  f34eaf37a3b70f21a724c94602b91dc92d9460c8 (tag)
   tagging  14f064d6e82e1dadbb03b17338ea82bf735b117b (commit)
  replaces  debian/0.0.2-1
 tagged by  Stephane Glondu
on  Tue Jul 12 20:29:53 2011 +0200

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

iQIcBAABCgAGBQJOHJKhAAoJEHhT2k1JiBrTxJwP/1xfCUdnwjYS0FID7SoEkCao
NJbrA1PE30mEnFPohf96xrCt2EvnvLQ8Ht1s98HsayyXug3I3Y2AJ0FEb3Mmh+zy
KNOgIop3Wdyt+jAVex/Almm996bfAPXt6ql2CDqMTEvzQgEf3ZCtDXqMCO/ez4Ug
2fmx5XFjw6PlW4XLvhEsTSZyJS5zFOomQFuiPfrZ1KKqdZddkMSQYXeA4bexTZuW
LrKJKYDFEBsYkOx8uv4tzVf4i2DUnGSiTRjGBy5Ii26810VGSYKkBDgQ1e6nTUsk
/PouJkoi+ckG+DHGv7iOU1tqvEFCQxmeU9JkMipYpxixc/k6PVBIO18sBg6EBQJ+
BlskmiRGzE7ZIvlLiMurXK7SHzU6jmMzNjVNJvKovVcq3m6pPOs0G+cFEFaTpFfc
ggZfucFo0Q2YvxF4fVz67+QcXKKTu8aKFwTgtsNxt29dK1p2wfcyY7L5hgCWn6eC
ElsBsi7ZfQ5TjLtmfXkAuh5m3dy58NpJXsv0A4VqO2vITvfBlvFyYp+/ZqxI8q9b
bDxxX/v5NKFCNSvKQCq/lUIwVMaE6PPzcLwZaogKxwL0VxOGGX3ee3of7pfSntrn
d10wx5aI14cuWWhncjA3f3geOnmd+21HF09mqQ64FP0tu00vhWmBjn+ttO4zJMF0
0Q9GrWdrtrQE9/RPV2c8
=yuKE
-END PGP SIGNATURE-

Stephane Glondu (4):
  Imported Upstream version 0.0.3
  Merge commit 'upstream/0.0.3'
  New upstream release
  Update changelog and prepare upload to unstable

---

-- 
ocaml-extunix 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-extunix packaging branch, master, updated. debian/0.0.2-1-4-g14f064d

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 3ab212f3f56aabb615788b1469eaffd2f42b27dd
Author: Stephane Glondu 
Date:   Tue Jul 12 18:33:29 2011 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 97bca74..2d4ce9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-extunix (0.0.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu   Tue, 12 Jul 2011 18:33:24 +0200
+
 ocaml-extunix (0.0.2-1) unstable; urgency=low
 
   * Team upload

-- 
ocaml-extunix 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-extunix packaging branch, master, updated. debian/0.0.2-1-4-g14f064d

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 14f064d6e82e1dadbb03b17338ea82bf735b117b
Author: Stephane Glondu 
Date:   Tue Jul 12 20:27:17 2011 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2d4ce9a..6444b51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-ocaml-extunix (0.0.3-1) UNRELEASED; urgency=low
+ocaml-extunix (0.0.3-1) unstable; urgency=low
 
-  * New upstream release
+  * Team upload
+  * New upstream release (Closes: #632500)
 
- -- Stéphane Glondu   Tue, 12 Jul 2011 18:33:24 +0200
+ -- Stéphane Glondu   Tue, 12 Jul 2011 20:27:12 +0200
 
 ocaml-extunix (0.0.2-1) unstable; urgency=low
 

-- 
ocaml-extunix 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-extunix packaging branch, master, updated. debian/0.0.2-1-4-g14f064d

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit be6877f8a92b2414a403d6f4a964ed2fe3cd7553
Merge: 831f375626d1e571636a667911ec362d5ff05f5b 
cb4e80cb1acde4b413d6b826d07a0d25ebf6104b
Author: Stephane Glondu 
Date:   Tue Jul 12 18:32:52 2011 +0200

Merge commit 'upstream/0.0.3'


-- 
ocaml-extunix 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] Cooperative light-weight thread library for OCaml branch, master, updated. debian/2.3.0-2-2-g1ed81a9

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 1ed81a9d9575f8ab45c3463cc5f2e45732de1519
Author: Stephane Glondu 
Date:   Tue Jul 12 09:09:49 2011 +0200

Prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2440034..bc2c6f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-lwt (2.3.0-3) UNRELEASED; urgency=low
+lwt (2.3.0-3) unstable; urgency=low
 
   * Fix link order in library detection test (fixes FTBFS on Ubuntu)
 
- -- Stéphane Glondu   Wed, 15 Jun 2011 09:17:44 +0200
+ -- Stéphane Glondu   Tue, 12 Jul 2011 09:09:39 +0200
 
 lwt (2.3.0-2) 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] Cooperative light-weight thread library for OCaml annotated tag, debian/2.3.0-3, created. debian/2.3.0-3

2011-07-12 Thread Stephane Glondu
The annotated tag, debian/2.3.0-3 has been created
at  ad82a55af17073cf63f47deac7b9100c4dd97356 (tag)
   tagging  1ed81a9d9575f8ab45c3463cc5f2e45732de1519 (commit)
  replaces  debian/2.3.0-2
 tagged by  Stephane Glondu
on  Tue Jul 12 09:19:27 2011 +0200

- Shortlog 
Debian release 2.3.0-3
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCgAGBQJOG/V/AAoJEHhT2k1JiBrTSa0P/3Y2zjXnrtSJgpZ2QBm2umkX
fVrzoeuWFHWlahuhJNNPRbADHqBOUxUVIYDIAtRcdK5nSVfGjiVzEI7PqmpjHjgy
aS2csTVFmbwIpKin+0G9GgdjeaH0hvGR+AHcla2Hih6e9WLpDsQWrgRASxcjGpW8
d1Tcn52p4MO4qb3b9f0cxjZ1gT2DRo/tHPnXPE3R6CK8/R7U5LZzqib2+rqv0spz
B9O0G84BUwWTD5R6iiijS4j5HJYIxsN7gzOzN/O1/m/JtcMxuQR8suB8+LhkKRvF
lIZr9DUuYRvOf11i5PHvMN8+g4Q/RP57Gkxvy2J+lr91kvFeSKzTNc1JRXNr0JlG
+9jZ0E56SjjVq2F+WC7QRPIhHuAXUn5w7EvrLu0HHEH4Wa5cAmNoFC/vgUx03eXK
Bjbfn+MjPEv5t3feaQdHlfxCYDIppmMjQvYEmRnmYphxFn6mPL1HObmH16PdTw/M
7Fjjgt5uKtZlheqWietve74OC1+uzs5+6K13dWeM5dp6TFb2OFs+T8BBIcw/k+oj
HljP0dq6KRPdJE3FPmJaiNDUnXqjpGd2EpMM4wYrhi+mOfZBdVlu9orBJvl2d/eW
+4Lg1ovTjkeG9Ec1xFk0tT3HEXe0Eto58IvWKAVd7Of4cAAGxpQEBXhC60lewJKQ
0ZU19qmrF8dxB5Ri/8KK
=B782
-END PGP SIGNATURE-

Stephane Glondu (2):
  Fix link order in library detection test
  Prepare upload to unstable

---

-- 
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] ocaml-sqlite3 packaging annotated tag, upstream/1.6.1, created. upstream/1.6.1

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/1.6.1 has been created
at  5b2ec4cf6050a1d2c766a32e4de6fda63e9fb3ba (tag)
   tagging  51d0b35f7c19412e8d96714ad377a8cef57d7870 (commit)
  replaces  upstream/1.6.0
 tagged by  Stephane Glondu
on  Wed Jul 6 14:25:45 2011 +0200

- Shortlog 
Upstream version 1.6.1

Stephane Glondu (1):
  Imported Upstream version 1.6.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/1.6.0, created. upstream/1.6.0

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/1.6.0 has been created
at  677ee42d83dc8db02d93c41ff9d7e745fa49c88d (tag)
   tagging  b49f8c0b82b4757a07be778a6fa740256fb0a38d (commit)
  replaces  upstream/1.5.9
 tagged by  Stephane Glondu
on  Wed Jul 6 14:25:17 2011 +0200

- Shortlog 
Upstream version 1.6.0

Stephane Glondu (1):
  Imported Upstream version 1.6.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/1.5.9, created. upstream/1.5.9

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/1.5.9 has been created
at  d7767cf00cfd495ff475a04a3ee68b8364c763e9 (tag)
   tagging  aee74ccca24186e99170954f2cd2be822e2bad1a (commit)
  replaces  upstream/1.5.8
 tagged by  Stephane Glondu
on  Wed Jul 6 14:25:16 2011 +0200

- Shortlog 
Upstream version 1.5.9

Stephane Glondu (1):
  Imported Upstream version 1.5.9

---

-- 
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.5.8, created. upstream/1.5.8

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/1.5.8 has been created
at  8f8f871b611950c7ffc04956316b4ae08fd5d95d (tag)
   tagging  c81a6f980551b45caf9a7f4f2db24b0d8b8870c9 (commit)
  replaces  upstream/1.5.7
 tagged by  Stephane Glondu
on  Wed Jul 6 14:25:15 2011 +0200

- Shortlog 
Upstream version 1.5.8

Stephane Glondu (1):
  Imported Upstream version 1.5.8

---

-- 
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, debian/1.6.1-1, created. debian/1.6.1-1

2011-07-12 Thread Stephane Glondu
The annotated tag, debian/1.6.1-1 has been created
at  f7f0cfe3fc111745740c3ebcee16aea204665131 (tag)
   tagging  3b5bc858cf05d61658ed10921f002f50e53d24f1 (commit)
  replaces  debian/1.5.6-3
 tagged by  Stephane Glondu
on  Tue Jul 12 09:06:53 2011 +0200

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

iQIcBAABCgAGBQJOG/KNAAoJEHhT2k1JiBrTR34P/3UGhg4PB+vHmHnqgxTY2nbU
IeMxp6WN98jQoEEaAkXXfRu0ouI2d/G+zFBzqsUcb6aHYSV7khvIZZE3U4Vl0ltH
GGhlX0XQt7wxoFKpwDd3Sriaz7x9cKJVoBE3z6NfurVKwOLZfxuPag8ZJxOSuJi5
n9GL1vPL8muxs92DSeKpXAKx47/9OZpCK+Ilen5lDejv+ahf8xGScjOVW5LOaELC
lUxI+Lz+6fw9sLeHV4k3ZMjR+9vjGsmwvummsWco4f9MJQ8pJofqaUnJDy/PCppX
6fNbkOgyH9xBYquYcwaIm/wxyl6ueGpUgDmrCTpYuUnRt0MiYUOL/cdRDSKk19cy
86ICSyusQjOaFKKrnsQl2Q9EAwDeojs5gel9X0+ZMYb5utH67pj8aRoAmINADg30
/MhLiTWbXbH7PUhli/nk9h6JFVMpBoiorpY+HImNv5BlRbulT7Or1T7Y8+yNOu77
z15gFckBy/wOJqKzKwsUrsJZPj/c9AxmQ3nKg3LbRNHg38IGI+EiXD0SGzyssvzj
bOQxXjPnAKRdWaFopW47Ykkv1RuVBxJl1WD7l2nDYap+VLk2ZzzzVOypfxRvgwjs
cxw5a/XHBeywIxjjq+3JhV9TBZEEvXAQw4egwu07/0Az3240ryYIEbX7GtAZWhmI
f1is3RK0ahJLSG26tSLt
=TIRs
-END PGP SIGNATURE-

Stephane Glondu (13):
  Imported Upstream version 1.5.7
  Imported Upstream version 1.5.8
  Imported Upstream version 1.5.9
  Imported Upstream version 1.6.0
  Imported Upstream version 1.6.1
  Merge commit 'upstream/1.6.1'
  New upstream release
  Refresh patches
  Switch source package format to 3.0 (quilt)
  Bump debhelper compatibility level to 8
  Remove old versioned dependencies
  Bump Standards-Version to 3.9.2
  Update changelog and prepare upload to unstable

---

-- 
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.5.7, created. upstream/1.5.7

2011-07-12 Thread Stephane Glondu
The annotated tag, upstream/1.5.7 has been created
at  278362de666cc8a9d8e143ca6c54c17d3a7be2ee (tag)
   tagging  0224be7764504cd4365acf3f00dfce19662ae50d (commit)
  replaces  upstream/1.5.6
 tagged by  Stephane Glondu
on  Wed Jul 6 14:25:14 2011 +0200

- Shortlog 
Upstream version 1.5.7

Stephane Glondu (1):
  Imported Upstream version 1.5.7

---

-- 
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. 55a5f67276c1073c672cd754f4ee32ef487b267f

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit 55a5f67276c1073c672cd754f4ee32ef487b267f
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:45 2011 +0200

pristine-tar data for ocaml-sqlite3_1.6.1.orig.tar.gz

diff --git a/ocaml-sqlite3_1.6.1.orig.tar.gz.delta 
b/ocaml-sqlite3_1.6.1.orig.tar.gz.delta
new file mode 100644
index 000..da2dad7
Binary files /dev/null and b/ocaml-sqlite3_1.6.1.orig.tar.gz.delta differ
diff --git a/ocaml-sqlite3_1.6.1.orig.tar.gz.id 
b/ocaml-sqlite3_1.6.1.orig.tar.gz.id
new file mode 100644
index 000..254ae76
--- /dev/null
+++ b/ocaml-sqlite3_1.6.1.orig.tar.gz.id
@@ -0,0 +1 @@
+51d0b35f7c19412e8d96714ad377a8cef57d7870

-- 
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. 55a5f67276c1073c672cd754f4ee32ef487b267f

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit 71c3bc161e8231b5c11d759744f9001a615bfe59
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:17 2011 +0200

pristine-tar data for ocaml-sqlite3_1.6.0.orig.tar.gz

diff --git a/ocaml-sqlite3_1.6.0.orig.tar.gz.delta 
b/ocaml-sqlite3_1.6.0.orig.tar.gz.delta
new file mode 100644
index 000..88bad1d
Binary files /dev/null and b/ocaml-sqlite3_1.6.0.orig.tar.gz.delta differ
diff --git a/ocaml-sqlite3_1.6.0.orig.tar.gz.id 
b/ocaml-sqlite3_1.6.0.orig.tar.gz.id
new file mode 100644
index 000..d827df4
--- /dev/null
+++ b/ocaml-sqlite3_1.6.0.orig.tar.gz.id
@@ -0,0 +1 @@
+b49f8c0b82b4757a07be778a6fa740256fb0a38d

-- 
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. 55a5f67276c1073c672cd754f4ee32ef487b267f

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit f66bd57772cb790d56687412597417da6543e776
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:16 2011 +0200

pristine-tar data for ocaml-sqlite3_1.5.9.orig.tar.gz

diff --git a/ocaml-sqlite3_1.5.9.orig.tar.gz.delta 
b/ocaml-sqlite3_1.5.9.orig.tar.gz.delta
new file mode 100644
index 000..215b6f9
Binary files /dev/null and b/ocaml-sqlite3_1.5.9.orig.tar.gz.delta differ
diff --git a/ocaml-sqlite3_1.5.9.orig.tar.gz.id 
b/ocaml-sqlite3_1.5.9.orig.tar.gz.id
new file mode 100644
index 000..2a80b56
--- /dev/null
+++ b/ocaml-sqlite3_1.5.9.orig.tar.gz.id
@@ -0,0 +1 @@
+aee74ccca24186e99170954f2cd2be822e2bad1a

-- 
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. 55a5f67276c1073c672cd754f4ee32ef487b267f

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit b9c9e0f67166c8fe3997725da1f8b6682a76e8f3
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:15 2011 +0200

pristine-tar data for ocaml-sqlite3_1.5.8.orig.tar.gz

diff --git a/ocaml-sqlite3_1.5.8.orig.tar.gz.delta 
b/ocaml-sqlite3_1.5.8.orig.tar.gz.delta
new file mode 100644
index 000..167a823
Binary files /dev/null and b/ocaml-sqlite3_1.5.8.orig.tar.gz.delta differ
diff --git a/ocaml-sqlite3_1.5.8.orig.tar.gz.id 
b/ocaml-sqlite3_1.5.8.orig.tar.gz.id
new file mode 100644
index 000..92d2606
--- /dev/null
+++ b/ocaml-sqlite3_1.5.8.orig.tar.gz.id
@@ -0,0 +1 @@
+c81a6f980551b45caf9a7f4f2db24b0d8b8870c9

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 3b5bc858cf05d61658ed10921f002f50e53d24f1
Author: Stephane Glondu 
Date:   Tue Jul 12 08:56:25 2011 +0200

Update changelog and prepare upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 5175cbb..08fe2db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ocaml-sqlite3 (1.6.1-1) UNRELEASED; urgency=low
+ocaml-sqlite3 (1.6.1-1) unstable; urgency=low
 
   * New upstream release
+  * Switch source package format to 3.0 (quilt)
+  * Bump Standards-Version to 3.9.2
+  * Bump debhelper compat level to 8
 
- -- Stéphane Glondu   Wed, 06 Jul 2011 14:28:19 +0200
+ -- Stéphane Glondu   Tue, 12 Jul 2011 08:56:20 +0200
 
 ocaml-sqlite3 (1.5.6-3) unstable; urgency=low
 

-- 
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. 55a5f67276c1073c672cd754f4ee32ef487b267f

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the pristine-tar branch:
commit d710aee75e3a98e5763c69d263fe20f52b563cf3
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:14 2011 +0200

pristine-tar data for ocaml-sqlite3_1.5.7.orig.tar.gz

diff --git a/ocaml-sqlite3_1.5.7.orig.tar.gz.delta 
b/ocaml-sqlite3_1.5.7.orig.tar.gz.delta
new file mode 100644
index 000..1046ed1
Binary files /dev/null and b/ocaml-sqlite3_1.5.7.orig.tar.gz.delta differ
diff --git a/ocaml-sqlite3_1.5.7.orig.tar.gz.id 
b/ocaml-sqlite3_1.5.7.orig.tar.gz.id
new file mode 100644
index 000..eac1a45
--- /dev/null
+++ b/ocaml-sqlite3_1.5.7.orig.tar.gz.id
@@ -0,0 +1 @@
+0224be7764504cd4365acf3f00dfce19662ae50d

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit ddbfab87e6979fbc68fc4d3763a57a652125359c
Author: Stephane Glondu 
Date:   Tue Jul 12 08:52:24 2011 +0200

Bump Standards-Version to 3.9.2

diff --git a/debian/control b/debian/control
index 4739e44..cd0e053 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  libsqlite3-dev (>= 3.3.9),
  ocaml-findlib (>= 1.2.5),
  dh-ocaml (>= 0.9)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Section: ocaml
 Homepage: http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 27b812b98505d87d84ebfffd3d1469e2abbbf5f2
Author: Stephane Glondu 
Date:   Tue Jul 12 08:51:43 2011 +0200

Remove old versioned dependencies

diff --git a/debian/control b/debian/control
index dcb1798..4739e44 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Provides: ${ocaml:Provides}
-Replaces: libsqlite3-ocaml-dev (<< 1.4.0-2)
-Conflicts: libsqlite3-ocaml-dev (<< 1.4.0-2)
-Breaks: ocsigen (<< 1.2.2)
 Description: Embeddable SQL Database for OCaml Programs
  This package provides an interface for the SQLite3 embeddable SQL
  database. It allows your OCaml programs to use a SQL database without
@@ -45,7 +42,6 @@ Depends:
  ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Breaks: ocsigen (<< 1.2.2)
 Description: Embeddable SQL Database for OCaml Programs
  This package provides an interface for the SQLite3 embeddable SQL
  database. It allows your OCaml programs to use a SQL database without

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit b369550aeed8cb385b12a98b04c6c3765d346df3
Author: Stephane Glondu 
Date:   Tue Jul 12 08:49:41 2011 +0200

Bump debhelper compatibility level to 8

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 3b12bfe..dcb1798 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Uploaders:
  Samuel Mimram ,
  Stéphane Glondu 
 Build-Depends:
- debhelper (>= 7.2.11~),
+ debhelper (>= 8),
  ocaml-nox (>= 3.11.1-3~),
  camlp4,
  libsqlite3-dev (>= 3.3.9),
diff --git a/debian/rules b/debian/rules
index 59cb9d5..bf01d76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk
 DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 %:
-   dh --with ocaml $@
+   dh $@ --with ocaml
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 09bda36f10e2af733aacf250d8d57aab592a1a8e
Author: Stephane Glondu 
Date:   Tue Jul 12 08:48:56 2011 +0200

Switch source package format to 3.0 (quilt)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/control b/debian/control
index cad4a62..3b12bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders:
  Stéphane Glondu 
 Build-Depends:
  debhelper (>= 7.2.11~),
- quilt (>= 0.46-7~),
  ocaml-nox (>= 3.11.1-3~),
  camlp4,
  libsqlite3-dev (>= 3.3.9),
diff --git a/debian/rules b/debian/rules
index bdf9218..59cb9d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/ocaml/ocamlvars.mk
 DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 %:
-   dh --with quilt,ocaml $@
+   dh --with ocaml $@
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 334573515175deb26901b32d372e5049a53ea5f8
Author: Stephane Glondu 
Date:   Wed Jul 6 14:29:54 2011 +0200

Refresh patches

diff --git a/debian/patches/0001-Install-no-mktop.patch 
b/debian/patches/0001-Install-no-mktop.patch
index a38a0c3..9c49743 100644
--- a/debian/patches/0001-Install-no-mktop.patch
+++ b/debian/patches/0001-Install-no-mktop.patch
@@ -1,6 +1,6 @@
 From: Samuel Mimram 
 Date: Tue, 30 Jun 2009 20:38:46 +0200
-Subject: [PATCH] Install no mktop
+Subject: Install no mktop
 
 Allow installation without building in native mode
 
diff --git 
a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
 
b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
index 75a74d4..e67de6a 100644
--- 
a/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
+++ 
b/debian/patches/0002-Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch
@@ -1,6 +1,6 @@
 From: Stephane Glondu 
 Date: Sun, 18 Oct 2009 15:27:11 +0200
-Subject: [PATCH] Do native test only if sqlite3.cmxa has been compiled
+Subject: Do native test only if sqlite3.cmxa has been compiled
 
 Signed-off-by: Stephane Glondu 
 ---
@@ -22,7 +22,7 @@ index 9f0ef79..0e03f2c 100644
  
  clean:
 diff --git a/test/Makefile b/test/Makefile
-index 6f44141..4073644 100644
+index 8bfed3b..d379649 100644
 --- a/test/Makefile
 +++ b/test/Makefile
 @@ -5,7 +5,7 @@ TESTS = $(wildcard *.ml)
@@ -33,5 +33,5 @@ index 6f44141..4073644 100644
 +opt: $(if $(wildcard ../sqlite3.cmxa),$(TESTS:%.ml=%.exe),)
  
  %.bc: %.ml
-   ocamlc -w Ae -warn-error Ae -I .. str.cma sqlite3.cma $< -o $@
+   ocamlc -w Ae -warn-error Ae -I .. -dllpath .. str.cma sqlite3.cma $< -o 
$@
 -- 

-- 
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.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 9e89d5771182b9b8657a1ce1511ab417209efbc4
Merge: 264ccba20513096b962c74f815902b4acb232559 
51d0b35f7c19412e8d96714ad377a8cef57d7870
Author: Stephane Glondu 
Date:   Wed Jul 6 14:25:45 2011 +0200

Merge commit 'upstream/1.6.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 branch, master, updated. debian/1.5.6-3-13-g3b5bc85

2011-07-12 Thread Stephane Glondu
The following commit has been merged in the master branch:
commit 9e5d439cc29ec703542f5afbc409cbb8bf4a9188
Author: Stephane Glondu 
Date:   Wed Jul 6 14:28:25 2011 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 90c812c..5175cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-sqlite3 (1.6.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu   Wed, 06 Jul 2011 14:28:19 +0200
+
 ocaml-sqlite3 (1.5.6-3) unstable; urgency=low
 
   * Add Do-native-test-only-if-sqlite3.cmxa-has-been-compile.patch

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