[med-svn] [Git][med-team/python-freecontact][master] 5 commits: Update d/control and d/rules, build python3 module

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch master at Debian Med / python-freecontact


Commits:
79fd6afb by Alexandre Mestiashvili at 2018-12-14T14:52:48Z
Update d/control and d/rules, build python3 module

- - - - -
cb9295f3 by Alexandre Mestiashvili at 2018-12-14T15:08:11Z
Use https for copyright-format-uri field

- - - - -
1810900a by Alexandre Mestiashvili at 2018-12-14T15:27:57Z
Update .gitignore, don't ignore d/patches

- - - - -
31065fbd by Alexandre Mestiashvili at 2018-12-14T15:49:19Z
Add patch fixing setup.py to link to python3 boost bindings

- - - - -
571d3044 by Alexandre Mestiashvili at 2018-12-14T15:50:05Z
Bump Policy to 4.1.4

- - - - -


6 changed files:

- .gitignore
- debian/control
- debian/copyright
- + debian/patches/py3_boost.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
.gitignore
=====================================
@@ -5,4 +5,3 @@ files
 *.substvars
 python-freecontact
 .pc
-debian/patches


=====================================
debian/control
=====================================
@@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 11~),
                libboost-python-dev,
                libfreecontact-dev,
                python-all-dev,
-#               python3-all-dev
-Standards-Version: 4.1.4
+               python3-all-dev
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/python-freecontact
 Vcs-Git: https://salsa.debian.org/med-team/python-freecontact.git
 Homepage: https://rostlab.org/owiki/index.php/FreeContact
@@ -26,12 +26,12 @@ Description: fast protein contact predictor - binding for Python
  .
  This package contains the Python binding.
 
-#Package: python3-freecontact
-#Architecture: any
-#Depends: ${misc:Depends},
-#         ${python3:Depends},
-#         ${shlibs:Depends}
-#Description: fast protein contact predictor - binding for Python3
-# ${Description}
-# .
-# This package contains the Python3 binding.
+Package: python3-freecontact
+Architecture: any
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Description: fast protein contact predictor - binding for Python3
+ ${Description}
+ .
+ This package contains the Python3 binding.


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-freecontact
 Upstream-Contact: Laszlo Kajan <lkajan at rostlab.org>
 Source: ftp://rostlab.org/free/
@@ -17,12 +17,12 @@ License: GPL-3+
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- . 
+ .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- . 
+ .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .


=====================================
debian/patches/py3_boost.patch
=====================================
@@ -0,0 +1,24 @@
+From: Alex Mestiashvili <mestia at debian.org>
+Description: properly link to libboost_python3X versions python3 module
+--- python-freecontact.orig/setup.py
++++ python-freecontact/setup.py
+@@ -17,6 +17,10 @@
+ # 
+ from distutils.core import setup, Extension
+ from glob import glob
++import sys
++PY3K=(sys.version_info[0]==3)
++
++boost_py_bindings='boost_python3%d'%(sys.version_info[1]) if PY3K else 'boost_python'
+ 
+ setup(	name = 'python-freecontact',
+     	version = '1.1',
+@@ -30,7 +34,7 @@
+         ext_modules = [Extension(
+             name = 'freecontact',
+             sources = glob('src/*.cpp'),
+-            libraries = ['freecontact', 'boost_python'])]
++            libraries = ['freecontact', boost_py_bindings])]
+ 	)
+ 
+ # vim:et:ts=4:ai:


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+py3_boost.patch


=====================================
debian/rules
=====================================
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
@@ -8,15 +8,11 @@ export PYBUILD_NAME = freecontact
 Description := $(shell sed -e ':a; N; s/\n/$${Newline}/; ta' < debian/Description)
 
 %:
-	dh $@ --buildsystem=pybuild --with python2 # ,python3
+	dh $@ --with python2,python3 --buildsystem=pybuild --builddirectory=$(CURDIR)/builddir
 
 override_dh_gencontrol:
 	dh_gencontrol -- '-VDescription=$(Description)'
 
-PYVER = $(shell echo -e 'import sys\nprint(str(sys.version_info.major)+"."+str(sys.version_info.minor))' | /usr/bin/python)
-# PY3VER = $(shell echo -e 'import sys\nprint(str(sys.version_info.major)+"."+str(sys.version_info.minor))' | /usr/bin/python3)
-PYVERBDIR = $(wildcard ./build/lib.*-2.7)
-
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="{interpreter} $(CURDIR)/test/test01.py" \



View it on GitLab: https://salsa.debian.org/med-team/python-freecontact/compare/9962f53067785eab7009a2769429eabdde04e8cb...571d3044bcb45be7d144c27b237d486056e753f6

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-freecontact/compare/9962f53067785eab7009a2769429eabdde04e8cb...571d3044bcb45be7d144c27b237d486056e753f6
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181214/516e5d10/attachment-0001.html>