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
-
e302526e
by Stephane Glondu at 2024-08-09T11:34:38+02:00
-
eef6296c
by Stephane Glondu at 2024-08-09T11:35:08+02:00
4 changed files:
- debian/changelog
- + debian/patches/0002-Fix-compilation-with-OCaml-5.2.0.patch
- debian/patches/manpage
- debian/patches/series
Changes:
| 1 | +ocamldsort (0.16.0-9) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Team upload
|
|
| 4 | + * Fix compilation with OCaml 5.2.0 (Closes: #1073893)
|
|
| 5 | + |
|
| 6 | + -- Stéphane Glondu <glondu@debian.org> Fri, 09 Aug 2024 11:35:06 +0200
|
|
| 7 | + |
|
| 1 | 8 | ocamldsort (0.16.0-8) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * Team upload
|
| 1 | +From: Stephane Glondu <steph@glondu.net>
|
|
| 2 | +Date: Fri, 9 Aug 2024 11:33:23 +0200
|
|
| 3 | +Subject: Fix compilation with OCaml 5.2.0
|
|
| 4 | + |
|
| 5 | +Bug-Debian: https://bugs.debian.org/1073893
|
|
| 6 | +---
|
|
| 7 | + Makefile.in | 6 ++++--
|
|
| 8 | + 1 file changed, 4 insertions(+), 2 deletions(-)
|
|
| 9 | + |
|
| 10 | +diff --git a/Makefile.in b/Makefile.in
|
|
| 11 | +index e93162e..7a83ec2 100644
|
|
| 12 | +--- a/Makefile.in
|
|
| 13 | ++++ b/Makefile.in
|
|
| 14 | +@@ -27,10 +27,12 @@ EXE_OPT=$(EXE).opt
|
|
| 15 | +
|
|
| 16 | + # Compilation flags
|
|
| 17 | + ######################
|
|
| 18 | +-COMPFLAGS=$(PPFLAGS)
|
|
| 19 | ++INCLUDES=-I +camlp-streams -I +unix
|
|
| 20 | ++COMPFLAGS=$(INCLUDES) $(PPFLAGS)
|
|
| 21 | ++LINKFLAGS=$(INCLUDES)
|
|
| 22 | + PPFLAGS=-pp camlp4o
|
|
| 23 | +
|
|
| 24 | +-LIB=unix.cma
|
|
| 25 | ++LIB=unix.cma camlp_streams.cma
|
|
| 26 | + LIB_OPT=$(LIB:.cma=.cmxa)
|
|
| 27 | + CMO_FILES=files.cmo dep_debug.cmo dep_error.cmo dep_parse.cmo params.cmo \
|
|
| 28 | + dependencies.cmo dep_sort.cmo main.cmo |
| 1 | -Author: Ralf Treinen < treinen@debian.org>
|
|
| 2 | -Description: typo in manpage
|
|
| 1 | +From: Ralf Treinen <treinen@debian.org>
|
|
| 2 | +Date: Fri, 9 Aug 2024 11:29:07 +0200
|
|
| 3 | +Subject: typo in manpage
|
|
| 3 | 4 | |
| 4 | -Index: ocamldsort/ocamldsort.1
|
|
| 5 | -===================================================================
|
|
| 6 | ---- ocamldsort.orig/ocamldsort.1 2016-10-25 09:06:15.180706933 +0200
|
|
| 7 | -+++ ocamldsort/ocamldsort.1 2016-10-25 20:07:44.857832791 +0200
|
|
| 8 | -@@ -144,7 +144,7 @@
|
|
| 5 | +---
|
|
| 6 | + ocamldsort.1 | 2 +-
|
|
| 7 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 8 | + |
|
| 9 | +diff --git a/ocamldsort.1 b/ocamldsort.1
|
|
| 10 | +index 5774fae..110cdae 100644
|
|
| 11 | +--- a/ocamldsort.1
|
|
| 12 | ++++ b/ocamldsort.1
|
|
| 13 | +@@ -144,7 +144,7 @@ Sort files using mli dependencies.
|
|
| 9 | 14 |
|
| 10 | 15 | .TP
|
| 11 | 16 | .BI \-nox
|
| 1 | 1 | manpage
|
| 2 | +0002-Fix-compilation-with-OCaml-5.2.0.patch |