Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / camomile
Commits:
-
7498f7c6
by Stephane Glondu at 2023-10-07T08:48:20+02:00
-
2f3f8647
by Stephane Glondu at 2023-10-07T08:49:28+02:00
-
01871645
by Stephane Glondu at 2023-10-07T08:49:48+02:00
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/0001-Drop-massive-locale-that-causes-FTBFS-on-some-archit.patch
- + debian/patches/series
Changes:
1 | +camomile (2.0.0-2) unstable; urgency=medium
|
|
2 | + |
|
3 | + * Team upload
|
|
4 | + * Drop massive locale that causes FTBFS on some architectures
|
|
5 | + |
|
6 | + -- Stéphane Glondu <glondu@debian.org> Sat, 07 Oct 2023 08:49:33 +0200
|
|
7 | + |
|
1 | 8 | camomile (2.0.0-1) unstable; urgency=medium
|
2 | 9 | |
3 | 10 | * Team upload
|
... | ... | @@ -9,7 +9,7 @@ Build-Depends: cppo, |
9 | 9 | docbook-xml,
|
10 | 10 | docbook-xsl,
|
11 | 11 | ocaml-dune (>= 1.6.2),
|
12 | - libdune-ocaml-dev,
|
|
12 | + libdune-ocaml-dev (>= 3.10.0-2~),
|
|
13 | 13 | libcamlp-streams-ocaml-dev,
|
14 | 14 | libxml2-utils,
|
15 | 15 | ocaml-findlib,
|
1 | +From: Stephane Glondu <steph@glondu.net>
|
|
2 | +Date: Sat, 7 Oct 2023 08:47:43 +0200
|
|
3 | +Subject: Drop massive locale that causes FTBFS on some architectures
|
|
4 | + |
|
5 | +---
|
|
6 | + src/locales/dune.inc | 7 -------
|
|
7 | + src/locales/index.txt | 1 -
|
|
8 | + 2 files changed, 8 deletions(-)
|
|
9 | + |
|
10 | +diff --git a/src/locales/dune.inc b/src/locales/dune.inc
|
|
11 | +index 76c250a..9ed9501 100644
|
|
12 | +--- a/src/locales/dune.inc
|
|
13 | ++++ b/src/locales/dune.inc
|
|
14 | +@@ -282,7 +282,6 @@ zh_MO.mar
|
|
15 | + zh_SG.mar
|
|
16 | + zh_TW.mar
|
|
17 | + zh_TW_STROKE.mar
|
|
18 | +-zh__PINYIN.mar
|
|
19 | + ))
|
|
20 | +
|
|
21 | + (alias
|
|
22 | +@@ -1963,9 +1962,3 @@ zh__PINYIN.mar
|
|
23 | + (deps (:x zh_TW_STROKE.txt) (alias database))
|
|
24 | + (action (run ../tools/camomilelocaledef.exe --file %{x} .)))
|
|
25 | +
|
|
26 | +-
|
|
27 | +-(rule
|
|
28 | +- (targets zh__PINYIN.mar)
|
|
29 | +- (deps (:x zh__PINYIN.txt) (alias database))
|
|
30 | +- (action (run ../tools/camomilelocaledef.exe --file %{x} .)))
|
|
31 | +-
|
|
32 | +diff --git a/src/locales/index.txt b/src/locales/index.txt
|
|
33 | +index f445ea1..fc8aded 100644
|
|
34 | +--- a/src/locales/index.txt
|
|
35 | ++++ b/src/locales/index.txt
|
|
36 | +@@ -277,7 +277,6 @@ index {
|
|
37 | + vi,
|
|
38 | + vi_VN,
|
|
39 | + zh,
|
|
40 | +- zh__PINYIN,
|
|
41 | + zh_CN,
|
|
42 | + zh_HK,
|
|
43 | + zh_MO, |
1 | +0001-Drop-massive-locale-that-causes-FTBFS-on-some-archit.patch |