[qmapshack] 05/09: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Mon Mar 27 06:08:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit c0e2f68f1226e61355244370fc5b8d589af69558
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Mar 26 13:55:02 2017 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/alglib.patch | 16 ---
.../cmake-patch-to-find-alglib-on-RH-systems.patch | 32 ------
debian/patches/series | 3 -
debian/patches/spelling-errors.patch | 120 ---------------------
5 files changed, 1 insertion(+), 171 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d6ee440..0fbca03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qmapshack (1.8.0-1) UNRELEASED; urgency=medium
* Update copyright file, changes:
- Update copyright years for Oliver Eichler
- Add Michel Durand & Norbert Truchsess to copyright holders
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 26 Mar 2017 13:47:56 +0200
diff --git a/debian/patches/alglib.patch b/debian/patches/alglib.patch
deleted file mode 100644
index b359c42..0000000
--- a/debian/patches/alglib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Tweak FindALGLIB.cmake for Debian package.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/128/tweak-findalglibcmake-for-debian-package/diff
-Applied-Upstream: https://bitbucket.org/maproom/qmapshack/commits/5cf0a9b052871e827537e23d5f88cb4087628bb7
-
---- a/cmake/Modules/FindALGLIB.cmake
-+++ b/cmake/Modules/FindALGLIB.cmake
-@@ -30,7 +30,7 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
- ${CMAKE_INSTALL_PREFIX}/include
- PATH_SUFFIXES
- alglib
--
-+ libalglib
- )
- mark_as_advanced(ALGLIB_INCLUDE_DIR)
-
diff --git a/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch b/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch
deleted file mode 100644
index c56f606..0000000
--- a/debian/patches/cmake-patch-to-find-alglib-on-RH-systems.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Cmake patch to find alglib on RH systems
-Author: Oliver Eichler <oliver.eichler at gmx.de>
-Origin: https://bitbucket.org/maproom/qmapshack/commits/240e7a2a21ba06fccc2420be36cc25f8781378ec
-
---- a/cmake/Modules/FindALGLIB.cmake
-+++ b/cmake/Modules/FindALGLIB.cmake
-@@ -36,8 +36,9 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
-
- find_library(ALGLIB_LIBRARY
- NAMES
-- alg
-+ alglib
- PATHS
-+ /usr/lib64
- /usr/lib
- /usr/local/lib
- /opt/local/lib
-@@ -50,11 +51,9 @@ else (ALGLIB_LIBRARIES AND ALGLIB_INCLUD
- ${ALGLIB_INCLUDE_DIR}
- )
-
-- if (ALGLIB_FOUND)
-- set(ALGLIB_LIBRARIES
-- ${ALGLIB_LIBRARY}
-- )
-- endif (ALGLIB_FOUND)
-+ set(ALGLIB_LIBRARIES
-+ ${ALGLIB_LIBRARY}
-+ )
-
- if (ALGLIB_INCLUDE_DIRS AND ALGLIB_LIBRARIES)
- set(ALGLIB_FOUND TRUE)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6c83899..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake-patch-to-find-alglib-on-RH-systems.patch
-alglib.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index d6a4f99..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Description: Fix spelling errors.
- * dont -> don't
- * errror -> error
- * inernal -> internal
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bitbucket.org/maproom/qmapshack/pull-requests/129/fix-spelling-errors/diff
-Applied-Upstream: https://bitbucket.org/maproom/qmapshack/commits/50a625ef9c9759e403e7d8b353617f8e728933ca
-
---- a/3rdparty/alglib/src/alglibinternal.cpp
-+++ b/3rdparty/alglib/src/alglibinternal.cpp
-@@ -7056,8 +7056,8 @@ void matrixvectormultiply(/* Real */
- {
- return;
- }
-- ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
-- ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
-+ ae_assert(j2-j1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
-+ ae_assert(i2-i1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
-
- /*
- * beta*y
-@@ -7093,8 +7093,8 @@ void matrixvectormultiply(/* Real */
- {
- return;
- }
-- ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X dont match!", _state);
-- ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y dont match!", _state);
-+ ae_assert(i2-i1==ix2-ix1, "MatrixVectorMultiply: A and X don't match!", _state);
-+ ae_assert(j2-j1==iy2-iy1, "MatrixVectorMultiply: A and Y don't match!", _state);
-
- /*
- * beta*y
---- a/3rdparty/alglib/src/ap.cpp
-+++ b/3rdparty/alglib/src/ap.cpp
-@@ -6276,11 +6276,11 @@ void alglib::ae_vector_wrapper::assign(c
- // Assignment to proxy object
- //
- if( rhs.p_vec==NULL )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
- if( rhs.p_vec->datatype!=p_vec->datatype )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (types dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (types don't match)");
- if( rhs.p_vec->cnt!=p_vec->cnt )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
- memcpy(p_vec->ptr.p_ptr, rhs.p_vec->ptr.p_ptr, p_vec->cnt*alglib_impl::ae_sizeof(p_vec->datatype));
- }
- }
-@@ -6684,13 +6684,13 @@ void alglib::ae_matrix_wrapper::assign(c
- //
- ae_int_t i;
- if( rhs.p_mat==NULL )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
- if( rhs.p_mat->datatype!=p_mat->datatype )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (types dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (types don't match)");
- if( rhs.p_mat->rows!=p_mat->rows )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
- if( rhs.p_mat->cols!=p_mat->cols )
-- throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes dont match)");
-+ throw alglib::ap_error("ALGLIB: incorrect assignment to array (sizes don't match)");
- for(i=0; i<p_mat->rows; i++)
- memcpy(p_mat->ptr.pp_void[i], rhs.p_mat->ptr.pp_void[i], p_mat->cols*alglib_impl::ae_sizeof(p_mat->datatype));
- }
---- a/3rdparty/alglib/src/dataanalysis.cpp
-+++ b/3rdparty/alglib/src/dataanalysis.cpp
-@@ -26328,7 +26328,7 @@ static void mlpbase_mlphessianbatchinter
-
- /*
- * For a softmax + squared error we have expression
-- * far beyond human imagination so we dont even try
-+ * far beyond human imagination so we don't even try
- * to comment on it. Just enjoy the code...
- *
- * P.S. That's why "natural error" is called "natural" -
---- a/3rdparty/alglib/src/interpolation.cpp
-+++ b/3rdparty/alglib/src/interpolation.cpp
-@@ -19192,7 +19192,7 @@ REMARK:
-
- Assume, that exist one root only at [A;B], else
- function may be work incorrectly.
--The function dont check value A0,B0!
-+The function don't check value A0,B0!
-
- -- ALGLIB PROJECT --
- Copyright 26.09.2011 by Bochkanov Sergey
-@@ -19953,7 +19953,7 @@ Result:
-
- REMARK:
-
--The function dont check value A0,B0 and A1,B1!
-+The function don't check value A0,B0 and A1,B1!
-
- -- ALGLIB PROJECT --
- Copyright 26.09.2011 by Bochkanov Sergey
---- a/3rdparty/alglib/src/optimization.cpp
-+++ b/3rdparty/alglib/src/optimization.cpp
-@@ -25144,7 +25144,7 @@ void qpbleicoptimize(convexquadraticmode
- sstate->tmp1.ptr.p_double[i] = sstate->solver.g.ptr.p_double[i]*s->ptr.p_double[i];
- v = v+ae_sqr(sstate->tmp0.ptr.p_double[i], _state);
- }
-- ae_assert(ae_fp_greater(v,(double)(0)), "QPBLEICOptimize: inernal errror (scaled direction is zero)", _state);
-+ ae_assert(ae_fp_greater(v,(double)(0)), "QPBLEICOptimize: internal error (scaled direction is zero)", _state);
- v = 1/ae_sqrt(v, _state);
- ae_v_muld(&sstate->tmp0.ptr.p_double[0], 1, ae_v_len(0,n-1), v);
- v = ae_v_dotproduct(&sstate->tmp0.ptr.p_double[0], 1, &sstate->tmp1.ptr.p_double[0], 1, ae_v_len(0,n-1));
---- a/cmake/Modules/CMakeLists.txt
-+++ b/cmake/Modules/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(FILES_TO_REMOVE
-
- install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake )
-
--file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, dont edit\n\n")
-+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "#generated by cmake, don't edit\n\n")
- foreach ( _current_FILE ${FILES_TO_REMOVE})
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "message(STATUS \"Removing ${module_install_dir}/${_current_FILE}\" )\n" )
- file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/remove_files.cmake "exec_program( ${CMAKE_COMMAND} ARGS -E remove ${module_install_dir}/${_current_FILE} OUTPUT_VARIABLE _dummy)\n" )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list