[sundials] 02/02: Fix patch numbering
James Tocknell
aragilar-guest at moszumanska.debian.org
Tue Feb 21 11:25:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
aragilar-guest pushed a commit to branch master
in repository sundials.
commit ae4769a39094d8a66ba20a4c21e00b8a8299bafe
Author: James Tocknell <aragilar at gmail.com>
Date: Tue Feb 21 22:25:16 2017 +1100
Fix patch numbering
---
... => 0002-Fix-library-paths-for-multiarch.patch} | 38 +++++++++++++++++++---
...indPETSc-to-use-pkg-config-where-possible.patch | 2 +-
debian/patches/series | 2 +-
3 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/debian/patches/Fix-library-paths-for-multiarch.patch b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
similarity index 89%
rename from debian/patches/Fix-library-paths-for-multiarch.patch
rename to debian/patches/0002-Fix-library-paths-for-multiarch.patch
index a4d7007..0ca62e9 100644
--- a/debian/patches/Fix-library-paths-for-multiarch.patch
+++ b/debian/patches/0002-Fix-library-paths-for-multiarch.patch
@@ -20,6 +20,8 @@ Subject: Fix library paths for multiarch
src/nvec_ser/CMakeLists.txt | 8 ++++----
15 files changed, 37 insertions(+), 33 deletions(-)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08b6203..237889c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@
@@ -42,6 +44,8 @@ Subject: Fix library paths for multiarch
# Set some variables with info on the SUNDIALS project
SET(PACKAGE_BUGREPORT "woodward6 at llnl.gov")
+diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
+index b76c33b..4bc9e54 100644
--- a/src/arkode/CMakeLists.txt
+++ b/src/arkode/CMakeLists.txt
@@ -127,7 +127,7 @@ IF(BUILD_STATIC_LIBS)
@@ -62,9 +66,11 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/arkode/fcmix/CMakeLists.txt b/src/arkode/fcmix/CMakeLists.txt
+index cff9228..108d45a 100644
--- a/src/arkode/fcmix/CMakeLists.txt
+++ b/src/arkode/fcmix/CMakeLists.txt
-@@ -70,7 +70,7 @@ SET_TARGET_PROPERTIES(sundials_farkode_s
+@@ -70,7 +70,7 @@ SET_TARGET_PROPERTIES(sundials_farkode_static
PROPERTIES OUTPUT_NAME sundials_farkode CLEAN_DIRECT_OUTPUT 1)
# Install the FARKODE library
@@ -73,6 +79,8 @@ Subject: Fix library paths for multiarch
#
MESSAGE(STATUS "Added ARKODE FCMIX module")
+diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
+index 2ddd2b9..0ef4d98 100644
--- a/src/cvode/CMakeLists.txt
+++ b/src/cvode/CMakeLists.txt
@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
@@ -93,9 +101,11 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/cvode/fcmix/CMakeLists.txt b/src/cvode/fcmix/CMakeLists.txt
+index 44a82d4..e943c7b 100644
--- a/src/cvode/fcmix/CMakeLists.txt
+++ b/src/cvode/fcmix/CMakeLists.txt
-@@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(sundials_fcvode_st
+@@ -57,7 +57,7 @@ SET_TARGET_PROPERTIES(sundials_fcvode_static
PROPERTIES OUTPUT_NAME sundials_fcvode CLEAN_DIRECT_OUTPUT 1)
# Install the FCVODE library
@@ -104,6 +114,8 @@ Subject: Fix library paths for multiarch
#
MESSAGE(STATUS "Added CVODE FCMIX module")
+diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
+index 8529ff0..7cc3740 100644
--- a/src/cvodes/CMakeLists.txt
+++ b/src/cvodes/CMakeLists.txt
@@ -121,7 +121,7 @@ IF(BUILD_STATIC_LIBS)
@@ -124,6 +136,8 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
+index a7955ad..63451cf 100644
--- a/src/ida/CMakeLists.txt
+++ b/src/ida/CMakeLists.txt
@@ -124,7 +124,7 @@ IF(BUILD_STATIC_LIBS)
@@ -144,9 +158,11 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/ida/fcmix/CMakeLists.txt b/src/ida/fcmix/CMakeLists.txt
+index 1a4944b..10450aa 100644
--- a/src/ida/fcmix/CMakeLists.txt
+++ b/src/ida/fcmix/CMakeLists.txt
-@@ -56,6 +56,6 @@ SET_TARGET_PROPERTIES(sundials_fida_stat
+@@ -56,6 +56,6 @@ SET_TARGET_PROPERTIES(sundials_fida_static
PROPERTIES OUTPUT_NAME sundials_fida CLEAN_DIRECT_OUTPUT 1)
# Install the FIDA library
@@ -154,6 +170,8 @@ Subject: Fix library paths for multiarch
+INSTALL(TARGETS sundials_fida_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
#
MESSAGE(STATUS "Added IDA FCMIX module")
+diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
+index a89aec8..113b188 100644
--- a/src/idas/CMakeLists.txt
+++ b/src/idas/CMakeLists.txt
@@ -126,7 +126,7 @@ IF(BUILD_STATIC_LIBS)
@@ -174,6 +192,8 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
+index c6cdbf5..e28ad0e 100644
--- a/src/kinsol/CMakeLists.txt
+++ b/src/kinsol/CMakeLists.txt
@@ -134,7 +134,7 @@ IF(BUILD_STATIC_LIBS)
@@ -194,9 +214,11 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
+diff --git a/src/kinsol/fcmix/CMakeLists.txt b/src/kinsol/fcmix/CMakeLists.txt
+index 16377cf..7d2f5e8 100644
--- a/src/kinsol/fcmix/CMakeLists.txt
+++ b/src/kinsol/fcmix/CMakeLists.txt
-@@ -54,7 +54,7 @@ SET_TARGET_PROPERTIES(sundials_fkinsol_s
+@@ -54,7 +54,7 @@ SET_TARGET_PROPERTIES(sundials_fkinsol_static
PROPERTIES OUTPUT_NAME sundials_fkinsol CLEAN_DIRECT_OUTPUT 1)
# Install the FKINSOL library
@@ -205,6 +227,8 @@ Subject: Fix library paths for multiarch
#
MESSAGE(STATUS "Added KINSOL FCMIX module")
+diff --git a/src/nvec_openmp/CMakeLists.txt b/src/nvec_openmp/CMakeLists.txt
+index eab8451..c1831b9 100644
--- a/src/nvec_openmp/CMakeLists.txt
+++ b/src/nvec_openmp/CMakeLists.txt
@@ -51,7 +51,7 @@ IF(BUILD_STATIC_LIBS)
@@ -243,6 +267,8 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff --git a/src/nvec_par/CMakeLists.txt b/src/nvec_par/CMakeLists.txt
+index f60b795..3381ed2 100644
--- a/src/nvec_par/CMakeLists.txt
+++ b/src/nvec_par/CMakeLists.txt
@@ -52,7 +52,7 @@ IF(BUILD_STATIC_LIBS)
@@ -281,6 +307,8 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
ENDIF(FCMIX_ENABLE AND MPIF_FOUND)
#
+diff --git a/src/nvec_pthreads/CMakeLists.txt b/src/nvec_pthreads/CMakeLists.txt
+index b711d3a..58f08e7 100644
--- a/src/nvec_pthreads/CMakeLists.txt
+++ b/src/nvec_pthreads/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
@@ -319,6 +347,8 @@ Subject: Fix library paths for multiarch
ENDIF(BUILD_SHARED_LIBS)
ENDIF(FCMIX_ENABLE AND F77_FOUND)
+diff --git a/src/nvec_ser/CMakeLists.txt b/src/nvec_ser/CMakeLists.txt
+index 8b60809..2febfe0 100644
--- a/src/nvec_ser/CMakeLists.txt
+++ b/src/nvec_ser/CMakeLists.txt
@@ -44,7 +44,7 @@ IF(BUILD_STATIC_LIBS)
diff --git a/debian/patches/0004-Improve-FindPETSc-to-use-pkg-config-where-possible.patch b/debian/patches/0004-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
index f3e0c0a..adeea29 100644
--- a/debian/patches/0004-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
+++ b/debian/patches/0004-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
@@ -10,7 +10,7 @@ Subject: Improve FindPETSc to use pkg-config where possible
delete mode 100644 config/SundialsPETSc.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c7dbad..6db567d 100644
+index 237889c..14bcea6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -797,16 +797,18 @@ IF(PETSC_ENABLE AND NOT MPI_ENABLE)
diff --git a/debian/patches/series b/debian/patches/series
index cdb33e9..08c7109 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
0001-Added-missing-linkages-to-the-DSOs.patch
-Fix-library-paths-for-multiarch.patch
+0002-Fix-library-paths-for-multiarch.patch
0004-Improve-FindPETSc-to-use-pkg-config-where-possible.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sundials.git
More information about the debian-science-commits
mailing list