This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pdal.
commit d0027e246de299b365f994aacb0992f960e5fd17 Author: Bas Couwenberg <[email protected]> Date: Sat Aug 27 11:57:09 2016 +0200 Drop patches applied upstream, refresh remaining patch. --- debian/changelog | 1 + debian/patches/hurd.patch | 39 ---------------------- debian/patches/jsoncpp.patch | 39 ---------------------- debian/patches/privacy-breach.patch | 8 ++--- debian/patches/series | 4 --- debian/patches/source_date_epoch.patch | 23 ------------- debian/patches/sphinx-ext-pngmath-deprecated.patch | 16 --------- 7 files changed, 5 insertions(+), 125 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c9b974..239de19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pdal (1.3.0~rc1-1) UNRELEASED; urgency=medium - Update copyright years for Connor Manning & Bradley J Chambers - Add license & copyright for arbiter embedded copy - Update license & copyright for eigen embedded copy + * Drop patches applied upstream, refresh remaining patch. -- Bas Couwenberg <[email protected]> Sat, 27 Aug 2016 10:20:18 +0200 diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch deleted file mode 100644 index 5a1388d..0000000 --- a/debian/patches/hurd.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Add support for GNU/Hurd to portable_endian.hpp. - The Hurd porting guidelines document the following: - " - Missing linux/types.h, asm/types.h, linux/limits.h, asm/byteorder.h, - sys/endian.h, asm/ioctl.h, asm/ioctls.h, linux/soundcard.h - - These are often used (from lame rgrep results) instead of their standard - equivalents: sys/types.h (or stdint.h for fixed-size types), limits.h, - endian.h, sys/ioctl.h, sys/soundcard.h - " - https://www.gnu.org/software/hurd/hurd/porting/guidelines.html#linux_headers - . - Hurd also uses the .so extension for dynamic libraries like Linux & kFreeBSD. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1250 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/9650bd0601cf7fdead73d8a115cf8872b3b7971e - ---- a/include/pdal/util/portable_endian.hpp -+++ b/include/pdal/util/portable_endian.hpp -@@ -10,7 +10,7 @@ - - #endif - --#if defined(__linux__) || defined(__CYGWIN__) -+#if defined(__linux__) || defined(__CYGWIN__) || defined(__GNU__) - - # include <endian.h> - ---- a/src/PluginManager.cpp -+++ b/src/PluginManager.cpp -@@ -61,7 +61,7 @@ static PluginManager s_instance; - - #if defined(__APPLE__) && defined(__MACH__) - const std::string dynamicLibraryExtension(".dylib"); --#elif defined(__linux__) || defined(__FreeBSD_kernel__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) - const std::string dynamicLibraryExtension(".so"); - #elif defined _WIN32 - const std::string dynamicLibraryExtension(".dll"); diff --git a/debian/patches/jsoncpp.patch b/debian/patches/jsoncpp.patch deleted file mode 100644 index c7ab562..0000000 --- a/debian/patches/jsoncpp.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Link to system libjsoncpp if available. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1211 - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -101,9 +101,20 @@ set(PDAL_BASE_CPP - ${PDAL_XML_SRC} - ${PDAL_LAZPERF_SRC} - ${DB_DRIVER_SRCS} -- ${PROJECT_SOURCE_DIR}/vendor/jsoncpp-1.6.2/dist/jsoncpp.cpp - ) - -+include(FindPkgConfig) -+ -+pkg_search_module(JSONCPP jsoncpp>=1.6.2) -+if(JSONCPP_FOUND) -+ include_directories(${JSONCPP_INCLUDE_DIR}) -+else(JSONCPP_FOUND) -+ set(PDAL_BASE_CPP -+ ${PDAL_BASE_CPP} -+ ${PROJECT_SOURCE_DIR}/vendor/jsoncpp-1.6.2/dist/jsoncpp.cpp -+ ) -+endif(JSONCPP_FOUND) -+ - list (APPEND PDAL_CPP ${PDAL_BASE_CPP} ) - list (APPEND PDAL_HPP ${PDAL_BASE_HPP} ) - -@@ -167,6 +178,10 @@ if (PDAL_HAVE_LIBXML2) - target_link_libraries(${PDAL_BASE_LIB_NAME} ${LIBXML2_LIBRARIES}) - endif() - -+if(JSONCPP_FOUND) -+ target_link_libraries(${PDAL_BASE_LIB_NAME} ${JSONCPP_LIBRARY}) -+endif(JSONCPP_FOUND) -+ - # - # On OSX we reexport the symbols in libpdal_util.dylib into libpdalcpp.dylib - # so that users only need link libpdalcpp. diff --git a/debian/patches/privacy-breach.patch b/debian/patches/privacy-breach.patch index e365d91..21463ff 100644 --- a/debian/patches/privacy-breach.patch +++ b/debian/patches/privacy-breach.patch @@ -3,9 +3,9 @@ Description: Don't embedded external logo images. Author: Bas Couwenberg <[email protected]> Forwarded: not-needed ---- a/doc/contributors.rst -+++ b/doc/contributors.rst -@@ -20,9 +20,6 @@ This page is to recognize these contribu +--- a/doc/development/contributors.rst ++++ b/doc/development/contributors.rst +@@ -16,9 +16,6 @@ This page is to recognize these contribu Engineering Contributors -------------------------------------------------------------------------------- @@ -15,7 +15,7 @@ Forwarded: not-needed `Hobu`_ is the primary company behind the design, testing, development, and distribution of PDAL. Two Hobu team members primarily interact with PDAL. `Howard Butler`_ founded the project, and he provides project leadership and -@@ -34,9 +31,6 @@ new feature development of PDAL over the +@@ -30,9 +27,6 @@ new feature development of PDAL over the .. _`Hobu`: http://hobu.co diff --git a/debian/patches/series b/debian/patches/series index 47bdc55..7ca3720 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1 @@ -jsoncpp.patch privacy-breach.patch -hurd.patch -source_date_epoch.patch -sphinx-ext-pngmath-deprecated.patch diff --git a/debian/patches/source_date_epoch.patch b/debian/patches/source_date_epoch.patch deleted file mode 100644 index 3d4c1bc..0000000 --- a/debian/patches/source_date_epoch.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Use SOURCE_DATE_EPOCH instead of current date. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/PDAL/PDAL/pull/1251 -Applied-Upstream: https://github.com/PDAL/PDAL/commit/b5525784dfb1084ced49479d29ea2e184c5d0ea2 - ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -46,8 +46,14 @@ master_doc = 'index' - # General information about the project. - project = u'PDAL' - -+import time - import datetime --copyright = str(datetime.datetime.now().year) -+if os.environ.get('SOURCE_DATE_EPOCH'): -+ today = datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.gmtime()))).strftime('%B %d, %Y') -+ -+ copyright = str(datetime.datetime.utcfromtimestamp(int(os.environ.get('SOURCE_DATE_EPOCH', time.gmtime()))).year) -+else: -+ copyright = str(datetime.datetime.now().year) - - # The version info for the project you're documenting, acts as replacement for - # |version| and |release|, also used in various other places throughout the diff --git a/debian/patches/sphinx-ext-pngmath-deprecated.patch b/debian/patches/sphinx-ext-pngmath-deprecated.patch deleted file mode 100644 index 6a0d10e..0000000 --- a/debian/patches/sphinx-ext-pngmath-deprecated.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Don't use deprecated sphinx.ext.pngmath. -Author: Bas Couwenberg <[email protected]> -Forwarded: not-needed -Bug-Debian: https://bugs.debian.org/829429 - ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -27,7 +27,7 @@ import sphinx_bootstrap_theme - - # 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', 'rst2pdf.pdfbuilder', 'sphinx.ext.pngmath','rst2pdf.pdfbuilder'] -+extensions = ['breathe', 'sphinx.ext.autodoc', 'rst2pdf.pdfbuilder', 'rst2pdf.pdfbuilder'] - - # disqus_shortname = 'pdal' - -- 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
