[med-svn] [Git][med-team/ball][master] 2 commits: * Remove Python3 package since it does not work properly with SIP and
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sat Dec 18 15:02:16 GMT 2021
Andreas Tille pushed to branch master at Debian Med / ball
Commits:
99090c2e by Andreas Tille at 2021-12-18T14:57:24+01:00
* Remove Python3 package since it does not work properly with SIP and
is not really needed to run ballview
Leave python3 related Build-Depends - otherwise cmake will stumble
upon missing dependencies
- - - - -
68136b0c by Andreas Tille at 2021-12-18T16:01:45+01:00
deactivate patches that are only needed for python3 package which is removed anyway
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/patches/fix-findsip.patch
- debian/patches/fix-python-bindings.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -5,7 +5,10 @@ ball (1.5.0+git20180813.37fc53c-10) UNRELEASED; urgency=medium
Closes: #1001657
* Seems autopkgtest-pkg-python is running automagically - just provide
the proper module name
- * python3-ball: Explicitly depends python3-sip
+ * Remove Python3 package since it does not work properly with SIP and
+ is not really needed to run ballview
+ Leave python3 related Build-Depends - otherwise cmake will stumble
+ upon missing dependencies
[ Étienne Mollier ]
* d/rules: set SIP_LIBRARIES cmake variable; trigger sip bindings build.
=====================================
debian/control
=====================================
@@ -136,30 +136,11 @@ 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: python3-ball
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends},
- ${python3:Depends},
- ${sip:Depends},
- python3-sip,
- libball1.5,
- ${misc:Depends}
-Breaks: python-ball (<= 1.5.0)
-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
- development in Molecular Modeling and Computational Molecular Biology.
- This package provides scripting access to the VIEW-independent functionality
- of the Biochemical Algorithms Library (BALL).
-
Package: ballview
Architecture: any
Depends: ${shlibs:Depends},
libball1.5,
libballview1.5,
- python3-ball,
${misc:Depends}
Description: free molecular modeling and molecular graphics tool
BALLView provides fast OpenGL-based visualization of molecular structures,
=====================================
debian/patches/fix-findsip.patch
=====================================
@@ -4,6 +4,8 @@ Description: adjust cmake file to trigger build of sip bindings
Author: Étienne Mollier <emollier at debian.org>
Forwarded: no
Last-Update: 2021-12-15
+Comment: Deactivated since python3 package is removed
+
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ball.orig/cmake/FindSIP.py
=====================================
debian/patches/fix-python-bindings.patch
=====================================
@@ -2,6 +2,8 @@ Description: modernize python bindings for python3
Author: Étienne Mollier <emollier at debian.org>
Forwarded: no
Last-Update: 2021-12-15
+Comment: Deactivated since python3 package is removed
+
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- ball.orig/source/PYTHON/pyCAPIKernel.C
=====================================
debian/patches/series
=====================================
@@ -2,5 +2,5 @@ python3.patch
fix-ftbfs-char.patch
missing_GLEW
2to3.patch
-fix-findsip.patch
-fix-python-bindings.patch
+#fix-findsip.patch
+#fix-python-bindings.patch
=====================================
debian/rules
=====================================
@@ -7,15 +7,15 @@ include /usr/share/dpkg/buildflags.mk
SOVERSION=1.5
BALL_INSTALL_PATH=build
-PYTHON_VERSION=$(shell py3versions -d)
-PYTHON_SITE_PATH=/lib/python3/dist-packages
+#PYTHON_VERSION=$(shell py3versions -d)
+#PYTHON_SITE_PATH=/lib/python3/dist-packages
LDFLAGS+=-ltirpc
CXXFLAGS+=-I/usr/include/tirpc
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
- dh $@ --buildsystem=cmake --builddirectory=build --with python3
+ dh $@ --buildsystem=cmake --builddirectory=build # --with python3
override_dh_auto_configure:
mkdir -p build
@@ -98,8 +98,6 @@ 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/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
@@ -114,8 +112,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/python3-ball/usr/share/BALL-$(SOVERSION)
- cp -a source/PYTHON/EXTENSIONS/* debian/python3-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
@@ -161,10 +159,10 @@ override_dh_installdocs-indep:
mv debian/libball1.5-data/usr/share/BALL-1.5/PresentaBALL debian/libball1.5-data/usr/share/doc/libball1.5-data
dh_link -p libball1.5-data usr/share/doc/libball1.5-data/PresentaBALL usr/share/BALL-1.5/PresentaBALL
-override_dh_install:
- dh_install
- 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
+#override_dh_install:
+# dh_install
+# 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
View it on GitLab: https://salsa.debian.org/med-team/ball/-/compare/f14f4967f82544d27d216e1f15ffad2146aba1fe...68136b0c2cb34fb627afd41c7667c261de0a77d4
--
View it on GitLab: https://salsa.debian.org/med-team/ball/-/compare/f14f4967f82544d27d216e1f15ffad2146aba1fe...68136b0c2cb34fb627afd41c7667c261de0a77d4
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/20211218/5c55bbe7/attachment-0001.htm>
More information about the debian-med-commit
mailing list