This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdal.
commit f53573307baf68b0aa47a6b087aa224d2a2c13a7 Author: Bas Couwenberg <[email protected]> Date: Thu Dec 15 21:03:48 2016 +0100 Drop patches applied upstream. Refresh remaining patches. --- debian/changelog | 1 + debian/patches/disable-sphinxcontrib-bibtex.patch | 2 +- debian/patches/series | 2 - debian/patches/specification-typo.patch | 16 ----- debian/patches/spelling-errors.patch | 86 ----------------------- debian/patches/use-mathjax-package.patch | 2 +- 6 files changed, 3 insertions(+), 106 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8dc7f1..ae7789c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pdal (1.4.0-1) UNRELEASED; urgency=medium * Update copyright file, changes: - Update copyright years - Update paths to renamed directories and moved files + * Drop patches applied upstream. Refresh remaining patches. -- Bas Couwenberg <[email protected]> Thu, 15 Dec 2016 20:47:12 +0100 diff --git a/debian/patches/disable-sphinxcontrib-bibtex.patch b/debian/patches/disable-sphinxcontrib-bibtex.patch index 65d1f7f..9051efc 100644 --- a/debian/patches/disable-sphinxcontrib-bibtex.patch +++ b/debian/patches/disable-sphinxcontrib-bibtex.patch @@ -4,7 +4,7 @@ Forwarded: not-needed --- a/doc/conf.py +++ b/doc/conf.py -@@ -34,8 +34,7 @@ else: +@@ -55,8 +55,7 @@ process_dimensions() # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['breathe', 'sphinx.ext.autodoc', diff --git a/debian/patches/series b/debian/patches/series index 9f84edc..080f495 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ privacy-breach.patch disable-sphinxcontrib-bibtex.patch use-mathjax-package.patch -spelling-errors.patch -specification-typo.patch diff --git a/debian/patches/specification-typo.patch b/debian/patches/specification-typo.patch deleted file mode 100644 index 8662832..0000000 --- a/debian/patches/specification-typo.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix 'specificiation' typo, replace with 'specification'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1331 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/90e705261b9d2993b926ce5c68facf03aa0ec522 - ---- a/kernels/info/InfoKernel.cpp -+++ b/kernels/info/InfoKernel.cpp -@@ -406,7 +406,7 @@ MetadataNode InfoKernel::dumpQuery(Point - else - count = 0; - if (count == 0) -- throw pdal_error("Invalid location specificiation. " -+ throw pdal_error("Invalid location specification. " - "--query=\"X,Y[/count]\""); - - auto seps = [](char c){ return (c == ',' || c == '|' || c == ' '); }; diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index a65bd2f..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,86 +0,0 @@ -Description: Fix spelling errors. - doesnt -> doesn't - conneciton -> connection -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1291 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/6bea07a940adc5c187820a9e6a3e290d3893f3a7 - ---- a/ChangeLog -+++ b/ChangeLog -@@ -7078,8 +7078,8 @@ - * Howard Butler <[email protected]> decruft (14:40:34) - * Howard Butler <[email protected]> decruft (14:40:25) - * Howard Butler <[email protected]> used cached byte positions to avoid per-point map lookup of positions for getField queries (14:40:00) -- * Howard Butler <[email protected]> use inplacereprojfilter because the scalingfilter combo doesnt work right now (14:39:03) -- * Howard Butler <[email protected]> use inplacereprojfilter because the scalingfilter combo doesnt work right now (14:38:18) -+ * Howard Butler <[email protected]> use inplacereprojfilter because the scalingfilter combo doesn't work right now (14:39:03) -+ * Howard Butler <[email protected]> use inplacereprojfilter because the scalingfilter combo doesn't work right now (14:38:18) - * Howard Butler <[email protected]> add getField specialization for fetching based on a pointIndex and Schema::getByteOffset() output (14:36:06) - * Howard Butler <[email protected]> no longer include tuple, not used (14:34:57) - ---- a/plugins/sqlite/io/SQLiteReader.cpp -+++ b/plugins/sqlite/io/SQLiteReader.cpp -@@ -124,7 +124,7 @@ SQLiteReader::fetchSpatialReference(std: - void SQLiteReader::addArgs(ProgramArgs& args) - { - args.add("spatialreference", "Spatial reference to apply to points if " -- "one doesnt exist", m_spatialRef); -+ "one doesn't exist", m_spatialRef); - args.add("query", "SELECT statement that returns point cloud", m_query); - args.add("connection", "Database connection string", m_connection); - args.add("module", "Spatialite module name", m_modulename); ---- a/vendor/pdalboost/boost/format/detail/compat_workarounds.hpp -+++ b/vendor/pdalboost/boost/format/detail/compat_workarounds.hpp -@@ -17,7 +17,7 @@ - // and compiler-specific switches) - - // Non-conformant Std-libs fail to supply conformant traits (std::char_traits, --// std::allocator) and/or the std::string doesnt support them. -+// std::allocator) and/or the std::string doesn't support them. - // We don't want to have hundreds of #ifdef workarounds, so we define - // replacement traits. - // But both char_traits and allocator traits are visible in the interface, ---- a/vendor/pdalboost/boost/format/detail/config_macros.hpp -+++ b/vendor/pdalboost/boost/format/detail/config_macros.hpp -@@ -79,7 +79,7 @@ namespace pdalboost { - #endif - - --// *** hide std::locale if it doesnt exist. -+// *** hide std::locale if it doesn't exist. - // this typedef is either std::locale or int, avoids placing ifdefs everywhere - namespace pdalboost { namespace io { namespace detail { - #if ! defined(BOOST_NO_STD_LOCALE) ---- a/vendor/pdalboost/boost/format/detail/workarounds_gcc-2_95.hpp -+++ b/vendor/pdalboost/boost/format/detail/workarounds_gcc-2_95.hpp -@@ -29,7 +29,7 @@ - #ifndef BOOST_FORMAT_WORKAROUNDS_GCC295_H - #define BOOST_FORMAT_WORKAROUNDS_GCC295_H - --// SGI STL doesnt have <ostream> and others, so we need iostream. -+// SGI STL doesn't have <ostream> and others, so we need iostream. - #include <iostream> - #define BOOST_FORMAT_OSTREAM_DEFINED - ---- a/vendor/pdalboost/boost/mpl/for_each.hpp -+++ b/vendor/pdalboost/boost/mpl/for_each.hpp -@@ -113,7 +113,7 @@ BOOST_MPL_CFG_GPU_ENABLED - inline - void for_each(F f, Sequence* = 0) - { -- // jfalcou: fully qualifying this call so it doesnt clash with pdalboostphoenix::for_each -+ // jfalcou: fully qualifying this call so it doesn't clash with pdalboostphoenix::for_each - // ons ome compilers -- done on 02/28/2011 - pdalboost::mpl::for_each<Sequence, identity<> >(f); - } ---- a/plugins/sqlite/io/SQLiteWriter.cpp -+++ b/plugins/sqlite/io/SQLiteWriter.cpp -@@ -73,7 +73,7 @@ void SQLiteWriter::addArgs(ProgramArgs& - m_block_table).setPositional(); - args.add("cloud_table_name", "Cloud table name", - m_cloud_table).setPositional(); -- args.add("connection", "SQL conneciton string", -+ args.add("connection", "SQL connection string", - m_connection).setPositional(); - args.add("cloud_column_name", "Cloud column name", m_cloud_column, "id"); - args.add("module", "Module name", m_modulename); diff --git a/debian/patches/use-mathjax-package.patch b/debian/patches/use-mathjax-package.patch index e23cbcb..5cc4772 100644 --- a/debian/patches/use-mathjax-package.patch +++ b/debian/patches/use-mathjax-package.patch @@ -4,7 +4,7 @@ Forwarded: not-needed --- a/doc/conf.py +++ b/doc/conf.py -@@ -37,6 +37,8 @@ extensions = ['breathe', 'sphinx.ext.aut +@@ -58,6 +58,8 @@ extensions = ['breathe', 'sphinx.ext.aut 'sphinx.ext.mathjax', 'sphinx.ext.intersphinx'] -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
