Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / camlmix
Commits: 88eea3cf by Stephane Glondu at 2024-06-14T15:30:03+02:00 Refresh patch - - - - - 72a8260a by Stephane Glondu at 2024-06-14T15:30:41+02:00 Add dependency to camlp-streams - - - - - b709212a by Stephane Glondu at 2024-06-14T15:30:47+02:00 Update changelog - - - - - 6 changed files: - debian/changelog - debian/control - + debian/patches/0002-Add-dependency-to-camlp-streams.patch - debian/patches/fix-lintian-spelling-error.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +camlmix (1.3.1-6) UNRELEASED; urgency=medium + + * Add dependency to camlp-streams + + -- Stéphane Glondu <[email protected]> Fri, 14 Jun 2024 15:30:45 +0200 + camlmix (1.3.1-5) unstable; urgency=medium * Team upload ===================================== debian/control ===================================== @@ -6,6 +6,7 @@ Build-Depends: debhelper-compat (= 13), ocaml, ocaml-findlib, + libcamlp-streams-ocaml-dev, dh-ocaml Standards-Version: 4.5.0 Rules-Requires-Root: no ===================================== debian/patches/0002-Add-dependency-to-camlp-streams.patch ===================================== @@ -0,0 +1,20 @@ +From: Stephane Glondu <[email protected]> +Date: Fri, 14 Jun 2024 15:29:31 +0200 +Subject: Add dependency to camlp-streams + +--- + Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile b/Makefile +index f9622ac..e7a8777 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,7 @@ + VERSION = 1.3.1 + export VERSION + ++PACKS = camlp-streams + SOURCES = \ + version.ml lexer.mli lexer.mll \ + parser_directive.mly directive.ml main.ml ===================================== debian/patches/fix-lintian-spelling-error.patch ===================================== @@ -1,8 +1,16 @@ -Description: fix a lintian spelling error -Author: Hendrik Tews <[email protected]> +From: Hendrik Tews <[email protected]> +Date: Fri, 14 Jun 2024 15:29:10 +0200 +Subject: fix a lintian spelling error + +--- + main.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.ml b/main.ml +index ee8e3bc..382f68a 100644 --- a/main.ml +++ b/main.ml -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ e.g.: Hello ## @include \"world.mlx\"; skip .## ## let x = 123 ##! Advanced usage: The OCaml program that is generated from the Camlmix files first defines a module called Camlmix. This module contains several variables that are ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ fix-lintian-spelling-error.patch +0002-Add-dependency-to-camlp-streams.patch ===================================== debian/rules ===================================== @@ -16,7 +16,7 @@ include /usr/share/ocaml/ocamlvars.mk .PHONY: override_dh_auto_build override_dh_auto_build: ifeq ($(OCAML_HAVE_OCAMLOPT),yes) - make OCAMLOPT=ocamlopt.opt OCAMLC=ocamlc.opt native + make native else make byte endif View it on GitLab: https://salsa.debian.org/ocaml-team/camlmix/-/compare/a36097b2215778ca11b0ed8fdfa683d9031cba97...b709212ac576b518870c2dc7997bf28b1c3db8b3 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/ocaml-team/camlmix/-/compare/a36097b2215778ca11b0ed8fdfa683d9031cba97...b709212ac576b518870c2dc7997bf28b1c3db8b3 You're receiving this email because of your account on salsa.debian.org.
