[med-svn] [Git][med-team/ball][master] 6 commits: Use Python 3 in packaging
Andreas Tille
gitlab at salsa.debian.org
Mon Mar 9 10:41:17 GMT 2020
Andreas Tille pushed to branch master at Debian Med / ball
Commits:
9ed97ee2 by Stuart Prescott at 2020-03-01T15:24:42+11:00
Use Python 3 in packaging
- - - - -
d785275d by Stuart Prescott at 2020-03-01T15:25:12+11:00
Patch build system to use Python 3
- - - - -
b0f306d8 by Stuart Prescott at 2020-03-01T16:09:59+11:00
Add changelog for upload
- - - - -
0e5174d2 by Steffen Möller at 2020-03-01T11:31:16+00:00
Update metadata - yamllint, BALL paper
- - - - -
2982e1e1 by Stuart Prescott at 2020-03-09T19:27:14+11:00
Add missing Breaks/Replaces for python3-ball
- - - - -
12ff813f by Andreas Tille at 2020-03-09T11:40:34+01:00
Update changelog
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/python3.patch
- debian/patches/series
- debian/rules
- debian/upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+ball (1.5.0+git20180813.37fc53c-6) UNRELEASED; urgency=medium
+
+ [ Steffen Möller ]
+ * Update metadata - yamllint, BALL paper
+
+ [ Stuart Prescott ]
+ * Add missing Breaks/Replaces for python3-ball
+ Closes: #953358
+
+ -- Andreas Tille <tille at debian.org> Mon, 09 Mar 2020 11:40:03 +0100
+
+ball (1.5.0+git20180813.37fc53c-5) experimental; urgency=medium
+
+ * Team upload.
+ * Stop using Python 2 to build, make a Python 3 module instead
+ (Closes: #936183).
+
+ -- Stuart Prescott <stuart at debian.org> Sun, 01 Mar 2020 15:22:57 +1100
+
ball (1.5.0+git20180813.37fc53c-4) unstable; urgency=medium
* Team upload (Closes: #948438)
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 12),
qtbase5-dev,
qttools5-dev,
libqt5opengl5-dev,
- python-sip-dev,
+ python3-sip-dev,
flex,
bison,
cmake,
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 12),
libfftw3-dev,
libeigen3-dev,
libgsl0-dev,
- python2-dev,
+ python3-dev,
libxrender-dev,
libboost-dev,
libboost-iostreams-dev,
@@ -145,14 +145,16 @@ Description: Header files for the VIEW part of the Biochemical Algorithms Librar
This package comprises the header files allowing to create one's own
applications with the VIEW framework of the BALL library.
-Package: python-ball
+Package: python3-ball
Architecture: any
Section: python
Depends: ${shlibs:Depends},
- ${python:Depends},
+ ${python3:Depends},
${sip:Depends},
libball1.5,
${misc:Depends}
+Breaks: python-ball
+Replaces: python-ball
Description: Python bindings for the Biochemical Algorithms Library
BALL (Biochemical Algorithms Library) is an application framework
in C++ that has been specifically designed for rapid software
@@ -165,7 +167,7 @@ Architecture: any
Depends: ${shlibs:Depends},
libball1.5,
libballview1.5,
- python-ball,
+ python3-ball,
${misc:Depends}
Description: free molecular modeling and molecular graphics tool
BALLView provides fast OpenGL-based visualization of molecular structures,
=====================================
debian/patches/python3.patch
=====================================
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -400,9 +400,9 @@
+ ENDIF()
+ SET(BALL_PYTHONPATH $ENV{PYTHONPATH})
+ ENDIF()
+- FIND_PACKAGE(PythonInterp 2.7)
++ FIND_PACKAGE(PythonInterp 3)
+ IF (PYTHONINTERP_FOUND)
+- FIND_PACKAGE(PythonLibs 2.7)
++ FIND_PACKAGE(PythonLibs 3)
+ IF (PYTHONLIBS_FOUND)
+ BALL_COMBINE_LIBS(PYTHON_LIBRARIES "${PYTHON_LIBRARIES}" "${PYTHON_DEBUG_LIBRARIES}")
+ SET(SIP_EXTRA_OPTIONS "-e")
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+python3.patch
fix-ftbfs-char.patch
missing_GLEW
=====================================
debian/rules
=====================================
@@ -7,13 +7,13 @@ include /usr/share/dpkg/buildflags.mk
SOVERSION=1.5
BALL_INSTALL_PATH=build
-PYTHON_VERSION=2.7
-PYTHON_SITE_PATH=$(shell python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,0)[4:];")
+PYTHON_VERSION=$(shell py3versions -d)
+PYTHON_SITE_PATH=/lib/python3/dist-packages
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --buildsystem=cmake --builddirectory=build --with python2
+ dh $@ --buildsystem=cmake --builddirectory=build --with python3
override_dh_auto_configure:
mkdir -p build
@@ -95,8 +95,8 @@ override_dh_auto_install-arch:
mkdir -p debian/libball$(SOVERSION)/usr/lib \
debian/libball$(SOVERSION)-data/usr/share/BALL-$(SOVERSION) \
debian/libballview$(SOVERSION)/usr/lib \
- debian/python-ball/usr/share/BALL-$(SOVERSION) \
- debian/python-ball/usr/$(PYTHON_SITE_PATH) \
+ debian/python3-ball/usr/share/BALL-$(SOVERSION) \
+ debian/python3-ball/usr/$(PYTHON_SITE_PATH) \
debian/ballview/usr/lib/ballview/
mkdir -p debian/ballview/usr/share/BALL-$(SOVERSION)/data/graphics
@@ -111,8 +111,8 @@ override_dh_auto_install-arch:
# debian needs the logo in the ballview - package, not in the libball
cp $(BALL_INSTALL_PATH)/usr/share/BALL/graphics/ballview*.xpm debian/ballview/usr/share/pixmaps/
- cp -r $(BALL_INSTALL_PATH)/usr/share/doc/BALL/EXAMPLES/PYTHON debian/python-ball/usr/share/BALL-$(SOVERSION)
- cp -a source/PYTHON/EXTENSIONS/* debian/python-ball/usr/$(PYTHON_SITE_PATH)
+ cp -r $(BALL_INSTALL_PATH)/usr/share/doc/BALL/EXAMPLES/PYTHON debian/python3-ball/usr/share/BALL-$(SOVERSION)
+ cp -a source/PYTHON/EXTENSIONS/* debian/python3-ball/usr/$(PYTHON_SITE_PATH)
# cp $(BALL_INSTALL_PATH)/usr/lib/BALLCore.so debian/python-ball/usr/$(PYTHON_SITE_PATH)
# -dev packages are arch dependent
@@ -156,8 +156,8 @@ override_dh_installdocs:
override_dh_install:
dh_install
- dh_sip
- if [ -d debian/python-ball ] ; then \
- find debian/python-ball/usr/lib/python*/dist-packages/ -name BALLPyMacros.h -delete ; \
- find debian/python-ball -name CMakeLists.txt -delete ; \
+ dh_sip3
+ if [ -d debian/python3-ball ] ; then \
+ find debian/python3-ball/usr/lib/python*/dist-packages/ -name BALLPyMacros.h -delete ; \
+ find debian/python3-ball -name CMakeLists.txt -delete ; \
fi
=====================================
debian/upstream/metadata
=====================================
@@ -1,21 +1,44 @@
# Collection of meta-data about the upstream project,
# see http://wiki.debian.org/UpstreamMetadata for reference.
Reference:
- author: "Andreas Moll and Andreas Hildebrandt and Hans-Peter Lenhof and Oliver Kohlbacher\n"
- title: "BALLView: a tool for research and education in molecular modeling\n"
- journal: Bioinformatics
- volume: 22
- number: 3
- pages: 365-366
- year: 2006
- PMID: 16332707
- DOI: 10.1093/bioinformatics/bti818
- URL: http://bioinformatics.oxfordjournals.org/cgi/content/abstract/22/3/365
- eprint: http://bioinformatics.oxfordjournals.org/cgi/reprint/22/3/365.pdf
+ - Author: >
+ Andreas Moll and Andreas Hildebrandt and Hans-Peter Lenhof and
+ Oliver Kohlbacher
+ Title: >
+ BALLView: a tool for research and education in molecular modeling
+ Journal: Bioinformatics
+ Volume: 22
+ Number: 3
+ Pages: 365-366
+ Year: 2006
+ PMID: 16332707
+ DOI: 10.1093/bioinformatics/bti818
+ URL: http://bioinformatics.oxfordjournals.org/cgi/content/abstract/22/3/365
+ eprint: http://bioinformatics.oxfordjournals.org/cgi/reprint/22/3/365.pdf
+ - Author: >
+ Andreas Hildebrandt and Anna Katharina Dehof and Alexander Rurainski and
+ Andreas Bertsch and Marcel Schumann and Nora C Toussaint and Andreas Moll
+ and Daniel Stöckel and Stefan Nickels and Sabine C Mueller and
+ Hans-Peter Lenhof and Oliver Kohlbacher
+ Title: "BALL - Biochemical Algorithms Library"
+ Year: 2010
+ Month: 10
+ Day: 25
+ Journal: BMC Bioinformatics
+ Volume: 11
+ Pages: 531
+ PMID: 20973958
+ DOI: 10.1186/1471-2105-11-531
+ URL: "https://bmcbioinformatics.biomedcentral.com/articles/\
+ 10.1186/1471-2105-11-531"
+ ePrint: "https://bmcbioinformatics.biomedcentral.com/track/\
+ pdf/10.1186/1471-2105-11-531"
Registry:
-- Name: SciCrunch
- Entry: SCR_015986
-- Name: bio.tools
- Entry: NA
-- Name: OMICtools
- Entry: OMICS_05049
+ - Name: SciCrunch
+ Entry: SCR_015986
+ - Name: bio.tools
+ Entry: NA
+ - Name: OMICtools
+ Entry: OMICS_05049
+ - Name: conda:bioconda
+ Entry: NA
View it on GitLab: https://salsa.debian.org/med-team/ball/-/compare/fe252579d7985d50f91b44ca62d9bfd06655788b...12ff813fb9aaa94abc73656f9081dadca8e2338f
--
View it on GitLab: https://salsa.debian.org/med-team/ball/-/compare/fe252579d7985d50f91b44ca62d9bfd06655788b...12ff813fb9aaa94abc73656f9081dadca8e2338f
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/20200309/f997c0fb/attachment-0001.html>
More information about the debian-med-commit
mailing list