[getdp] 04/20: remove unused patches
Mattia Rizzolo
mattia at debian.org
Fri Feb 12 19:58:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository getdp.
commit b00b10a8a9ff3e8e953dbc26a750b4f283839fe2
Author: Mattia Rizzolo <mattia at debian.org>
Date: Fri Feb 12 16:07:45 2016 +0000
remove unused patches
---
debian/patches/Makefile.diff | 45 -------------------------------
debian/patches/configure.diff | 41 ----------------------------
debian/patches/fix_latest_svn.patch | 10 -------
debian/patches/series | 5 ----
debian/patches/slepc3.2.patch | 53 -------------------------------------
5 files changed, 154 deletions(-)
diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
deleted file mode 100644
index 3cab0a2..0000000
--- a/debian/patches/Makefile.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: getdp-2.1.1~svn2227/Makefile
-===================================================================
---- getdp-2.1.1~svn2227.orig/Makefile 2012-01-03 09:34:51.000000000 +0100
-+++ getdp-2.1.1~svn2227/Makefile 2012-01-17 16:30:54.465820750 +0100
-@@ -27,11 +27,11 @@
- @for i in ${GETDP_DIRS}; do (cd $$i && ${MAKE}); done
-
- install: variables
-- mkdir -p ${bindir}
-- cp -f bin/getdp${EXEEXT} ${bindir}
-- chmod 755 ${bindir}/getdp${EXEEXT}
-- mkdir -p ${mandir}/man1
-- cp -f doc/getdp.1 ${mandir}/man1
-+ mkdir -p $(DESTDIR)${bindir}
-+ cp -f bin/getdp${EXEEXT} $(DESTDIR)${bindir}
-+ chmod 755 $(DESTDIR)${bindir}/getdp${EXEEXT}
-+ mkdir -p $(DESTDIR)${mandir}/man1
-+ cp -f doc/getdp.1 $(DESTDIR)${mandir}/man1
-
- variables: configure
- @echo "********************************************************************"
-@@ -52,6 +52,7 @@
- clean:
- for i in doc lib demos ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean); done
- rm -f ${GETDP_VERSION_FILE}
-+ rm -f bin/getdp${EXEEXT}
-
- depend: initialtag
- mv -f Common/GetDPConfig.h .
-Index: getdp-2.1.1~svn2227/doc/texinfo/Makefile
-===================================================================
---- getdp-2.1.1~svn2227.orig/doc/texinfo/Makefile 2012-01-03 09:34:51.000000000 +0100
-+++ getdp-2.1.1~svn2227/doc/texinfo/Makefile 2012-01-17 16:30:54.465820750 +0100
-@@ -13,8 +13,9 @@
- makeinfo --split-size 1000000 getdp.texi
-
- install-info:
-- cp getdp.info* /usr/info/
-- install-info getdp.info /usr/info/dir
-+ mkdir -p $(DESTDIR)/usr/share/info/
-+ cp getdp.info* $(DESTDIR)/usr/share/info/
-+ install-info getdp.info $(DESTDIR)/usr/share/info/dir
-
- infoz: info
- tar zcvf getdp-info.tgz getdp.info*
diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff
deleted file mode 100644
index 38a467c..0000000
--- a/debian/patches/configure.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: getdp-2.1.1~svn2227/configure.in
-===================================================================
---- getdp-2.1.1~svn2227.orig/configure.in 2012-01-17 15:30:29.861973181 +0100
-+++ getdp-2.1.1~svn2227/configure.in 2012-01-17 15:45:59.837934072 +0100
-@@ -55,7 +55,7 @@
- [use SLEPc eigensolvers (default=yes)]))
- AC_ARG_ENABLE(sparskit,
- AC_HELP_STRING([--enable-sparskit],
-- [use Sperskit linear solvers (default=no)]))
-+ [use Sparskit linear solvers (default=no)]))
- AC_ARG_ENABLE(zitsol,
- AC_HELP_STRING([--enable-zitsol],
- [enable support for ZITSOL (default=no)]))
-@@ -222,12 +222,21 @@
- dnl Check for Arpack
- if test "x$enable_fortran" != "xno"; then
- if test "x$enable_arpack" != "xno" -a "x${LAPACK}" = "xyes"; then
-- AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
-- if test "x${ARPACK}" = "xyes"; then
-- AC_DEFINE(HAVE_ARPACK)
-- BO="${BO} Arpack"
-- GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
-- GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
-+ AC_LANG_PUSH(Fortran)
-+ AC_CHECK_LIB(arpack,znaupd,ARPACK="yes",ARPACK="no")
-+ AC_LANG_POP()
-+ if test "x${ARPACK}" = "xno"; then
-+ AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
-+ if test "x${ARPACK}" = "xyes"; then
-+ AC_DEFINE(HAVE_ARPACK)
-+ BO="${BO} Arpack"
-+ GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
-+ GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
-+ fi
-+ else
-+ GETDP_LIBS="${GETDP_LIBS} -larpack"
-+ AC_DEFINE(HAVE_ARPACK)
-+ BO="${BO} Arpack"
- fi
- fi
- fi
diff --git a/debian/patches/fix_latest_svn.patch b/debian/patches/fix_latest_svn.patch
deleted file mode 100644
index 7e126ff..0000000
--- a/debian/patches/fix_latest_svn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- getdp-2.1.2~beta2~svn2304.orig/Legacy/Operation_IterativeLinearSolver.cpp.orig 2012-03-08 21:43:16.000000000 +0100
-+++ getdp-2.1.2~beta2~svn2304/Legacy/Operation_IterativeLinearSolver.cpp 2012-03-08 21:44:33.000000000 +0100
-@@ -9,6 +9,7 @@
- #include "GetDPConfig.h"
- #include "ProData.h"
- #include "SolvingOperations.h"
-+#include "Message.h"
-
- #if defined(HAVE_PETSC) && defined(HAVE_GMSH)
-
diff --git a/debian/patches/series b/debian/patches/series
index 506b08e..95532fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-#Makefile.diff
-#configure.diff
-##slepc3.2.patch
-##fix_latest_svn.patch
-#cmake.patch
cmake.patch
petsc.patch
diff --git a/debian/patches/slepc3.2.patch b/debian/patches/slepc3.2.patch
deleted file mode 100644
index dcc7062..0000000
--- a/debian/patches/slepc3.2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve.cpp
-===================================================================
---- getdp-2.1.2~beta2~svn2274.orig/Legacy/EigenSolve.cpp 2012-02-14 15:42:55.000000000 +0100
-+++ getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve.cpp 2012-02-14 15:42:56.000000000 +0100
-@@ -7,7 +7,7 @@
- #include "Message.h"
- #include "EigenSolve.h"
-
--#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
-+#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // // petsc-dev
- #define PetscTruth PetscBool
- #define PetscOptionsGetTruth PetscOptionsGetBool
- #endif
-Index: getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve_SLEPC.cpp
-===================================================================
---- getdp-2.1.2~beta2~svn2274.orig/Legacy/EigenSolve_SLEPC.cpp 2012-02-14 15:42:55.000000000 +0100
-+++ getdp-2.1.2~beta2~svn2274/Legacy/EigenSolve_SLEPC.cpp 2012-02-14 15:46:10.000000000 +0100
-@@ -162,7 +162,7 @@
- Current.TimeImag = im;
- }
-
--#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
-+#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
- _try(VecDestroy(&xr));
- _try(VecDestroy(&xi));
- #else
-@@ -258,7 +258,7 @@
- Message::Error("SLEPc diverged after %d iterations", its);
- else if(reason == EPS_DIVERGED_BREAKDOWN)
- Message::Error("SLEPc generic breakdown in method");
--#if !(PETSC_VERSION_RELEASE == 0) // petsc-dev
-+#if !(PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
- else if(reason == EPS_DIVERGED_NONSYMMETRIC)
- Message::Error("The operator is nonsymmetric");
- #endif
-@@ -274,7 +274,7 @@
- // print eigenvalues and store eigenvectors in DofData
- _storeEigenVectors(DofData_P, nconv, eps, PETSC_NULL);
-
--#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
-+#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
- _try(EPSDestroy(&eps));
- #else
- _try(EPSDestroy(eps));
-@@ -389,7 +389,7 @@
- // print eigenvalues and store eigenvectors in DofData
- _storeEigenVectors(DofData_P, nconv, PETSC_NULL, qep);
-
--#if (PETSC_VERSION_RELEASE == 0) // petsc-dev
-+#if (PETSC_VERSION_RELEASE == 0 || ((PETSC_VERSION_MAJOR == 3) && (PETSC_VERSION_MINOR == 2))) // petsc-dev
- _try(QEPDestroy(&qep));
- #else
- _try(QEPDestroy(qep));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/getdp.git
More information about the debian-science-commits
mailing list