[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 23038a85699a91724d56b9b1fb773078e5f8dd44 Merge: d68768b43f629068b5c0d133081da23c9558f431 889ff5dee3584843c7648dc3a842439e8cef49ec Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:03:18 2012 +0200 Merge tag 'upstream/1.1.1' Upstream version 1.1.1 -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 1860c2e77c4f3260215dc8dd58013f27904f5d09 Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:06:14 2012 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 901d309..bee5055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low + + * New upstream release + + -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200 + mysql-ocaml (1.0.4-7) unstable; urgency=low * Set maintainer as Debian OCaml Maintainers and Samuel as Uploader -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 7ed667bf0e83e747598c05af587bfb859986abb5 Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:06:48 2012 +0200 Add a Homepage field in debian/control. diff --git a/debian/changelog b/debian/changelog index bee5055..db8cdfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * New upstream release + * Add a Homepage field in debian/control. -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/control b/debian/control index 6cba0da..88b357d 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: ocaml-findlib (= 1.2.4), quilt (= 0.46-7~) Standards-Version: 3.8.3 +Homepage: http://ocaml-mysql.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit f6a4f22d83391492c2519f6778cbfe93ff9a205b Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:08:20 2012 +0200 Update debian/watch file. diff --git a/debian/changelog b/debian/changelog index db8cdfa..62b0143 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * New upstream release * Add a Homepage field in debian/control. + * Update debian/watch file. -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/watch b/debian/watch index a3d3d19..a9e0b9e 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ -version=2 -http://raevnos.pennmush.org/code/ocaml-mysql/ocaml-mysql-(.*)\.tar\.gz debian uupdate +version=3 +http://forge.ocamlcore.org/frs/?group_id=137 \ +.*/ocaml-mysql-([\d\.]*)\.tar\.gz -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit 982482e2702ea698c2c9cf7e06fa8043a8f14e0e
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 5 18:16:58 2012 +0200
Remove local patches, integrated by upstream.
diff --git a/debian/changelog b/debian/changelog
index 62b0143..7a8da62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* New upstream release
* Add a Homepage field in debian/control.
* Update debian/watch file.
+ * Remove local patches, integrated by upstream.
-- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200
diff --git a/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
b/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
deleted file mode 100644
index e552ad6..000
--- a/debian/patches/0001-Fix-creation-of-insecure-temporary-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Samuel Mimram smim...@debian.org
-Date: Sat, 31 Oct 2009 22:43:37 +0100
-Subject: [PATCH] Fix creation of insecure temporary files
-
-shtool creates temporary files in an insecure manner, which can be
-exploited through symlink attacks. Please see these URLs for details:
-http://www.zataz.net/adviso/shtool-05252005.txt
-http://bugs.gentoo.org/show_bug.cgi?id=93782
- etc/shtool |7 +++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/etc/shtool b/etc/shtool
-index 1253148..9a793da 100755
a/etc/shtool
-+++ b/etc/shtool
-@@ -379,6 +379,13 @@ if [ .$gen_tmpfile = .yes ]; then
- fi
- fi
- tmpfile=$tmpdir/.shtool.$$
-+if mkdir $tmpdir/.shtool.$$; then
-+tmpfile=$tmpdir/.shtool.$$/shtool.tmp
-+else
-+echo $msgprefix:Error: failed to create temporary file 12
-+exit 1
-+fi
-+tmpfile=$tmpdir/.shtool.$$/shtool.tmp
- rm -f $tmpfile /dev/null 21
- touch $tmpfile
- fi
---
diff --git a/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
b/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
deleted file mode 100644
index b26b1fd..000
--- a/debian/patches/0002-Add-mysql_real_escape_string-to-the-API.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: Mehdi Dogguy me...@debian.org
-Date: Thu, 1 Oct 2009 22:34:22 +0200
-Subject: [PATCH] Add mysql_real_escape_string to the API
-
- mysql.ml | 18 --
- mysql.mli |5 +
- mysql_stubs.c | 27 +++
- 3 files changed, 44 insertions(+), 6 deletions(-)
-
-diff --git a/mysql.ml b/mysql.ml
-index ae6b6ed..324380c 100644
a/mysql.ml
-+++ b/mysql.ml
-@@ -333,6 +333,7 @@ external exec : dbd - string - result
= db_exec
- external real_status : dbd - int = db_status
- external errmsg : dbd - string option = db_errmsg
- external escape : string - string = db_escape
-+external real_escape: dbd - string - string = db_real_escape
- external fetch : result - string option array option = db_fetch
- external to_row : result - int64 - unit = db_to_row
- external size : result - int64 = db_size
-@@ -516,7 +517,9 @@ let column result =
-the corresponding type *)
-
- let ml2str str = ' ^ escape str ^ '
-+let ml2rstr conn str = ' ^ real_escape conn str ^ '
- let ml2blob = ml2str
-+let ml2rblob= ml2rstr
- let ml2int x= string_of_int x
- let ml2decimal x= x
- let ml322int x = Int32.to_string x
-@@ -524,12 +527,15 @@ let ml642int x = Int64.to_string x
- let mlnative2int x = Nativeint.to_string x
- let ml2float x = string_of_float x
- let ml2enum x = escape x
--let ml2set x= let rec loop arg = match arg with
--| []-
--| [x] - escape x
--| x::y::ys - escape x ^ , ^ loop (y::ys)
-- in
--loop x
-+let ml2renum x = real_escape x
-+let ml2set_filter f x =
-+ let rec loop f = function
-+ | []-
-+ | [x] - f x
-+ | x::y::ys - f x ^ , ^ loop f (y::ys)
-+ in loop f x
-+let ml2set x = ml2set_filter escape x
-+let ml2rset conn x = ml2set_filter (real_escape conn) x
-
- let ml2datetimel ~year ~month ~day ~hour ~min ~sec =
- Printf.sprintf '%04d-%02d-%02d %02d:%02d:%02d'
-diff --git a/mysql.mli b/mysql.mli
-index 226bc05..2d01108 100644
a/mysql.mli
-+++ b/mysql.mli
-@@ -230,6 +230,7 @@ val fetch_field_dir : result - int - field option
- (** [escape str] returns the same string as [str] in MySQL syntax with
- special characters quoted to not confuse the MySQL parser *)
- val escape : string - string
-+val real_escape : dbd - string - string
-
- (** [xxx2ml str] decodes a MySQL value of type xxx into a corresponding
- OCaml value *)
-@@ -277,14 +278,18 @@ val not_null : ('a - 'b) - 'a option - 'b
- (** [ml2xxx v] encodes [v] into MySQL syntax. *)
[Pkg-ocaml-maint-commits] [SCM] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit d2b05dafe216cc66168bd99bf3f2f3763bc405f3 Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:23:52 2012 +0200 Various packaging updates * Bump standards version to 3.9.3 * Switch source package format to 3.0 (quilt) * ... diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 25f8895..000 --- a/debian/README.source +++ /dev/null @@ -1,5 +0,0 @@ -This package uses quilt for patching the source. - -Please consider reading quilt manpage to patch the source. - - -- Mehdi Dogguy me...@debian.org, Sat, 31 Oct 2009 23:00:13 +0100 diff --git a/debian/changelog b/debian/changelog index 7a8da62..4431f0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low * Add a Homepage field in debian/control. * Update debian/watch file. * Remove local patches, integrated by upstream. + * Bump standards version to 3.9.3 + * Switch source package format to 3.0 (quilt) -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200 diff --git a/debian/control b/debian/control index 88b357d..9bdfc63 100644 --- a/debian/control +++ b/debian/control @@ -11,9 +11,8 @@ Build-Depends: dh-ocaml (= 0.9), ocaml-nox (= 3.11), camlp4 (= 3.11), - ocaml-findlib (= 1.2.4), - quilt (= 0.46-7~) -Standards-Version: 3.8.3 + ocaml-findlib (= 1.2.4) +Standards-Version: 3.9.3 Homepage: http://ocaml-mysql.forge.ocamlcore.org/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mysql-ocaml.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mysql-ocaml.git diff --git a/debian/rules b/debian/rules index 79500a9..0a15396 100755 --- a/debian/rules +++ b/debian/rules @@ -45,4 +45,4 @@ override_dh_installchangelogs: dh_installchangelogs CHANGES %: - dh --with quilt,ocaml $@ + dh --with ocaml $@ 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) -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch: commit 659bf2d61ccef17481717fcced6b42fd27485579 Author: Mehdi Dogguy me...@debian.org Date: Tue Jun 5 18:38:43 2012 +0200 Generate ref doc using dh_ocamldoc diff --git a/debian/libmysql-ocaml-dev.doc-base b/debian/libmysql-ocaml-dev.doc-base deleted file mode 100644 index 12ba604..000 --- a/debian/libmysql-ocaml-dev.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: libmysql-ocaml-dev-ocamldoc-api-reference -Title: libmysql-ocaml-dev OCamldoc API Reference -Abstract: API reference manual for libmysql-ocaml-dev -Section: Programming/OCaml - -Format: HTML -Index: /usr/share/doc/libmysql-ocaml-dev/html/index.html -Files: /usr/share/doc/libmysql-ocaml-dev/html/* diff --git a/debian/libmysql-ocaml-dev.docs b/debian/libmysql-ocaml-dev.docs deleted file mode 100644 index cecaa8e..000 --- a/debian/libmysql-ocaml-dev.docs +++ /dev/null @@ -1,2 +0,0 @@ -README -doc/html diff --git a/debian/libmysql-ocaml-dev.ocamldoc b/debian/libmysql-ocaml-dev.ocamldoc new file mode 100644 index 000..f6e1841 --- /dev/null +++ b/debian/libmysql-ocaml-dev.ocamldoc @@ -0,0 +1 @@ +# ref doc is generated using dh_ocamldoc(1) -- mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit d78787b7663d9ea009f2debbe778bb4b8ffdd4ec
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 5 18:45:55 2012 +0200
Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
diff --git a/debian/changelog b/debian/changelog
index 4431f0f..d1b574c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* Remove local patches, integrated by upstream.
* Bump standards version to 3.9.3
* Switch source package format to 3.0 (quilt)
+ * Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
-- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200
diff --git a/debian/control b/debian/control
index 9bdfc63..933a9ea 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Depends:
${shlibs:Depends}
Provides:
${ocaml:Provides}
-Description: OCaml bindings for MySql
+Description: OCaml bindings for MySql (runtime package)
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
.
@@ -40,7 +40,7 @@ Depends:
libmysqlclient15-dev
Provides:
${ocaml:Provides}
-Description: OCaml bindings for MySql
+Description: OCaml bindings for MySql (development package)
This OCaml library interfaces the MySql C library. It can be used to access
and modify MySql databases from OCaml programs.
.
--
mysql-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] mysql-ocaml packaging branch, master, updated. debian/1.0.4-7-13-g3927e7f
The following commit has been merged in the master branch:
commit 3927e7ffcb833c701014c5e024b46e1fe65ee41f
Author: Mehdi Dogguy me...@debian.org
Date: Tue Jun 5 18:44:32 2012 +0200
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index d1b574c..d135bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
+mysql-ocaml (1.1.1-1) unstable; urgency=low
* New upstream release
* Add a Homepage field in debian/control.
@@ -8,7 +8,7 @@ mysql-ocaml (1.1.1-1) UNRELEASED; urgency=low
* Switch source package format to 3.0 (quilt)
* Fix lintian's duplicate-short-description libmysql-ocaml{,-dev}
- -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:06:10 +0200
+ -- Mehdi Dogguy me...@debian.org Tue, 05 Jun 2012 18:44:32 +0200
mysql-ocaml (1.0.4-7) unstable; urgency=low
--
mysql-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
