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
-
72a8260a
by Stephane Glondu at 2024-06-14T15:30:41+02:00
-
b709212a
by Stephane Glondu at 2024-06-14T15:30:47+02:00
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:
| 1 | +camlmix (1.3.1-6) UNRELEASED; urgency=medium
|
|
| 2 | + |
|
| 3 | + * Add dependency to camlp-streams
|
|
| 4 | + |
|
| 5 | + -- Stéphane Glondu <glondu@debian.org> Fri, 14 Jun 2024 15:30:45 +0200
|
|
| 6 | + |
|
| 1 | 7 | camlmix (1.3.1-5) unstable; urgency=medium
|
| 2 | 8 | |
| 3 | 9 | * Team upload
|
| ... | ... | @@ -6,6 +6,7 @@ Build-Depends: |
| 6 | 6 | debhelper-compat (= 13),
|
| 7 | 7 | ocaml,
|
| 8 | 8 | ocaml-findlib,
|
| 9 | + libcamlp-streams-ocaml-dev,
|
|
| 9 | 10 | dh-ocaml
|
| 10 | 11 | Standards-Version: 4.5.0
|
| 11 | 12 | Rules-Requires-Root: no
|
| 1 | +From: Stephane Glondu <steph@glondu.net>
|
|
| 2 | +Date: Fri, 14 Jun 2024 15:29:31 +0200
|
|
| 3 | +Subject: Add dependency to camlp-streams
|
|
| 4 | + |
|
| 5 | +---
|
|
| 6 | + Makefile | 1 +
|
|
| 7 | + 1 file changed, 1 insertion(+)
|
|
| 8 | + |
|
| 9 | +diff --git a/Makefile b/Makefile
|
|
| 10 | +index f9622ac..e7a8777 100644
|
|
| 11 | +--- a/Makefile
|
|
| 12 | ++++ b/Makefile
|
|
| 13 | +@@ -4,6 +4,7 @@
|
|
| 14 | + VERSION = 1.3.1
|
|
| 15 | + export VERSION
|
|
| 16 | +
|
|
| 17 | ++PACKS = camlp-streams
|
|
| 18 | + SOURCES = \
|
|
| 19 | + version.ml lexer.mli lexer.mll \
|
|
| 20 | + parser_directive.mly directive.ml main.ml |
| 1 | -Description: fix a lintian spelling error
|
|
| 2 | -Author: Hendrik Tews <hendrik@askra.de>
|
|
| 1 | +From: Hendrik Tews <hendrik@askra.de>
|
|
| 2 | +Date: Fri, 14 Jun 2024 15:29:10 +0200
|
|
| 3 | +Subject: fix a lintian spelling error
|
|
| 4 | + |
|
| 5 | +---
|
|
| 6 | + main.ml | 2 +-
|
|
| 7 | + 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
| 8 | + |
|
| 9 | +diff --git a/main.ml b/main.ml
|
|
| 10 | +index ee8e3bc..382f68a 100644
|
|
| 3 | 11 | --- a/main.ml
|
| 4 | 12 | +++ b/main.ml
|
| 5 | -@@ -43,7 +43,7 @@
|
|
| 13 | +@@ -43,7 +43,7 @@ e.g.: Hello ## @include \"world.mlx\"; skip .## ## let x = 123 ##!
|
|
| 6 | 14 | Advanced usage:
|
| 7 | 15 | The OCaml program that is generated from the Camlmix files first defines
|
| 8 | 16 | a module called Camlmix. This module contains several variables that are
|
| 1 | 1 | fix-lintian-spelling-error.patch
|
| 2 | +0002-Add-dependency-to-camlp-streams.patch |
| ... | ... | @@ -16,7 +16,7 @@ include /usr/share/ocaml/ocamlvars.mk |
| 16 | 16 | .PHONY: override_dh_auto_build
|
| 17 | 17 | override_dh_auto_build:
|
| 18 | 18 | ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
|
| 19 | - make OCAMLOPT=ocamlopt.opt OCAMLC=ocamlc.opt native
|
|
| 19 | + make native
|
|
| 20 | 20 | else
|
| 21 | 21 | make byte
|
| 22 | 22 | endif
|