[med-svn] [gwamar] 07/09: Try again Python 3

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository gwamar.

commit 5f1c1736805ad615c428d2ce6d9ddbfab0a5d4c0
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 8 16:19:19 2015 +0100

    Try again Python 3
---
 debian/changelog          |  2 +-
 debian/control            |  6 +++---
 debian/patches/2to3.patch | 15 +++++++++++++++
 debian/patches/series     |  1 +
 debian/rules              |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d558772..71aecf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ gwamar (1.15.1+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #<bug>)
 
- -- Andreas Tille <tille at debian.org>  Sat, 21 Nov 2015 12:31:04 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Dec 2015 16:16:11 +0100
diff --git a/debian/control b/debian/control
index 182c9b3..83b551e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,16 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
-               python-all-dev
+               python3-all
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/gwamar.git
 Vcs-Git: git://anonscm.debian.org/debian-med/gwamar.git
 Homepage: http://bioputer.mimuw.edu.pl/gwamar/
 
 Package: gwamar
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          phylip,
          raxml,
          phyml
diff --git a/debian/patches/2to3.patch b/debian/patches/2to3.patch
new file mode 100644
index 0000000..da8200a
--- /dev/null
+++ b/debian/patches/2to3.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 08 Dec 2015 16:16:11 +0100
+Description: Fix Python 2 to Python 3 conversion issue
+
+--- a/src/drsoft/format_results/a1_mutations_latex_sel.py
++++ b/src/drsoft/format_results/a1_mutations_latex_sel.py
+@@ -33,7 +33,7 @@ def saveMutsLatex(params):
+         gene_id, position = mut_desc_full.split(" ")[2:4]
+         mut_profiles.append((bin_profile, gene_id, position))
+ 
+-    mut_profiles_sorted = sorted(mut_profiles, key=lambda (bin_profile, gene_id, position): (-gwamar_bin_utils.countNonZeros(bin_profile), abs(int(position)-440), gene_id))
++    mut_profiles_sorted = sorted(mut_profiles, key=lambda bin_profile_gene_id_position: (-gwamar_bin_utils.countNonZeros(bin_profile_gene_id_position[0]), abs(int(bin_profile_gene_id_position[2])-440), bin_profile_gene_id_position[1]))
+ 
+     tls = []
+     tls.append("\\documentclass[10pt]{article}\n")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..998d10f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2to3.patch
diff --git a/debian/rules b/debian/rules
index 4eb5571..a040fc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python2
+	dh $@ --with python3
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compress xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gwamar.git