[pktools] 05/16: Drop patches applied upstream.
Bas Couwenberg
sebastic at debian.org
Thu Jun 29 14:25:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pktools.
commit c605951bdde944b9fab4a1a4f68c88e036b0b420
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Jun 29 07:48:30 2017 +0200
Drop patches applied upstream.
---
debian/changelog | 1 +
debian/patches/build-pklas2img.patch | 18 -----
debian/patches/pkg-config-install-path.patch | 17 -----
debian/patches/pkg-config-not-executable.patch | 16 -----
debian/patches/pklas2img-CPLErr-conversion.patch | 23 -------
debian/patches/series | 6 --
debian/patches/soversion.patch | 84 ------------------------
debian/patches/spelling-errors.patch | 55 ----------------
8 files changed, 1 insertion(+), 219 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cde3e06..473f207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pktools (2.6.7.1-1) UNRELEASED; urgency=medium
* New upstream release.
* Update copyright years for Pieter Kempeneers.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Thu, 29 Jun 2017 07:23:22 +0200
diff --git a/debian/patches/build-pklas2img.patch b/debian/patches/build-pklas2img.patch
deleted file mode 100644
index 16a4b62..0000000
--- a/debian/patches/build-pklas2img.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Build pklas2img when liblas support is enabled.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://savannah.nongnu.org/support/index.php?109042
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa955d461b604f21b9919c80bc4e13f6b2b6
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -298,6 +298,10 @@ set(PKUTILITIES
- pkkalman
- )
-
-+set(PKLASUTILITIES
-+ pklas2img
-+)
-+
- set(PKFANNUTILITIES
- pkann
- pkfsann
diff --git a/debian/patches/pkg-config-install-path.patch b/debian/patches/pkg-config-install-path.patch
deleted file mode 100644
index 95174bf..0000000
--- a/debian/patches/pkg-config-install-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Install pkg-config file in <prefix>/lib/pkgconfig.
- <prefix>/lib is not in the default search paths.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://savannah.nongnu.org/support/index.php?109043
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa955d461b604f21b9919c80bc4e13f6b2b6
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -359,7 +359,7 @@ endif()
- #install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- #test
- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--install (FILES "pktools.pc" DESTINATION lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- if (PKTOOLS_WITH_UTILITIES)
- install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/debian/patches/pkg-config-not-executable.patch b/debian/patches/pkg-config-not-executable.patch
deleted file mode 100644
index f7b7ed1..0000000
--- a/debian/patches/pkg-config-not-executable.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Don't install pktools.pc as executable.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://savannah.nongnu.org/support/index.php?109043
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa955d461b604f21b9919c80bc4e13f6b2b6
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -363,7 +363,7 @@ endif()
- #install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- #test
- install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
--install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
-
- if (PKTOOLS_WITH_UTILITIES)
- install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/debian/patches/pklas2img-CPLErr-conversion.patch b/debian/patches/pklas2img-CPLErr-conversion.patch
deleted file mode 100644
index 60a2e94..0000000
--- a/debian/patches/pklas2img-CPLErr-conversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix pklas2img build failure.
- error: conversion from 'CPLErr' to non-scalar type
- .
- return type of setProjection was changed in 2.6.7 from std::string to CPLErr.
- The string returned was only used in debug mode as info and has been removed
- in the current version.
-Author: Pieter Kempeneers <kempenep at gmail.com>
-Origin: http://git.savannah.gnu.org/cgit/pktools.git/commit/src/apps/pklas2img.cc?id=337c42c79138fb95b1dd641b91dc5546c270478d
-Bug: https://savannah.nongnu.org/support/?109042
-
---- a/src/apps/pklas2img.cc
-+++ b/src/apps/pklas2img.cc
-@@ -287,9 +287,7 @@ int main(int argc,char **argv) {
- gt[5]=-dy_opt[0];
- outputWriter.setGeoTransform(gt);
- if(projection_opt.size()){
-- string projectionString=outputWriter.setProjectionProj4(projection_opt[0]);
-- if(verbose_opt[0])
-- cout << "projection: " << projectionString << endl;
-+ outputWriter.setProjectionProj4(projection_opt[0]);
- }
- if(!outputWriter.isGeoRef())
- cout << "Warning: output image " << output_opt[0] << " is not georeferenced!" << endl;
diff --git a/debian/patches/series b/debian/patches/series
index f70f7eb..bb1d521 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
-soversion.patch
-pkg-config-install-path.patch
-spelling-errors.patch
-build-pklas2img.patch
-pkg-config-not-executable.patch
-pklas2img-CPLErr-conversion.patch
spelling-errors2.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
deleted file mode 100644
index decd8ca..0000000
--- a/debian/patches/soversion.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Set SOVERSION to major version only.
- The libraries built with libtool used SOVERSION 1 too.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://savannah.nongnu.org/support/index.php?109043
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa955d461b604f21b9919c80bc4e13f6b2b6
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,25 +43,35 @@ set (PKTOOLS_PACKAGE_BUGREPORT "kempenep
- set (PKTOOLS_PACKAGE "pktools")
- set (PKTOOLS_COPYRIGHT_YEAR 2016)
-
-+set (PKTOOLS_BASE_VERSION_MAJOR 1)
-+set (PKTOOLS_BASE_VERSION_MINOR 6)
-+set (PKTOOLS_BASE_VERSION_PATCH 0)
-+set (PKTOOLS_BASE_VERSION "${PKTOOLS_BASE_VERSION_MAJOR}.${PKTOOLS_BASE_VERSION_MINOR}.${PKTOOLS_BASE_VERSION_PATCH}")
-+set (PKTOOLS_BASE_SOVERSION 1)
-+
- set (PKTOOLS_ALGORITHMS_VERSION_MAJOR 1)
- set (PKTOOLS_ALGORITHMS_VERSION_MINOR 6)
- set (PKTOOLS_ALGORITHMS_VERSION_PATCH 0)
- set (PKTOOLS_ALGORITHMS_VERSION "${PKTOOLS_ALGORITHMS_VERSION_MAJOR}.${PKTOOLS_ALGORITHMS_VERSION_MINOR}.${PKTOOLS_ALGORITHMS_VERSION_PATCH}")
-+set (PKTOOLS_ALGORITHMS_SOVERSION 1)
-
- set (PKTOOLS_FILECLASSES_VERSION_MAJOR 1)
- set (PKTOOLS_FILECLASSES_VERSION_MINOR 6)
- set (PKTOOLS_FILECLASSES_VERSION_PATCH 0)
- set (PKTOOLS_FILECLASSES_VERSION "${PKTOOLS_FILECLASSES_VERSION_MAJOR}.${PKTOOLS_FILECLASSES_VERSION_MINOR}.${PKTOOLS_FILECLASSES_VERSION_PATCH}")
-+set (PKTOOLS_FILECLASSES_SOVERSION 1)
-
- set (PKTOOLS_IMAGECLASSES_VERSION_MAJOR 1)
- set (PKTOOLS_IMAGECLASSES_VERSION_MINOR 6)
- set (PKTOOLS_IMAGECLASSES_VERSION_PATCH 0)
- set (PKTOOLS_IMAGECLASSES_VERSION "${PKTOOLS_IMAGECLASSES_VERSION_MAJOR}.${PKTOOLS_IMAGECLASSES_VERSION_MINOR}.${PKTOOLS_IMAGECLASSES_VERSION_PATCH}")
-+set (PKTOOLS_IMAGECLASSES_SOVERSION 1)
-
- set (PKTOOLS_LASCLASSES_VERSION_MAJOR 1)
- set (PKTOOLS_LASCLASSES_VERSION_MINOR 6)
- set (PKTOOLS_LASCLASSES_VERSION_PATCH 0)
- set (PKTOOLS_LASCLASSES_VERSION "${PKTOOLS_LASCLASSES_VERSION_MAJOR}.${PKTOOLS_LASCLASSES_VERSION_MINOR}.${PKTOOLS_LASCLASSES_VERSION_PATCH}")
-+set (PKTOOLS_LASCLASSES_SOVERSION 1)
-
- # Name of C++ library
- set(PKTOOLS_BASE_LIB_NAME base)
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -115,32 +115,32 @@ endif(BUILD_WITH_LIBLAS)
- # Set target properties
- SET_TARGET_PROPERTIES(${PKTOOLS_BASE_LIB_NAME}
- PROPERTIES
-- SOVERSION ${PKTOOLS_BASE_VERSION}
-+ SOVERSION ${PKTOOLS_BASE_SOVERSION}
- VERSION ${PKTOOLS_BASE_VERSION}
- )
-
- SET_TARGET_PROPERTIES(${PKTOOLS_IMAGECLASSES_LIB_NAME}
- PROPERTIES
-- SOVERSION ${PKTOOLS_IMAGECLASSES_VERSION}
-+ SOVERSION ${PKTOOLS_IMAGECLASSES_SOVERSION}
- VERSION ${PKTOOLS_IMAGECLASSES_VERSION}
- )
-
- SET_TARGET_PROPERTIES(${PKTOOLS_ALGORITHMS_LIB_NAME}
- PROPERTIES
-- SOVERSION ${PKTOOLS_ALGORITHMS_VERSION}
-+ SOVERSION ${PKTOOLS_ALGORITHMS_SOVERSION}
- VERSION ${PKTOOLS_ALGORITHMS_VERSION}
- )
-
- SET_TARGET_PROPERTIES(${PKTOOLS_FILECLASSES_LIB_NAME}
- PROPERTIES
-- SOVERSION ${PKTOOLS_FILECLASSES_VERSION}
-+ SOVERSION ${PKTOOLS_FILECLASSES_SOVERSION}
- VERSION ${PKTOOLS_FILECLASSES_VERSION}
- )
-
- if (BUILD_WITH_LIBLAS)
- SET_TARGET_PROPERTIES(${PKTOOLS_LASCLASSES_LIB_NAME}
- PROPERTIES
-- SOVERSION ${PKTOOLS_LASCLASSES_VERSION}
-+ SOVERSION ${PKTOOLS_LASCLASSES_SOVERSION}
- VERSION ${PKTOOLS_LASCLASSES_VERSION}
- )
- endif(BUILD_WITH_LIBLAS)
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 53e68c8..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Fix spelling errors.
- ouptut -> output
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://savannah.nongnu.org/support/index.php?109043
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=91f2fa955d461b604f21b9919c80bc4e13f6b2b6
-
---- a/src/apps/pkfilter.cc
-+++ b/src/apps/pkfilter.cc
-@@ -39,7 +39,7 @@ along with pktools. If not, see <http:/
- ## SYNOPSIS
-
- <code>
-- Usage: pkfilter -i input -o ouptut [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]
-+ Usage: pkfilter -i input -o output [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]
- </code>
-
- <code>
-@@ -214,7 +214,7 @@ pkfilter -i lena.tif -o sobelx.tif -f so
- | ct | ct | std::string | |color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table |
- | circ | circular | bool | false |circular disc kernel for dilation and erosion |
-
--Usage: pkfilter -i input -o ouptut [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]
-+Usage: pkfilter -i input -o output [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]
-
-
- Examples
-@@ -343,7 +343,7 @@ int main(int argc,char **argv) {
- }
- if(!doProcess){
- cout << endl;
-- cout << "Usage: pkfilter -i input -o ouptut [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]" << endl;
-+ cout << "Usage: pkfilter -i input -o output [-f filter | -perc value | -srf file [-srf file]* -win wavelength [-win wavelength]* | -wout wavelength -fwhm value [-wout wavelength -fwhm value]* -win wavelength [-win wavelength]*]" << endl;
- cout << endl;
- std::cout << "short option -h shows basic options only, use long option --help to show all options" << std::endl;
- exit(0);//help was invoked, stop processing
---- a/src/apps/pkstatprofile.cc
-+++ b/src/apps/pkstatprofile.cc
-@@ -87,7 +87,7 @@ pkstatprofile -i modis_ndvi_2010.tif -o
- |class | class | std::string | | class value(s) to use for mode, proportion |
- |nodata | nodata | double | | nodata value(s) |
-
--Usage: pkstatprofile -i input -o ouptut [-f function]*
-+Usage: pkstatprofile -i input -o output [-f function]*
-
- **/
-
-@@ -133,7 +133,7 @@ int main(int argc,char **argv) {
- }
- if(!doProcess){
- cout << endl;
-- cout << "Usage: pkstatprofile -i input -o ouptut [-function]*" << endl;
-+ cout << "Usage: pkstatprofile -i input -o output [-function]*" << endl;
- cout << endl;
- std::cout << "short option -h shows basic options only, use long option --help to show all options" << std::endl;
- exit(0);//help was invoked, stop processing
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git
More information about the Pkg-grass-devel
mailing list