ncbi-blast+ 2.8.1-2: Convert Python script via 2to3 (#937121).

Convert windowmasker_2.2.22_adapter to Python 3 via 2to3;
update (build-)dependencies accordingly.  (Closes: #937121.)

diff --git a/debian/changelog b/debian/changelog
index 36c35188b87df2b4c3c0c09108c3d23d185d8af4..ccbbd0e31a45e7c4444b352c8b6bb7a930e73c13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ncbi-blast+ (2.8.1-2) unstable; urgency=medium
+
+  * Convert windowmasker_2.2.22_adapter to Python 3 via 2to3;
+    update (build-)dependencies accordingly.  (Closes: #937121.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Sun, 01 Sep 2019 20:50:43 -0400
+
 ncbi-blast+ (2.8.1-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index ae54b2333162953e62c291906d262f0c3a1b0517..d341f2ab012fa4e697df753dbe5f756d87ca90c7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Olivier Sallou <osallou@debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 11~)
-Build-Depends-Arch: autotools-dev,
+Build-Depends-Arch: 2to3,
+               autotools-dev,
                libboost-test-dev,
                libbz2-dev,
                libc-dev-bin,
@@ -26,7 +27,7 @@ Package: ncbi-blast+
 Architecture: any
 Multi-Arch: foreign
 Depends: ncbi-data,
-         python,
+         python3,
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}

diff --git a/debian/rules b/debian/rules
index b017193c6b7789ad80e909993bec82f4407d9708..0982f6d7a92e7f9edfb68f14f6b6ade6c9bf88f5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -81,8 +81,11 @@ override_dh_install-arch:
        mv $(instroot)/bin/seedtop $(instroot)/bin/seedtop+
        mv $(instroot)/bin/legacy_blast.pl   $(instroot)/bin/legacy_blast
        mv $(instroot)/bin/update_blastdb.pl $(instroot)/bin/update_blastdb
-       mv $(instroot)/bin/windowmasker_2.2.22_adapter.py \
-          $(instroot)/bin/windowmasker_2.2.22_adapter
+       sed -e '1s/$$/3/' $(instroot)/bin/windowmasker_2.2.22_adapter.py \
+          > $(instroot)/bin/windowmasker_2.2.22_adapter
+       2to3 -w $(instroot)/bin/windowmasker_2.2.22_adapter
+       chmod +x $(instroot)/bin/windowmasker_2.2.22_adapter
+       rm $(instroot)/bin/windowmasker_2.2.22_adapter.py
 # Clean up tests, demos, and internal build tools
        rm -f $(instroot)/bin/*test* $(instroot)/bin/seqdb_demo \
            $(instroot)/bin/datatool $(instroot)/bin/run_with_lock \