diff -Nru festival-2.5.0/debian/changelog festival-2.5.0/debian/changelog --- festival-2.5.0/debian/changelog 2021-08-30 17:52:07.000000000 +0000 +++ festival-2.5.0/debian/changelog 2021-10-31 22:12:59.000000000 +0000 @@ -1,3 +1,20 @@ +festival (1:2.5.0-8) unstable; urgency=medium + + [ Debian Janitor ] + * Use secure URI in Homepage field. + * Update standards version to 4.5.1, no changes needed. + * Remove constraints unnecessary since buster: + + Build-Depends: Drop versioned constraint on dpkg-dev and libestools-dev. + + festival: Drop versioned constraint on adduser and lsb-base in Depends. + + festival-dev: Drop versioned constraint on libestools-dev in Depends. + + festival-doc: Drop versioned constraint on doc-base in Depends. + + [ Samuel Thibault ] + * rules: Set cross-build CC and CXX. + * rules: Pass CC and CXX to $(MAKE). + + -- Samuel Thibault Sun, 31 Oct 2021 23:12:59 +0100 + festival (1:2.5.0-7) unstable; urgency=medium * rules: Also force timezone to fix reproducibility. diff -Nru festival-2.5.0/debian/control festival-2.5.0/debian/control --- festival-2.5.0/debian/control 2021-08-29 14:55:49.000000000 +0000 +++ festival-2.5.0/debian/control 2021-09-26 00:01:30.000000000 +0000 @@ -9,14 +9,13 @@ Paul Gevers , Samuel Thibault Build-Depends: debhelper-compat (= 12), faketime, - libestools-dev (>= 1:2.5~), + libestools-dev, libncurses5-dev, texinfo, texlive-latex-base, - quilt, - dpkg-dev (>= 1.16.0) -Standards-Version: 4.5.0 -Homepage: http://www.cstr.ed.ac.uk/projects/festival/ + quilt +Standards-Version: 4.5.1 +Homepage: https://www.cstr.ed.ac.uk/projects/festival/ Vcs-Git: https://salsa.debian.org/tts-team/festival.git Vcs-Browser: https://salsa.debian.org/tts-team/festival Rules-Requires-Root: no @@ -24,9 +23,9 @@ Package: festival Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - adduser (>= 3.105), + adduser, alsa-utils [linux-any], - lsb-base (>= 3.0-10) + lsb-base Recommends: festvox-kallpc16k | festival-voice Suggests: pidgin-festival, festival-freebsoft-utils Description: General multi-lingual speech synthesis system @@ -40,7 +39,7 @@ Package: festival-dev Architecture: any -Depends: ${misc:Depends}, libestools-dev (>= 1:2.4~release) +Depends: ${misc:Depends}, libestools-dev Suggests: festival-doc Section: libdevel Description: Development kit for the Festival speech synthesis system @@ -50,7 +49,7 @@ Package: festival-doc Architecture: all -Depends: ${misc:Depends}, doc-base (>= 0.8.4) +Depends: ${misc:Depends}, doc-base Section: doc Description: Documentation for Festival This package contains the HTML and Postscript versions of the diff -Nru festival-2.5.0/debian/patches/23-fix-spelling-error-in-binary-festival.diff festival-2.5.0/debian/patches/23-fix-spelling-error-in-binary-festival.diff --- festival-2.5.0/debian/patches/23-fix-spelling-error-in-binary-festival.diff 1970-01-01 00:00:00.000000000 +0000 +++ festival-2.5.0/debian/patches/23-fix-spelling-error-in-binary-festival.diff 2021-10-19 20:34:31.000000000 +0000 @@ -0,0 +1,61 @@ +Description: fix lintian spelling-error-in-binary usr/bin/festival +Forwarded: yes +Author: xiao sheng wen + +--- +Last-Update: 2021-10-19 + +--- festival-2.5.0.orig/src/arch/festival/features.cc ++++ festival-2.5.0/src/arch/festival/features.cc +@@ -436,7 +436,7 @@ void festival_features_init(void) + "ANY.lisp_*\n\ + Apply Lisp function named after lisp_. The function is called with\n\ + an stream item. It must return an atomic value.\n\ +- This method may be inefficient and is primarily desgined to allow\n\ ++ This method may be inefficient and is primarily designed to allow\n\ + quick prototyping of new feature functions."); + + festival_def_ff_pref( +--- festival-2.5.0.orig/src/arch/festival/web.cc ++++ festival-2.5.0/src/arch/festival/web.cc +@@ -95,7 +95,7 @@ LISP lisp_get_url(LISP url,LISP filename + cerr << "url_get: malformed url" << endl; + festival_error(); + } +- host = us.get().string(); // upto next / ++ host = us.get().string(); // up to next / + if (us.peek() == ":") // a port is specified + { + us.get(); +--- festival-2.5.0.orig/src/modules/Text/token.cc ++++ festival-2.5.0/src/modules/Text/token.cc +@@ -663,7 +663,7 @@ void festival_token_init(void) + by letter to sound rules."); + festival_def_utt_module("Token_POS",FT_Token_POS_Utt, + "(Token_POS UTT)\n\ +- Assign feature token_pos to tokens thats match CART trees in the\n\ ++ Assign feature token_pos to tokens that match CART trees in the\n\ + variable token_pos_cart_trees. These are used for gross level pos\n\ + such as identifying how numbers should be pronunced."); + init_subr_2("builtin_english_token_to_words",l_word_it, +--- festival-2.5.0.orig/src/modules/Text/xxml.cc ++++ festival-2.5.0/src/modules/Text/xxml.cc +@@ -175,7 +175,7 @@ static LISP xxml_get_attribute(const EST + } + else + { +- cerr << "XXML: unknow attribute type " << remainder << endl; ++ cerr << "XXML: unknown attribute type " << remainder << endl; + festival_error(); + } + +--- festival-2.5.0.orig/src/modules/clunits/clunits.cc ++++ festival-2.5.0/src/modules/clunits/clunits.cc +@@ -809,6 +809,6 @@ void festival_clunits_init(void) + + init_subr_2("cl_mapping", l_cl_mapping, + "(cl_mapping UTT PARAMS)\n\ +- Impose prosody upto some percentage, and not absolutely."); ++ Impose prosody up to some percentage, and not absolutely."); + + } diff -Nru festival-2.5.0/debian/patches/series festival-2.5.0/debian/patches/series --- festival-2.5.0/debian/patches/series 2020-03-05 23:59:47.000000000 +0000 +++ festival-2.5.0/debian/patches/series 2021-10-19 20:33:46.000000000 +0000 @@ -21,3 +21,4 @@ 20-debian-filesystem-standard.diff 21-audio-choose-default.diff 22-hts-buffer-bounds-check.diff +23-fix-spelling-error-in-binary-festival.diff diff -Nru festival-2.5.0/debian/rules festival-2.5.0/debian/rules --- festival-2.5.0/debian/rules 2021-08-30 09:40:59.000000000 +0000 +++ festival-2.5.0/debian/rules 2021-09-26 01:38:25.000000000 +0000 @@ -10,6 +10,11 @@ FAKETIME = TZ=UTC faketime @$(SOURCE_DATE_EPOCH) endif +ifeq ($(origin CC),default) +CC := $(DEB_HOST_GNU_TYPE)-gcc +CXX := $(DEB_HOST_GNU_TYPE)-g++ +endif + override_dh_auto_configure: #Avoid conflicting with upstreams build system @@ -17,7 +22,7 @@ #Upstream states test is only for their local development not a functional test override_dh_auto_build: - $(MAKE) + $(MAKE) CC='$(CC)' CXX='$(CXX)' cd doc && $(FAKETIME) $(MAKE) festival.info festival.html festival.ps override_dh_auto_clean: diff -Nru festival-2.5.0/debian/salsa-ci.yml festival-2.5.0/debian/salsa-ci.yml --- festival-2.5.0/debian/salsa-ci.yml 2021-08-29 15:17:25.000000000 +0000 +++ festival-2.5.0/debian/salsa-ci.yml 2021-10-17 20:14:54.000000000 +0000 @@ -3,4 +3,8 @@ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +# needs building a native festival to generate the documentation +#test-crossbuild-arm64: +# allow_failure: false + # vim: ts=2 sw=2 et sts=2 ft=yaml