Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / mysql-ocaml
Commits: 281d9e8b by Stephane Glondu at 2026-07-04T12:45:33+02:00 Pass LDFLAGS with -ldopt to ocamlmklib - - - - - 2bff3dfb by Stephane Glondu at 2026-07-04T12:45:33+02:00 Update packaging - - - - - 76bbec12 by Stephane Glondu at 2026-07-04T12:45:33+02:00 Update changelog and prepare upload to unstable - - - - - 8 changed files: - debian/changelog - debian/control - + debian/debian-findlib - + debian/dh-ocaml.conf.json - − debian/libmysql-ocaml-dev.install.in - − debian/libmysql-ocaml.install.in - + debian/patches/0001-Pass-LDFLAGS-with-ldopt-to-ocamlmklib.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +mysql-ocaml (1.2.4-4) unstable; urgency=medium + + * Team upload + * Pass LDFLAGS with -ldopt to ocamlmklib + * Use dh_ocamllibinstall and set dune_layout_version to 1 + + -- Stéphane Glondu <[email protected]> Sat, 04 Jul 2026 12:13:27 +0200 + mysql-ocaml (1.2.4-3) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Uploaders: Build-Depends: debhelper-compat (= 13), libmariadb-dev, - dh-ocaml, + dh-ocaml (>= 3.5~), ocaml, ocaml-findlib Standards-Version: 4.7.4 @@ -22,6 +22,8 @@ Depends: ${shlibs:Depends} Provides: ${ocaml:Provides} +Breaks: libmysql-ocaml-dev (<< 1.2.4-4~) +Replaces: libmysql-ocaml-dev (<< 1.2.4-4~) 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. ===================================== debian/debian-findlib ===================================== @@ -0,0 +1 @@ +mysql ===================================== debian/dh-ocaml.conf.json ===================================== @@ -0,0 +1,4 @@ +{ + "dune_layout_version": 1, + "dh_ocamllibinstall": true +} ===================================== debian/libmysql-ocaml-dev.install.in deleted ===================================== @@ -1,4 +0,0 @@ -@OCamlStdlibDir@/mysql/META -@OCamlStdlibDir@/mysql/*.a -@OCamlStdlibDir@/mysql/*.cm* -@OCamlStdlibDir@/mysql/*.ml* ===================================== debian/libmysql-ocaml.install.in deleted ===================================== @@ -1 +0,0 @@ -@OCamlStdlibDir@/mysql/dllmysql_stubs.so @OCamlDllDir@ ===================================== debian/patches/0001-Pass-LDFLAGS-with-ldopt-to-ocamlmklib.patch ===================================== @@ -0,0 +1,21 @@ +From: Stephane Glondu <[email protected]> +Date: Sat, 4 Jul 2026 12:10:02 +0200 +Subject: Pass LDFLAGS with -ldopt to ocamlmklib + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 0990dfc..46c6507 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -10,7 +10,7 @@ CFLAGS=@CFLAGS@ @DEFS@ -Wall -Wextra + CPPFLAGS=@CPPFLAGS@ + CLIBS=$(foreach x, $(filter -l%, @LDFLAGS@), $(patsubst -l%,%,${x})) + LDFLAGS=$(filter-out -l%, @LDFLAGS@) +-OCAMLMKLIB_FLAGS=$(LDFLAGS) ++OCAMLMKLIB_FLAGS=-ldopt "$(LDFLAGS)" + OCAMLFIND_INSTFLAGS=-patch-version "$(VERSION)" + + build: all opt ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-Pass-LDFLAGS-with-ldopt-to-ocamlmklib.patch View it on GitLab: https://salsa.debian.org/ocaml-team/mysql-ocaml/-/compare/ca68b13ea4aca7bf103ed316ddeae1e6cbf06564...76bbec12d75e7dbc938c5b6f64d0cc9ba2a61f6c -- View it on GitLab: https://salsa.debian.org/ocaml-team/mysql-ocaml/-/compare/ca68b13ea4aca7bf103ed316ddeae1e6cbf06564...76bbec12d75e7dbc938c5b6f64d0cc9ba2a61f6c You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
