[liblas] 05/15: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Mon Aug 22 20:44:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository liblas.
commit 08ce2ee5cc5300128f4a692a3bff70869c871324
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Aug 22 15:45:30 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/accommodate-typo | 45 ----------------------
.../disable-bigfile_boost_iostreams_test.patch | 34 ----------------
debian/patches/fix_library_search | 21 ----------
debian/patches/libgeotiff-1.4.2.patch | 39 -------------------
debian/patches/parameters-typo | 16 --------
debian/patches/series | 6 ---
debian/patches/specified-typo | 16 --------
8 files changed, 1 insertion(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 04e7810..e989f9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ liblas (1.8.1~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Update watch file to force lowercase RC.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Mon, 22 Aug 2016 15:42:02 +0200
diff --git a/debian/patches/accommodate-typo b/debian/patches/accommodate-typo
deleted file mode 100644
index e844429..0000000
--- a/debian/patches/accommodate-typo
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fix 'accomodate' typo, replace with 'accommodate'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: https://github.com/libLAS/libLAS/pull/49
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/24335f456bab414583f1c092372e568fe16aa566
-
---- a/include/liblas/external/property_tree/detail/rapidxml.hpp
-+++ b/include/liblas/external/property_tree/detail/rapidxml.hpp
-@@ -377,7 +377,7 @@ namespace liblas { namespace property_tr
- }
-
- //! Allocates a new node from the pool, and optionally assigns name and value to it.
-- //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-+ //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
- //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
- //! will call rapidxml::parse_error_handler() function.
- //! \param type Type of node to create.
-@@ -410,7 +410,7 @@ namespace liblas { namespace property_tr
- }
-
- //! Allocates a new attribute from the pool, and optionally assigns name and value to it.
-- //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-+ //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
- //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
- //! will call rapidxml::parse_error_handler() function.
- //! \param name Name to assign to the attribute, or 0 to assign no name.
-@@ -441,7 +441,7 @@ namespace liblas { namespace property_tr
- }
-
- //! Allocates a char array of given size from the pool, and optionally copies a given string to it.
-- //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-+ //! If the allocation request cannot be accommodated, this function will throw <code>std::bad_alloc</code>.
- //! If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function
- //! will call rapidxml::parse_error_handler() function.
- //! \param source String to initialize the allocated memory with, or 0 to not initialize it.
---- a/src/gt_wkt_srs.cpp
-+++ b/src/gt_wkt_srs.cpp
-@@ -433,7 +433,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
- && psDefn->UOMLengthInMeters != 1.0 )
- {
- psDefn->ProjParm[iParm] /= psDefn->UOMLengthInMeters;
-- CPLDebug( "GTIFF", "converting geokey to accomodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
-+ CPLDebug( "GTIFF", "converting geokey to accommodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
- }
- break;
-
diff --git a/debian/patches/disable-bigfile_boost_iostreams_test.patch b/debian/patches/disable-bigfile_boost_iostreams_test.patch
deleted file mode 100644
index 7fbcdb9..0000000
--- a/debian/patches/disable-bigfile_boost_iostreams_test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Disable bigfile_boost_iostreams_test, fails to build with GCC 5.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/777955
-
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -24,9 +24,9 @@ set(LASBLOCK lasblock )
- set(BIGFILE_TEST bigfile_test)
- set(LASINDEX_TEST lasindex_test)
-
--if(Boost_IOSTREAMS_FOUND)
-- set(BIGFILE_BIO_TEST bigfile_boost_iostreams_test)
--endif()
-+#if(Boost_IOSTREAMS_FOUND)
-+# set(BIGFILE_BIO_TEST bigfile_boost_iostreams_test)
-+#endif()
-
- # Set the build type to release if it is not explicitly set by the user and
- # isn't in the cache yet
-@@ -127,10 +127,10 @@ if (LASINDEX_TEST)
- target_link_libraries(${LASINDEX_TEST} ${APPS_CPP_DEPENDENCIES})
- endif()
-
--if(BIGFILE_BIO_TEST)
-- add_executable(${BIGFILE_BIO_TEST} bigfile_boost_iostreams_test.cpp)
-- target_link_libraries(${BIGFILE_BIO_TEST} ${APPS_CPP_DEPENDENCIES} )
--endif()
-+#if(BIGFILE_BIO_TEST)
-+# add_executable(${BIGFILE_BIO_TEST} bigfile_boost_iostreams_test.cpp)
-+# target_link_libraries(${BIGFILE_BIO_TEST} ${APPS_CPP_DEPENDENCIES} )
-+#endif()
-
- ###############################################################################
- # Targets installation
diff --git a/debian/patches/fix_library_search b/debian/patches/fix_library_search
deleted file mode 100644
index e3cc825..0000000
--- a/debian/patches/fix_library_search
+++ /dev/null
@@ -1,21 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix incorrect usage of ctypes' find_library
-Bug-Debian: http://bugs.debian.org/595603
-Bug-Debian: http://bugs.debian.org/595608
-Forwarded: https://github.com/libLAS/libLAS/pull/50
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/e528fcac317a2819b088fcbb1a080b3f4ae8fe13
-Last-Update: 2014-08-03
-
---- a/python/liblas/core.py
-+++ b/python/liblas/core.py
-@@ -152,8 +152,8 @@ elif os.name == 'posix':
- lib_name = 'liblas_c.dylib'
- free = ctypes.CDLL(find_library('libc')).free
- else:
-- lib_name = 'liblas_c.so'
-- free = ctypes.CDLL(find_library('libc.so.6')).free
-+ lib_name = 'liblas_c.so.3'
-+ free = ctypes.CDLL(find_library('c')).free
- las = ctypes.CDLL(lib_name)
- else:
- raise LASException('Unsupported OS "%s"' % os.name)
diff --git a/debian/patches/libgeotiff-1.4.2.patch b/debian/patches/libgeotiff-1.4.2.patch
deleted file mode 100644
index 122bb26..0000000
--- a/debian/patches/libgeotiff-1.4.2.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Add support for libgeotiff 1.4.2.
- libgeotiff 1.4.2 renamed __geotiff_h_ to LIBGEOTIFF_GEOTIFF_H_,
- and __geo_simpletags_h_ to LIBGEOTIFF_GEO_SIMPLETAGS_H_.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/92
-
---- a/include/liblas/spatialreference.hpp
-+++ b/include/liblas/spatialreference.hpp
-@@ -56,10 +56,10 @@
- #include <string>
-
- // Fake out the compiler if we don't have libgeotiff includes already
--#if !defined(__geotiff_h_)
-+#if !defined(__geotiff_h_) && !defined(LIBGEOTIFF_GEOTIFF_H_)
- typedef struct GTIFS *GTIF;
- #endif
--#if !defined(__geo_simpletags_h_)
-+#if !defined(__geo_simpletags_h_) && !defined(LIBGEOTIFF_GEO_SIMPLETAGS_H_)
- typedef struct ST_TIFFS *ST_TIFF;
- #endif
-
-@@ -199,7 +199,7 @@ private:
- LAS_DLL std::ostream& operator<<(std::ostream& ostr, const liblas::SpatialReference& srs);
-
- LAS_C_START
--#if defined(__geotiff_h_)
-+#if defined(__geotiff_h_) || defined(LIBGEOTIFF_GEOTIFF_H_)
- #if defined(GEO_NORMALIZE_H_INCLUDED)
- char LAS_DLL * GTIFGetOGISDefn(GTIF*, GTIFDefn*);
- #endif
-@@ -210,7 +210,7 @@ void SetLinearUnitCitation(GTIF* psGTIF,
- #if defined(_OGR_SRS_API_H_INCLUDED)
- void SetGeogCSCitation(GTIF* psGTIF, OGRSpatialReference* poSRS, char* angUnitName, int nDatum, short nSpheroid);
- #endif // defined _OGR_SRS_API_H_INCLUDED
--#endif // defined __geotiff_h_
-+#endif // defined __geotiff_h_ || defined LIBGEOTIFF_GEOTIFF_H_
-
- LAS_C_END
-
diff --git a/debian/patches/parameters-typo b/debian/patches/parameters-typo
deleted file mode 100644
index e565965..0000000
--- a/debian/patches/parameters-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'paremeters' typo, replace with 'parameters'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/81
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/77b2fc0279256f1e588818f36f4753b6a206047e
-
---- a/apps/las2ogr.cpp
-+++ b/apps/las2ogr.cpp
-@@ -279,7 +279,7 @@ int main(int argc, char* argv[])
-
- if (in_file.empty() || out_file.empty() || out_frmt.empty())
- {
-- throw std::runtime_error("missing input paremeters");
-+ throw std::runtime_error("missing input parameters");
- }
- }
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ddb75a6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-fix_library_search
-accommodate-typo
-#disable-bigfile_boost_iostreams_test.patch
-parameters-typo
-specified-typo
-libgeotiff-1.4.2.patch
diff --git a/debian/patches/specified-typo b/debian/patches/specified-typo
deleted file mode 100644
index d5cade0..0000000
--- a/debian/patches/specified-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'specfied' typo, replace with 'specified'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/81
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/77b2fc0279256f1e588818f36f4753b6a206047e
-
---- a/apps/ts2las.cpp
-+++ b/apps/ts2las.cpp
-@@ -325,7 +325,7 @@ int main(int argc, char* argv[])
-
- if (input.empty())
- {
-- std::cerr << "No input TerraSolid .bin file was specfied!" << std::endl;
-+ std::cerr << "No input TerraSolid .bin file was specified!" << std::endl;
- OutputHelp(std::cout, options);
- return 1;
- }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/liblas.git
More information about the Pkg-grass-devel
mailing list