[med-svn] [Git][med-team/ball][master] 6 commits: Fix Build-Depends

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / ball


Commits:
6f9b8e0d by Andreas Tille at 2019-01-13T14:28:47Z
Fix Build-Depends

- - - - -
df228764 by Andreas Tille at 2019-01-13T14:48:54Z
Fix FTBFS on architectures where char is unsigned

- - - - -
11f02a5e by Andreas Tille at 2019-01-13T15:41:13Z
Upload to unstable

- - - - -
b6c536f3 by Andreas Tille at 2019-01-14T06:59:06Z
Add missing missing Breaks+Replaces: libballview1.4-dev

- - - - -
dcb9dd90 by Andreas Tille at 2019-01-14T07:01:53Z
Enable building with dpkg-buildpackage -A

- - - - -
be333d1f by Andreas Tille at 2019-01-14T08:04:06Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/fix-ftbfs-char.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,23 @@
+ball (1.5.0+git20180813.37fc53c-3) unstable; urgency=medium
+
+  * Add missing Breaks+Replaces: libballview1.4-dev
+    Closes: #919225
+  * Enable building with dpkg-buildpackage -A
+    Closes: #919239
+
+ -- Andreas Tille <tille at debian.org>  Mon, 14 Jan 2019 08:12:12 +0100
+
+ball (1.5.0+git20180813.37fc53c-2) unstable; urgency=medium
+
+  * Fix Build-Depends (Thanks for the hints to Adrian Bunk
+    <bunk at debian.org>)
+    Closes: #784451
+  * Fix FTBFS on architectures where char is unsigned
+    (Thanks for the fix to Adrian Bunk <bunk at debian.org>)
+    Closes: #919172
+
+ -- Andreas Tille <tille at debian.org>  Sun, 13 Jan 2019 15:49:01 +0100
+
 ball (1.5.0+git20180813.37fc53c-1) unstable; urgency=medium
 
   [ Jelmer Vernooij ]


=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 11~),
                flex,
                bison,
                cmake,
-               libqtwebkit-dev,
+               qtwebengine5-dev [amd64 arm64 armhf i386 mipsel],
                libfftw3-dev,
                libeigen3-dev,
                libgsl0-dev,
@@ -30,8 +30,7 @@ Build-Depends: debhelper (>= 11~),
                libglew-dev,
                libx11-dev,
                tidy,
-               chrpath,
-               libqt4-dev-bin
+               chrpath
 Build-Depends-Indep: doxygen,
                      graphviz,
                      ghostscript,
@@ -90,8 +89,9 @@ Section: libdevel
 Depends: libball1.5 (= ${binary:Version}),
          ${misc:Depends}
 Suggests: libball1.5-doc
-Conflicts: libball1.3-dev,
-           libball1.4-dev
+Breaks: libball1.3-dev,
+        libball1.4-dev
+Replaces: 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
@@ -133,7 +133,9 @@ Section: libdevel
 Depends: libballview1.5 (= ${binary:Version}),
          ${misc:Depends}
 Recommends: libball1.5-doc
-Conflicts: libballview1.3-dev
+Breaks: libballview1.3-dev,
+        libballview1.4-dev
+Replaces: libballview1.4-dev
 Description: Header files for the VIEW part of the Biochemical Algorithms Library
  BALL (Biochemical Algorithms Library) is an application framework
  in C++ that has been specifically designed for rapid software


=====================================
debian/patches/fix-ftbfs-char.patch
=====================================
@@ -0,0 +1,26 @@
+Description: Fix FTBFS on architectures where char is unsigned
+Author: Adrian Bunk <bunk at debian.org>
+Bug-Debian: https://bugs.debian.org/919172
+
+--- ball-1.5.0+git20180813.37fc53c.orig/include/BALL/DATATYPE/hashGrid.h
++++ ball-1.5.0+git20180813.37fc53c/include/BALL/DATATYPE/hashGrid.h
+@@ -32,7 +32,7 @@ namespace BALL
+ {
+ 	namespace __private
+ 	{
+-		extern const char BALL_EXPORT neighbour_table_[27][3];
++		extern const signed char BALL_EXPORT neighbour_table_[27][3];
+ 	}
+ 
+ 	template <typename Item> class HashGrid3;
+--- ball-1.5.0+git20180813.37fc53c.orig/source/DATATYPE/hashGrid.C
++++ ball-1.5.0+git20180813.37fc53c/source/DATATYPE/hashGrid.C
+@@ -9,7 +9,7 @@ namespace BALL
+ {
+ 	namespace __private
+ 	{
+-		const char neighbour_table_[27][3] =
++		const signed char neighbour_table_[27][3] =
+ 		{
+ 			{ 0,  0,  0 }, { 0,  0, -1 }, { 0,  0,  1 },
+ 			{ 0, -1, -1 }, { 0, -1,  0 }, { 0, -1,  1 },


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+fix-ftbfs-char.patch


=====================================
debian/rules
=====================================
@@ -155,6 +155,7 @@ override_dh_installdocs:
 override_dh_install:
 	dh_install
 	dh_sip
-	find debian/python-ball/usr/lib/python*/dist-packages/ -name BALLPyMacros.h -delete
-	find debian/python-ball -name CMakeLists.txt -delete
-
+	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 ; \
+	fi



View it on GitLab: https://salsa.debian.org/med-team/ball/compare/146424b9c9820481a57b9a672ffab1063e9615c6...be333d1fa32540dbc97983eefd5d1a17aae600ce

-- 
View it on GitLab: https://salsa.debian.org/med-team/ball/compare/146424b9c9820481a57b9a672ffab1063e9615c6...be333d1fa32540dbc97983eefd5d1a17aae600ce
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/20190114/86042ba3/attachment-0001.html>