debian/control

@@ -45,7 +45,7 @@ Vcs-Git: https://salsa.debian.org/med-team/ball.git
 Homepage: http://www.ball-project.org/
 X-Python-Version: all
 
-Package: libball1.4-data
+Package: libball1.5-data
 Architecture: all
 Depends: ${misc:Depends}
 Description: Biochemical Algorithms Library (data files)
@@ -63,12 +63,12 @@ Description: Biochemical Algorithms Library (data files)
  This package contains the data files (force field parameters, fragment
  data bases, etc) necessary for using BALL.
 
-Package: libball1.4
+Package: libball1.5
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libball1.4-data
+         libball1.5-data
 Description: Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework
  in C++ that has been specifically designed for rapid software
@@ -85,13 +85,14 @@ Description: Biochemical Algorithms Library
  data directories et al., except for libVIEW) and can be installed on
  machines without X11.
 
-Package: libball1.4-dev
+Package: libball1.5-dev
 Architecture: any
 Section: libdevel
-Depends: libball1.4 (= ${binary:Version}),
+Depends: libball1.5 (= ${binary:Version}),
          ${misc:Depends}
-Suggests: libball1.4-doc
-Conflicts: libball1.3-dev
+Suggests: libball1.5-doc
+Conflicts: libball1.3-dev,
+           libball1.4-dev
 Description: Header files for the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework
  in C++ that has been specifically designed for rapid software
@@ -107,7 +108,7 @@ Description: Header files for the Biochemical Algorithms Library
  This package comprises the header files allowing to create
  one's own applications with the BALL library.
 
-Package: libballview1.4
+Package: libballview1.5
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -127,12 +128,12 @@ Description: Biochemical Algorithms Library, VIEW framework
  This package contains the view parts of BALL (libVIEW). Those are
  required for molecular visualization and for running BALLView.
 
-Package: libballview1.4-dev
+Package: libballview1.5-dev
 Architecture: any
 Section: libdevel
-Depends: libballview1.4 (= ${binary:Version}),
+Depends: libballview1.5 (= ${binary:Version}),
          ${misc:Depends}
-Recommends: libball1.4-doc
+Recommends: libball1.5-doc
 Conflicts: libballview1.3-dev
 Description: Header files for the VIEW part of the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework
@@ -147,7 +148,7 @@ Section: python
 Depends: ${shlibs:Depends},
          ${python:Depends},
          ${sip:Depends},
-         libball1.4,
+         libball1.5,
          ${misc:Depends}
 Description: Python bindings for the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework
@@ -162,8 +163,8 @@ Section: python
 Depends: ${shlibs:Depends},
          ${python:Depends},
          ${sip:Depends},
-         libball1.4,
-         libballview1.4,
+         libball1.5,
+         libballview1.5,
          python-ball (= ${binary:Version}),
          ${misc:Depends}
 Description: Python bindings for VIEW-parts of the Biochemical Algorithms Library
@@ -176,8 +177,8 @@ Description: Python bindings for VIEW-parts of the Biochemical Algorithms Librar
 Package: ballview
 Architecture: any
 Depends: ${shlibs:Depends},
-         libball1.4,
-         libballview1.4,
+         libball1.5,
+         libballview1.5,
          python-ball,
          python-ballview,
          ${misc:Depends}
@@ -199,13 +200,14 @@ Description: free molecular modeling and molecular graphics tool
  advanced solvation methods, comparison and analysis of protein
  structures, file import/export, and visualization.
 
-Package: libball1.4-doc
+Package: libball1.5-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
          libjs-jquery
-Suggests: libball1.4
-Conflicts: libball1.3-doc
+Suggests: libball1.5
+Conflicts: libball1.3-doc,
+           libball1.4-doc
 Description: documentation for the BALL library
  BALL (Biochemical Algorithms Library) is an application framework
  in C++ that has been specifically designed for rapid software

debian/debian-ball-install

@@ -16,7 +16,7 @@ echo $1
 if [ "$1" == "configure" ]
 then
 	cd $BALL_PATH
-	mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=./usr -DBALL_PATH=/usr -DBALL_DATA_PATH=/usr/share/BALL-1.4/data
+	mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=./usr -DBALL_PATH=/usr -DBALL_DATA_PATH=/usr/share/BALL-1.5/data
 	exit $?
 fi
  																			

debian/libball1.4-doc.links

-usr/share/javascript/jquery/jquery.js	usr/share/doc/libball1.4/html/BALL/jquery.js

debian/libball1.4-doc.lintian-overrides

-libball1.4-doc binary: postinst-does-not-call-installdocs
-libball1.4-doc binary: prerm-does-not-call-installdocs

debian/libball1.4-doc.doc-base.manual → debian/libball1.5-doc.doc-base.manual

@@ -9,5 +9,5 @@ Abstract: BALL (Biochemical Algorithms Library) is an application framework
 Section: Science/Chemistry
 
 Format: HTML
-Index: /usr/share/doc/libball1.4/html/BALL/index.html
-Files: /usr/share/doc/libball1.4/html/BALL/*.html
+Index: /usr/share/doc/libball1.5/html/BALL/index.html
+Files: /usr/share/doc/libball1.5/html/BALL/*.html

debian/libball1.4-doc.doc-base.tutorial → debian/libball1.5-doc.doc-base.tutorial

@@ -9,4 +9,4 @@ Abstract: BALL (Biochemical Algorithms Library) is an application framework
 Section: Science/Chemistry
 
 Format: PDF
-Files: /usr/share/doc/libball1.4/tutorial.pdf.gz
+Files: /usr/share/doc/libball1.5/tutorial.pdf.gz

debian/libball1.5-doc.links

+usr/share/javascript/jquery/jquery.js	usr/share/doc/libball1.5/html/BALL/jquery.js

debian/libball1.5-doc.lintian-overrides

+libball1.5-doc binary: postinst-does-not-call-installdocs
+libball1.5-doc binary: prerm-does-not-call-installdocs

debian/libballview1.4.lintian-overrides

-libballview1.4: package-name-doesnt-match-sonames libVIEW1.4

debian/libballview1.4-dev.lintian-overrides → debian/libballview1.5-dev.lintian-overrides

 # Dir is actually not empty but contains cmake modules
-libballview1.4-dev: package-contains-empty-directory usr/lib/
+libballview1.5-dev: package-contains-empty-directory usr/lib/

debian/libballview1.5.lintian-overrides

+libballview1.5: package-name-doesnt-match-sonames libVIEW1.5

debian/rules

@@ -11,7 +11,7 @@ else
 	CFLAGS += -O2
 endif
 
-SOVERSION=1.4
+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:];")
@@ -107,23 +107,19 @@ override_dh_auto_install-arch:
 
 	mkdir -p debian/ballview/usr/share/BALL-$(SOVERSION)/data/graphics
 
-	cp -r $(BALL_INSTALL_PATH)/usr/share/BALL/doc/BALLView/* debian/ballview/usr/share/doc/ballview/html
+	cp -r $(BALL_INSTALL_PATH)/usr/share/BALL/BALLView/*	debian/ballview/usr/share/doc/ballview/html
 	cp    $(BALL_INSTALL_PATH)/usr/bin/BALLView		debian/ballview/usr/bin/
 
 	find $(BALL_INSTALL_PATH)/usr/lib/ -name libBALL*.so.* | xargs -r cp --target-directory debian/libball$(SOVERSION)/usr/lib/
 	find $(BALL_INSTALL_PATH)/usr/lib/ -name libVIEW*.so.* | xargs -r cp --target-directory debian/libballview$(SOVERSION)/usr/lib/
 
 	# debian needs the logo in the ballview - package, not in the libball
-	cp $(BALL_INSTALL_PATH)/usr/share/BALL/data/graphics/ballview*.xpm debian/ballview/usr/share/pixmaps/
+	cp $(BALL_INSTALL_PATH)/usr/share/BALL/graphics/ballview*.xpm debian/ballview/usr/share/pixmaps/
 
-	cp -r source/EXAMPLES/PYTHON    debian/python-ball/usr/share/BALL-$(SOVERSION)
-	cp $(BALL_INSTALL_PATH)/usr/lib/BALL.py       debian/python-ball/usr/$(PYTHON_SITE_PATH)
-	cp $(BALL_INSTALL_PATH)/usr/lib/BALLCore.so   debian/python-ball/usr/$(PYTHON_SITE_PATH)
-	cp $(BALL_INSTALL_PATH)/usr/lib/VIEW.so       debian/python-ballview/usr/$(PYTHON_SITE_PATH)
-
-	chmod ugo-x debian/python-ball/usr/share/BALL-$(SOVERSION)/PYTHON/UTILITIES/*.py
-	chmod ugo-x debian/python-ball/usr/share/BALL-$(SOVERSION)/PYTHON/BALLView/*.py
-	chmod ugo-x debian/python-ball/usr/share/BALL-$(SOVERSION)/PYTHON/howtos/*.py
+	cp -r $(BALL_INSTALL_PATH)/usr/share/doc/BALL/EXAMPLES/PYTHON	debian/python-ball/usr/share/BALL-$(SOVERSION)
+	cp source/PYTHON/EXTENSIONS/BALL.py       debian/python-ball/usr/$(PYTHON_SITE_PATH)
+#	cp $(BALL_INSTALL_PATH)/usr/lib/BALLCore.so   debian/python-ball/usr/$(PYTHON_SITE_PATH)
+#	cp $(BALL_INSTALL_PATH)/usr/lib/VIEW.so       debian/python-ballview/usr/$(PYTHON_SITE_PATH)
 
 	# -dev packages are arch dependent
 	mkdir -p debian/libball$(SOVERSION)-dev/usr/lib \