[dune-common] 04/07: refresh patches
Ansgar Burchardt
ansgar at moszumanska.debian.org
Mon Nov 13 23:18:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
ansgar pushed a commit to annotated tag debian/2.6_20171113-1
in repository dune-common.
commit 87834aedbcdf566879dd9f2b5681a26d6bc175d6
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Mon Nov 13 20:40:07 2017 +0100
refresh patches
---
debian/patches/rename-git-whitespace-hook.patch | 2 +-
debian/patches/soname.patch | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/rename-git-whitespace-hook.patch b/debian/patches/rename-git-whitespace-hook.patch
index 3b1fd31..b88f1d3 100644
--- a/debian/patches/rename-git-whitespace-hook.patch
+++ b/debian/patches/rename-git-whitespace-hook.patch
@@ -6,7 +6,7 @@ tool.
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
-@@ -476,17 +476,28 @@
+@@ -527,17 +527,28 @@
fi
else
# standard handling of Git whitespace hook
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index 2db8fb1..a713699 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -1,6 +1,6 @@
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
-@@ -1011,8 +1011,13 @@
+@@ -1015,8 +1015,13 @@
# More docu can be found at the top of this file.
macro(dune_add_library basename)
include(CMakeParseArguments)
@@ -15,7 +15,7 @@
if(DUNE_LIB_OBJECT)
if(DUNE_LIB_${basename}_SOURCES)
message(FATAL_ERROR "There is already a library with the name ${basename}, "
-@@ -1055,6 +1060,7 @@
+@@ -1059,6 +1064,7 @@
endif()
# Build library in ${PROJECT_BINARY_DIR}/lib
set_target_properties(${basename} PROPERTIES
@@ -23,7 +23,7 @@
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-@@ -1081,6 +1087,7 @@
+@@ -1085,6 +1091,7 @@
#create shared libs
add_library(${basename}-shared SHARED ${DUNE_LIB_SOURCES})
set_target_properties(${basename}-shared PROPERTIES
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-common.git
More information about the debian-science-commits
mailing list