Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / ocamldsort
Commits: b2c373fa by Stephane Glondu at 2024-08-09T11:34:19+02:00 Refresh patches - - - - - e302526e by Stephane Glondu at 2024-08-09T11:34:38+02:00 Fix compilation with OCaml 5.2.0 (Closes: #1073893) - - - - - eef6296c by Stephane Glondu at 2024-08-09T11:35:08+02:00 Update changelog and prepare upload to unstable - - - - - 4 changed files: - debian/changelog - + debian/patches/0002-Fix-compilation-with-OCaml-5.2.0.patch - debian/patches/manpage - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +ocamldsort (0.16.0-9) unstable; urgency=medium + + * Team upload + * Fix compilation with OCaml 5.2.0 (Closes: #1073893) + + -- Stéphane Glondu <[email protected]> Fri, 09 Aug 2024 11:35:06 +0200 + ocamldsort (0.16.0-8) unstable; urgency=medium * Team upload ===================================== debian/patches/0002-Fix-compilation-with-OCaml-5.2.0.patch ===================================== @@ -0,0 +1,28 @@ +From: Stephane Glondu <[email protected]> +Date: Fri, 9 Aug 2024 11:33:23 +0200 +Subject: Fix compilation with OCaml 5.2.0 + +Bug-Debian: https://bugs.debian.org/1073893 +--- + Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e93162e..7a83ec2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,10 +27,12 @@ EXE_OPT=$(EXE).opt + + # Compilation flags + ###################### +-COMPFLAGS=$(PPFLAGS) ++INCLUDES=-I +camlp-streams -I +unix ++COMPFLAGS=$(INCLUDES) $(PPFLAGS) ++LINKFLAGS=$(INCLUDES) + PPFLAGS=-pp camlp4o + +-LIB=unix.cma ++LIB=unix.cma camlp_streams.cma + LIB_OPT=$(LIB:.cma=.cmxa) + CMO_FILES=files.cmo dep_debug.cmo dep_error.cmo dep_parse.cmo params.cmo \ + dependencies.cmo dep_sort.cmo main.cmo ===================================== debian/patches/manpage ===================================== @@ -1,11 +1,16 @@ -Author: Ralf Treinen < [email protected]> -Description: typo in manpage +From: Ralf Treinen <[email protected]> +Date: Fri, 9 Aug 2024 11:29:07 +0200 +Subject: typo in manpage -Index: ocamldsort/ocamldsort.1 -=================================================================== ---- ocamldsort.orig/ocamldsort.1 2016-10-25 09:06:15.180706933 +0200 -+++ ocamldsort/ocamldsort.1 2016-10-25 20:07:44.857832791 +0200 -@@ -144,7 +144,7 @@ +--- + ocamldsort.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ocamldsort.1 b/ocamldsort.1 +index 5774fae..110cdae 100644 +--- a/ocamldsort.1 ++++ b/ocamldsort.1 +@@ -144,7 +144,7 @@ Sort files using mli dependencies. .TP .BI \-nox ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ manpage +0002-Fix-compilation-with-OCaml-5.2.0.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ocamldsort/-/compare/d1ee8510111f4f7378be27bc738e130c98d9233e...eef6296c17c5f97c92d6674f2f07c757de93e573 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ocamldsort/-/compare/d1ee8510111f4f7378be27bc738e130c98d9233e...eef6296c17c5f97c92d6674f2f07c757de93e573 You're receiving this email because of your account on salsa.debian.org.
