This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository zoo-project.
commit 2570113020041124c1193bdb047a7810aaddc843 Author: Bas Couwenberg <[email protected]> Date: Sun Jan 22 19:45:06 2017 +0100 Drop patches included upstream. --- ...hen-building-with-OTB-version-upper-or-eq.patch | 35 ------------------ debian/patches/hardening-buildflags.patch | 2 +- debian/patches/series | 2 - ...temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch | 43 ---------------------- 4 files changed, 1 insertion(+), 81 deletions(-) diff --git a/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch b/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch deleted file mode 100644 index fd938ee..0000000 --- a/debian/patches/0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Fix issue when building with OTB version upper or equal to 5.8.0. - git-svn-id: http://svn.zoo-project.org/svn/trunk@803 4b6b6ad6-68b3-4dcc-9231-bd9b83bc5dc3 -Author: djay <djay@4b6b6ad6-68b3-4dcc-9231-bd9b83bc5dc3> -Origin: https://github.com/OSGeo/zoo-project/commit/2dc016ec347eb5fc86510ab06e37190acbe69ff3 - ---- a/zoo-project/zoo-kernel/configure.ac -+++ b/zoo-project/zoo-kernel/configure.ac -@@ -830,14 +830,21 @@ else - CPPFLAGS="$OTB_CPPFLAGS" - LDFLAGS_SAVE="$LDFLAGS" - LIBS="$LIBS_SAVE $OTB_LDFLAGS" -- echo $OTB_CPPFLAGS -- #AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h], -- # [], [AC_MSG_ERROR([could not find header file $i related to OTB])]) -+ #echo $OTB_CPPFLAGS -+ AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h], -+ [], [AC_MSG_ERROR([could not find header file $i related to OTB])]) - LDFLAGS_SAVE="$LDFLAGS" - LDFLAGS="$OTB_LDFLAGS" -- echo $OTB_LDFLAGS -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"],[std::vector<std::string> list = otb::Wrapwper::ApplicationRegistry::GetAvailableApplication();]])], -- [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])]) -+ #echo $OTB_LDFLAGS -+ UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)" -+ if test "$OTBVERS" == "$UVERS" ; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])], -+ [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])]) -+ else -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])], -+ [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])]) -+ fi -+ - LDFLAGS="$LDFLAGS_SAVE" - AC_LANG_POP([C++]) - AC_LANG(C++) diff --git a/debian/patches/hardening-buildflags.patch b/debian/patches/hardening-buildflags.patch index d8db8e8..4f4b672 100644 --- a/debian/patches/hardening-buildflags.patch +++ b/debian/patches/hardening-buildflags.patch @@ -15,7 +15,7 @@ Forwarded: not-needed RANLIB=ranlib --- a/zoo-project/zoo-kernel/configure.ac +++ b/zoo-project/zoo-kernel/configure.ac -@@ -898,6 +898,14 @@ AC_SUBST([SAGA_LDFLAGS]) +@@ -912,6 +912,14 @@ AC_SUBST([SAGA_LDFLAGS]) AC_SUBST([SAGA_FILE]) AC_SUBST([SAGA_ENABLED]) diff --git a/debian/patches/series b/debian/patches/series index e688c4f..1b65385 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ hardening-buildflags.patch zoo-version.patch -0001-Fix-issue-when-building-with-OTB-version-upper-or-eq.patch -temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch status-datapath.patch diff --git a/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch b/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch deleted file mode 100644 index fd6c29d..0000000 --- a/debian/patches/temporary-fix-for-ITK-4.10-and-OTB-ge-5.4.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: Temporary fix for ITK 4.10 and OTB >=5.4. -Author: djay -Origin: http://zoo-project.org/trac/changeset/804/ - ---- a/zoo-project/zoo-kernel/configure.ac -+++ b/zoo-project/zoo-kernel/configure.ac -@@ -813,6 +813,13 @@ else - ITKVERS="4.5" - fi - OTB_ENABLED="-DUSE_OTB" -+ IVERS="$(echo -e '4.10\n$ITKVERS' | sort -r | head -n1)" -+ if test "$IVERS" == "$ITKVERS"; then -+ ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl- [...] -+ else -+ ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkv [...] -+ fi -+ - if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then - OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/" - OTB_CPPFLAGS="-I${OTB_RPATH}ApplicationEngine -I$OTB_RPATH/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTB_RPATH/Utilities/ITK -I$OTB_RPATH/ -I$OTB_RPATH/IO -I$OTB_RPATH/UtilitiesAdapters/OssimAdapters -I$OTB_RPATH/UtilitiesAdapters/CurlAdapters -I$OTB_RPATH/Utilities/BGL -I$OTB_RPATH/UtilitiesAdapters/ITKPendingPatches -I$OTB_RPATH/Utilities/otbconfigfile $GDAL_CFLAGS" -@@ -836,14 +843,14 @@ else - LDFLAGS_SAVE="$LDFLAGS" - LDFLAGS="$OTB_LDFLAGS" - #echo $OTB_LDFLAGS -- UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)" -- if test "$OTBVERS" == "$UVERS" ; then -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])], -- [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])]) -- else -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])], -- [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])]) -- fi -+ #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)" -+ #if test "$OTBVERS" == "$UVERS" ; then -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])], -+ [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])]) -+ #else -+ # AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])], -+ # [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])]) -+ #fi - - LDFLAGS="$LDFLAGS_SAVE" - AC_LANG_POP([C++]) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
