Merge pull request #245 from StephenMcConnel/CreatePython3DebianPacka…

…ge-20200402

Add package for python3-aeneas

aeneas/diagnostics.py

@@ -56,9 +56,9 @@ def check_shell_encoding(cls):
  """
  is_in_utf8 = True
  is_out_utf8 = True
- if sys.stdin.encoding not in ["UTF-8", "UTF8"]:
+ if sys.stdin.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
  is_in_utf8 = False
- if sys.stdout.encoding not in ["UTF-8", "UTF8"]:
+ if sys.stdout.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
  is_out_utf8 = False
  if (is_in_utf8) and (is_out_utf8):
  gf.print_success(u"shell encoding OK")

aeneas/tools/abstract_cli_program.py

@@ -295,10 +295,10 @@ def run(self, arguments, show_help=True):
  if self.use_sys:
  # check that sys.stdin.encoding and sys.stdout.encoding are set to utf-8
  if not gf.FROZEN:
- if sys.stdin.encoding not in ["UTF-8", "UTF8"]:
+ if sys.stdin.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
  self.print_warning(u"The default input encoding is not UTF-8.")
  self.print_warning(u"You might want to set 'PYTHONIOENCODING=UTF-8' in your shell.")
- if sys.stdout.encoding not in ["UTF-8", "UTF8"]:
+ if sys.stdout.encoding not in ["UTF-8", "UTF8", "utf-8", "utf8"]:
  self.print_warning(u"The default output encoding is not UTF-8.")
  self.print_warning(u"You might want to set 'PYTHONIOENCODING=UTF-8' in your shell.")
  # decode using sys.stdin.encoding

debian/changelog

@@ -1,3 +1,10 @@
+aeneas (1.7.3.1) stable; urgency=medium
+
+ * Fix spurious warnings about "encoding is not UTF-8" when encoding is "utf-8"
+ * Add debian packaging for python3-aeneas
+
+ -- Stephen McConnel <[email protected]> Thu, 02 Apr 2020 16:45:00 -0600
+
 aeneas (1.7.1) stable; urgency=medium
 
  * Fix bug #151

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -1,21 +1,35 @@
 Source: aeneas
 Section: python
-X-Python-Version: >= 2.7
 Priority: optional
 Maintainer: Alberto Pettarin <[email protected]>
 Build-Depends: debhelper (>= 9.0.0),
  dh-python,
  python-all-dev,
  python-setuptools,
  python-numpy, python-lxml, python-bs4,
+ python3-all-dev,
+ python3-setuptools,
+ python3-numpy, python3-lxml, python3-bs4,
  libasound2-dev, libsndfile1-dev, libespeak-dev
-Standards-Version: 3.9.5
+Standards-Version: 4.1.4
 Homepage: https://github.com/readbeyond/aeneas
 
 Package: python-aeneas
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, 
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends},
  espeak, espeak-data, libespeak1, vorbis-tools, ffmpeg, flac
+Replaces: python3-aeneas
+Description: Python library to automagically synchronize audio and text
+ aeneas automatically generates a synchronization map between a list of
+ text fragments and an audio file containing the narration of the text.
+ In computer science this task is known as (automatically computing a)
+ forced alignment.
+
+Package: python3-aeneas
+Architecture: any
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, 
+ espeak, espeak-data, libespeak1, vorbis-tools, ffmpeg, flac
+Replaces: python-aeneas
 Description: Python library to automagically synchronize audio and text
  aeneas automatically generates a synchronization map between a list of
  text fragments and an audio file containing the narration of the text.

debian/copyright

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

debian/python-aeneas.lintian-overrides

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

debian/python3-aeneas.install

@@ -0,0 +1,3 @@
+aeneas_check_setup.py /usr/share/python3-aeneas
+VERSION /usr/share/python3-aeneas
+aeneas/tools/res/audio.mp3 /usr/share/python3-aeneas/aeneas/tools/res

debian/python3-aeneas.lintian-overrides

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

debian/rules

@@ -3,5 +3,7 @@
 export PYBUILD_NAME=aeneas
 
 %: 
- dh $@ --with python2 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild
 
+override_dh_shlibdeps:
+ dh_shlibdeps && dh_numpy && dh_numpy3

docs/source/changelog.rst

@@ -1,5 +1,9 @@
 Changelog
 =========
+v1.7.3.1 (2020-05-06)
+---------------------
+#. Fixed spurious warnings about not using UTF-8 when "utf-8" is seen
+#. Added debian packaging for python3-aeneas
 
 v1.7.3 (2017-03-15)
 -------------------