Skip to content

Commit 4d200a0

Browse files
readbeyondreadbeyond
authored
Merge pull request #245 from StephenMcConnel/CreatePython3DebianPackage-20200402
Add package for python3-aeneas
2 parents 9d95535 + 5da2217 commit 4d200a0

12 files changed

+44
-10
lines changed

‎aeneas/diagnostics.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ def check_shell_encoding(cls):
5656
"""
5757
is_in_utf8 = True
5858
is_out_utf8 = True
59-
if sys.stdin.encoding not in ["UTF-8", "UTF8"]:
59+
if sys.stdin.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
6060
is_in_utf8 = False
61-
if sys.stdout.encoding not in ["UTF-8", "UTF8"]:
61+
if sys.stdout.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
6262
is_out_utf8 = False
6363
if (is_in_utf8) and (is_out_utf8):
6464
gf.print_success(u"shell encoding OK")

‎aeneas/tools/abstract_cli_program.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,10 @@ def run(self, arguments, show_help=True):
295295
if self.use_sys:
296296
# check that sys.stdin.encoding and sys.stdout.encoding are set to utf-8
297297
if not gf.FROZEN:
298-
if sys.stdin.encoding not in ["UTF-8", "UTF8"]:
298+
if sys.stdin.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
299299
self.print_warning(u"The default input encoding is not UTF-8.")
300300
self.print_warning(u"You might want to set 'PYTHONIOENCODING=UTF-8' in your shell.")
301-
if sys.stdout.encoding not in ["UTF-8", "UTF8"]:
301+
if sys.stdout.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
302302
self.print_warning(u"The default output encoding is not UTF-8.")
303303
self.print_warning(u"You might want to set 'PYTHONIOENCODING=UTF-8' in your shell.")
304304
# decode using sys.stdin.encoding

‎debian/changelog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
aeneas (1.7.3.1) stable; urgency=medium
2+
3+
* Fix spurious warnings about "encoding is not UTF-8" when encoding is "utf-8"
4+
* Add debian packaging for python3-aeneas
5+
6+
-- Stephen McConnel <[email protected]> Thu, 02 Apr 2020 16:45:00 -0600
7+
18
aeneas (1.7.1) stable; urgency=medium
29

310
* Fix bug #151

‎debian/compat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7
1+
9

‎debian/control

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
11
Source: aeneas
22
Section: python
3-
X-Python-Version: >= 2.7
43
Priority: optional
54
Maintainer: Alberto Pettarin <[email protected]>
65
Build-Depends: debhelper (>= 9.0.0),
76
dh-python,
87
python-all-dev,
98
python-setuptools,
109
python-numpy, python-lxml, python-bs4,
10+
python3-all-dev,
11+
python3-setuptools,
12+
python3-numpy, python3-lxml, python3-bs4,
1113
libasound2-dev, libsndfile1-dev, libespeak-dev
12-
Standards-Version: 3.9.5
14+
Standards-Version: 4.1.4
1315
Homepage: https://github.com/readbeyond/aeneas
1416

1517
Package: python-aeneas
1618
Architecture: any
17-
Depends: ${misc:Depends}, ${python:Depends},
19+
Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
1820
espeak, espeak-data, libespeak1, vorbis-tools, ffmpeg, flac
21+
Replaces: python3-aeneas
22+
Description: Python library to automagically synchronize audio and text
23+
aeneas automatically generates a synchronization map between a list of
24+
text fragments and an audio file containing the narration of the text.
25+
In computer science this task is known as (automatically computing a)
26+
forced alignment.
27+
28+
Package: python3-aeneas
29+
Architecture: any
30+
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends},
31+
espeak, espeak-data, libespeak1, vorbis-tools, ffmpeg, flac
32+
Replaces: python-aeneas
1933
Description: Python library to automagically synchronize audio and text
2034
aeneas automatically generates a synchronization map between a list of
2135
text fragments and an audio file containing the narration of the text.

‎debian/copyright

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Files: *
44
Copyright: 2012-2013, Alberto Pettarin (www.albertopettarin.it)
55
2013-2015, ReadBeyond Srl (www.readbeyond.it)
66
2015-2017, Alberto Pettarin (www.albertopettarin.it)
7-
License: AGPLv3
7+
License: AGPL-3.0-only
88
The GNU Affero General Public License is a free, copyleft license for
99
software and other kinds of works, specifically designed to ensure
1010
cooperation with the community in the case of network server software.

‎debian/install ‎debian/python-aeneas.install

File renamed without changes.

‎debian/python-aeneas.lintian-overrides

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
python-aeneas: binary-without-manpage
2+
python-aeneas: debian-changelog-file-contains-invalid-email-address

‎debian/python3-aeneas.install

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
aeneas_check_setup.py /usr/share/python3-aeneas
2+
VERSION /usr/share/python3-aeneas
3+
aeneas/tools/res/audio.mp3 /usr/share/python3-aeneas/aeneas/tools/res

‎debian/python3-aeneas.lintian-overrides

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
python3-aeneas: binary-without-manpage
2+
python3-aeneas: debian-changelog-file-contains-invalid-email-address

‎debian/rules

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
export PYBUILD_NAME=aeneas
44

55
%:
6-
dh $@ --with python2 --buildsystem=pybuild
6+
dh $@ --with python2,python3 --buildsystem=pybuild
77

8+
override_dh_shlibdeps:
9+
dh_shlibdeps && dh_numpy && dh_numpy3

‎docs/source/changelog.rst

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changelog
22
=========
3+
v1.7.3.1 (2020-05-06)
4+
---------------------
5+
#. Fixed spurious warnings about not using UTF-8 when "utf-8" is seen
6+
#. Added debian packaging for python3-aeneas
37

48
v1.7.3 (2017-03-15)
59
-------------------

0 commit comments

Comments
 (0)