diff -Nru translate-toolkit-2.3.0/debian/changelog translate-toolkit-2.3.0/debian/changelog
--- translate-toolkit-2.3.0/debian/changelog	2018-03-27 12:49:26.000000000 +0000
+++ translate-toolkit-2.3.0/debian/changelog	2018-07-26 04:22:20.000000000 +0000
@@ -1,3 +1,12 @@
+translate-toolkit (2.3.0-3) unstable; urgency=medium
+
+  * Switch to Python 3 for command line tools.
+    - reinstate sub2po/po2sub (Closes: #902706).
+  * Fix Rules-Requires-Root spelling
+  * Update Standards-Version to 4.1.5 (no changes required).
+
+ -- Stuart Prescott <stuart@debian.org>  Thu, 26 Jul 2018 14:22:20 +1000
+
 translate-toolkit (2.3.0-2) unstable; urgency=medium
 
   * Cherry-pick upstream patch to enable ini format support with Python 3.
@@ -651,4 +660,3 @@
   * Initial Release (0.8 release candidate 2).
 
  -- Matthias Klose <doko@ubuntu.com>  Mon, 21 Mar 2005 17:21:27 +0100
-
diff -Nru translate-toolkit-2.3.0/debian/control translate-toolkit-2.3.0/debian/control
--- translate-toolkit-2.3.0/debian/control	2018-03-27 12:49:26.000000000 +0000
+++ translate-toolkit-2.3.0/debian/control	2018-07-26 04:22:20.000000000 +0000
@@ -53,20 +53,20 @@
 Build-Depends:
  debhelper (>= 11~),
  dh-python,
-Standards-Version: 4.1.3
+Standards-Version: 4.1.5
 Vcs-Git: https://salsa.debian.org/l10n-team/translate-toolkit.git
 Vcs-Browser: https://salsa.debian.org/l10n-team/translate-toolkit
 Homepage: http://toolkit.translatehouse.org/
-Rules-Require-Root: no
+Rules-Requires-Root: no
 
 Package: translate-toolkit
 Architecture: all
 Section: devel
 Depends:
- python,
- python-pkg-resources,
- python-six,
- python-translate,
+ python3,
+ python3-pkg-resources,
+ python3-six,
+ python3-translate,
  ${misc:Depends},
  ${python:Depends}
 Recommends:
diff -Nru translate-toolkit-2.3.0/debian/patches/moz-python3.patch translate-toolkit-2.3.0/debian/patches/moz-python3.patch
--- translate-toolkit-2.3.0/debian/patches/moz-python3.patch	1970-01-01 00:00:00.000000000 +0000
+++ translate-toolkit-2.3.0/debian/patches/moz-python3.patch	2018-07-26 04:22:20.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/tools/mozilla/get_moz_enUS.py
++++ b/tools/mozilla/get_moz_enUS.py
+@@ -20,7 +20,7 @@
+ 
+ import os
+ import shutil
+-from ConfigParser import ConfigParser, NoSectionError
++from configparser import ConfigParser, NoSectionError
+ 
+ 
+ srccheckout = "mozilla"
diff -Nru translate-toolkit-2.3.0/debian/patches/series translate-toolkit-2.3.0/debian/patches/series
--- translate-toolkit-2.3.0/debian/patches/series	2018-03-27 12:49:26.000000000 +0000
+++ translate-toolkit-2.3.0/debian/patches/series	2018-07-26 04:22:20.000000000 +0000
@@ -1,3 +1,4 @@
+moz-python3.patch
 test-po2sub-fix.patch
 tests-skip-call.patch
 test-data-location.path
diff -Nru translate-toolkit-2.3.0/debian/rules translate-toolkit-2.3.0/debian/rules
--- translate-toolkit-2.3.0/debian/rules	2018-03-27 12:49:26.000000000 +0000
+++ translate-toolkit-2.3.0/debian/rules	2018-07-26 04:22:20.000000000 +0000
@@ -60,20 +60,12 @@
 	  PYBUILD_TEST_ARGS='cp -a tests share {build_dir}; cd {build_dir}; PATH=$(CURDIR)/debian/{package}/usr/bin:$$PATH {interpreter} -m pytest -v -rxs' \
 	  dh_auto_test --buildsystem=pybuild
 
-	# only ship the Python 2 command line tools in the
+	# only ship the Python 3 command line tools in the
 	# translate-toolkit package.
 	mkdir -p $(d)/usr/bin
-	mv $(d2)/usr/bin/* $(d)/usr/bin/
+	mv $(d3)/usr/bin/* $(d)/usr/bin/
 	rm -rf $(d2)/usr/bin $(d3)/usr/bin
 
-	# sub2po and po2sub need python-aeidon that no longer exists;
-	# they can be brought back once the switch to Python 3 is complete.
-	mkdir -p $(d)/usr/share/doc/$(p)/examples
-	mv $(d)/usr/bin/po2sub $(d)/usr/bin/sub2po \
-		$(d)/usr/share/doc/$(p)/examples
-	cp man/po2sub.1 man/sub2po.1 \
-		$(d)/usr/share/doc/$(p)/examples
-
 override_dh_auto_test:
 	# Tests must be run after install so that the entry_points scripts
 	# have been created; override this and run tests as part of the install