[med-svn] [ball] 02/08: Refresh patches
Andreas Tille
tille at debian.org
Thu Jan 7 08:54:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ball.
commit f06a5f72e2ce74e72a155718d716cbe74b549887
Author: Andreas Tille <tille at debian.org>
Date: Thu Jan 7 08:42:54 2016 +0100
Refresh patches
---
debian/patches/0101-cmake-syntax.patch | 4 ++++
debian/patches/0102-fix-boost-compatibility-issue.patch | 8 +++-----
...103-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch | 6 ++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/patches/0101-cmake-syntax.patch b/debian/patches/0101-cmake-syntax.patch
index 91d4c1e..f7df0de 100644
--- a/debian/patches/0101-cmake-syntax.patch
+++ b/debian/patches/0101-cmake-syntax.patch
@@ -1,3 +1,7 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Thu, 12 Dec 2013 16:55:11 +0100
+Description: Fix some cmake syntax issues
+
--- a/cmake/BALLDoc.cmake
+++ b/cmake/BALLDoc.cmake
@@ -30,15 +30,15 @@ IF (DOXYGEN_FOUND)
diff --git a/debian/patches/0102-fix-boost-compatibility-issue.patch b/debian/patches/0102-fix-boost-compatibility-issue.patch
index 3d8113d..8adb0f7 100644
--- a/debian/patches/0102-fix-boost-compatibility-issue.patch
+++ b/debian/patches/0102-fix-boost-compatibility-issue.patch
@@ -3,11 +3,9 @@ Last-Update: Thu, 12 Dec 2013 19:43:34 +0100
Bug-Debian: http://bugs.debian.org/720681
Description: Fix build issue with more recent boost versions
-Index: ball/source/FORMAT/PDBFileDetails.C
-===================================================================
---- ball.orig/source/FORMAT/PDBFileDetails.C
-+++ ball/source/FORMAT/PDBFileDetails.C
-@@ -901,7 +901,7 @@
+--- a/source/FORMAT/PDBFileDetails.C
++++ b/source/FORMAT/PDBFileDetails.C
+@@ -901,7 +901,7 @@ namespace BALL
{
if (!(current_protein_->hasProperty("CRYSTALINFO")))
{
diff --git a/debian/patches/0103-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch b/debian/patches/0103-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
index 2aa9b2e..d4e261d 100644
--- a/debian/patches/0103-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
+++ b/debian/patches/0103-QT4_EXTRACT_OPTIONS-CMake-macro-changed-in-CMake-2.8.patch
@@ -8,10 +8,8 @@ Subject: [PATCH] QT4_EXTRACT_OPTIONS CMake macro changed in CMake 2.8.12;
cmake/BALLMacros.cmake | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
-Index: ball/cmake/BALLMacros.cmake
-===================================================================
---- ball.orig/cmake/BALLMacros.cmake
-+++ ball/cmake/BALLMacros.cmake
+--- a/cmake/BALLMacros.cmake
++++ b/cmake/BALLMacros.cmake
@@ -6,16 +6,22 @@
### minor modifications (marked with ## BALL ###)
###
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ball.git
More information about the debian-med-commit
mailing list