[liblas] 05/06: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Tue Aug 23 20:25:20 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 8fa7d17a9f90129415a367726368bff0aae8f61b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 23 22:01:31 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/hurd.patch | 27 ------------
debian/patches/kfreebsd.patch | 27 ------------
debian/patches/offset-typo.patch | 16 -------
debian/patches/series | 4 --
debian/patches/spelling-errors.patch | 82 ------------------------------------
6 files changed, 1 insertion(+), 156 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 503df38..de5de90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
liblas (1.8.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Tue, 23 Aug 2016 21:16:01 +0200
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
deleted file mode 100644
index 2c5eb99..0000000
--- a/debian/patches/hurd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Add support for GNU/Hurd.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/96
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/5dd20bef1fb544028dd738f0db5c5cb8ce91adb5
-
---- a/apps/las2col.c
-+++ b/apps/las2col.c
-@@ -24,7 +24,7 @@
-
- #include <limits.h>
- #include <inttypes.h>
--#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__)
-+#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-
- #include <endian.h>
- #include <unistd.h>
---- a/apps/las2pg.c
-+++ b/apps/las2pg.c
-@@ -20,7 +20,7 @@
- #include <stdint.h>
- #include <limits.h>
- #include <inttypes.h>
--#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__)
-+#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-
- # include <endian.h>
-
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
deleted file mode 100644
index 0a1e5a1..0000000
--- a/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Add support for GNU/kFreeBSD.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/96
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/5dd20bef1fb544028dd738f0db5c5cb8ce91adb5
-
---- a/apps/las2col.c
-+++ b/apps/las2col.c
-@@ -24,7 +24,7 @@
-
- #include <limits.h>
- #include <inttypes.h>
--#if defined(__linux__) || defined(__CYGWIN__)
-+#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__)
-
- #include <endian.h>
- #include <unistd.h>
---- a/apps/las2pg.c
-+++ b/apps/las2pg.c
-@@ -20,7 +20,7 @@
- #include <stdint.h>
- #include <limits.h>
- #include <inttypes.h>
--#if defined(__linux__) || defined(__CYGWIN__)
-+#if defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD_kernel__)
-
- # include <endian.h>
-
diff --git a/debian/patches/offset-typo.patch b/debian/patches/offset-typo.patch
deleted file mode 100644
index 3829016..0000000
--- a/debian/patches/offset-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'offets' typo, replace with 'offset'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/95
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/f07e58f8e0c244194b162c262bc46f1dc75602a0
-
---- a/apps/las2las.cpp
-+++ b/apps/las2las.cpp
-@@ -342,7 +342,7 @@ int main(int argc, char* argv[])
- if (vm.count("min-offset"))
- {
- if (vm.count("offset")) {
-- throw std::runtime_error("min-offset cannot be used with offets. Use one or the other");
-+ throw std::runtime_error("min-offset cannot be used with offset. Use one or the other");
- }
-
- bMinOffset = true;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8d9e8b4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-offset-typo.patch
-spelling-errors.patch
-kfreebsd.patch
-hurd.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 34a9bca..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Fix spelling errors.
- ouput -> output
- speficied -> specified
- substract -> subtract
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libLAS/libLAS/pull/97
-Applied-Upstream: https://github.com/libLAS/libLAS/commit/82823425351099c4bc2bdaa19a43238d98cfc774
-
---- a/apps/las2col.c
-+++ b/apps/las2col.c
-@@ -160,18 +160,18 @@ void usage()
- fprintf(stderr,"----------------------------------------------------------\n");
- fprintf(stderr,"\n");
-
-- fprintf(stderr,"Convert a las/laz file into columnar format (binary) of MonetDB, outputs for each entry a file <ouput_prefix>_col_<entry_name>.dat:\n");
-- fprintf(stderr," las2col -i <input_file> -o <ouput_prefix>\n");
-+ fprintf(stderr,"Convert a las/laz file into columnar format (binary) of MonetDB, outputs for each entry a file <output_prefix>_col_<entry_name>.dat:\n");
-+ fprintf(stderr," las2col -i <input_file> -o <output_prefix>\n");
- fprintf(stderr,"\n");
-
-- fprintf(stderr,"Convert a list of las/laz files (still outputs for each entry a file <ouput_prefix>_col_<entry_name>.dat):\n");
-- fprintf(stderr," las2col -i <las_file_1> -i <las_file_2> -o <ouput_prefix>\n");
-+ fprintf(stderr,"Convert a list of las/laz files (still outputs for each entry a file <output_prefix>_col_<entry_name>.dat):\n");
-+ fprintf(stderr," las2col -i <las_file_1> -i <las_file_2> -o <output_prefix>\n");
- fprintf(stderr,"Alternatively:\n");
-- fprintf(stderr," las2col -f <file_with_the_list_las/laz_files> -o <ouput_prefix>\n");
-+ fprintf(stderr," las2col -f <file_with_the_list_las/laz_files> -o <output_prefix>\n");
- fprintf(stderr,"\n");
-
- fprintf(stderr,"Convert a list of las/laz files using <num_read_threads> threads (default is 1):\n");
-- fprintf(stderr," las2col -f <file_with_the_list_las/laz_files> -o <ouput_prefix> --num_read_threads <number_of_threads>\n");
-+ fprintf(stderr," las2col -f <file_with_the_list_las/laz_files> -o <output_prefix> --num_read_threads <number_of_threads>\n");
- fprintf(stderr,"\n\n");
-
- fprintf(stderr,"----------------------------------------------------------\n");
-@@ -218,7 +218,7 @@ void usage()
- fprintf(stderr," After generating the columnar files, import them in MonetDB. Example: \n");
- fprintf(stderr," mclient <db_name> -s \"COPY BINARY INTO flat FROM ('<full_parent_path>/out_col_x.dat','<full_parent_path>/out_col_y.dat','<full_parent_path>/out_col_z.dat')\"\n");
- fprintf(stderr," Note that full paths of the columnar files MUST be used. Also note that a table called flat has to be created in a MonetDB DB beforehand. The table must have \n");
-- fprintf(stderr," the columns in the same order as specified by the --parse option, and the column types must be the ones speficied above. Example: \n");
-+ fprintf(stderr," the columns in the same order as specified by the --parse option, and the column types must be the ones specified above. Example: \n");
- fprintf(stderr," mclient <db_name> -s \"create table flat (x double, y double, z double)\"\n");
- fprintf(stderr," Note that for decimal entries (XYZ) the column definition at table-creation time must be decimal(<num_digits_unscaled_max>,<num_digits_scale>)\n");
- fprintf(stderr," For example, if the maximum X value of a file (or a list of files) is 638982.55, then the X definition when creating the table is decimal(8,2). Example:\n");
---- a/apps/las2pg.c
-+++ b/apps/las2pg.c
-@@ -166,7 +166,7 @@ void usage()
- fprintf(stderr," las2pg -i <input_file>.las\n");
- fprintf(stderr,"\n");
-
-- fprintf(stderr,"Convert a las/laz file into PostgreSQL binary dump format, outputs <ouput_name>:\n");
-+ fprintf(stderr,"Convert a las/laz file into PostgreSQL binary dump format, outputs <output_name>:\n");
- fprintf(stderr," las2pg -i <input_file>.las -o <output_name>\n");
- fprintf(stderr,"Use flag --stdout to write to standard output (recommended use together with a pipe, see below).\n");
- fprintf(stderr,"\n\n");
-@@ -198,7 +198,7 @@ void usage()
- fprintf(stderr," M - vertex index number as integer\n");
- fprintf(stderr," k - Morton 2D code using X and Y (unscaled and no offset) as bigint\n\n");
-
-- fprintf(stderr," The moffset flag (for example '--moffset 8600000,40000000') specifies a global offset to substract to X and Y \n");
-+ fprintf(stderr," The moffset flag (for example '--moffset 8600000,40000000') specifies a global offset to subtract to X and Y \n");
- fprintf(stderr," to be used when computing the Morton 2D code. Values must be unscaled \n\n");
-
- fprintf(stderr," The check flag (for example '--check 0.01,0.01') checks suitability to compute Morton 2D codes \n");
-@@ -211,7 +211,7 @@ void usage()
- fprintf(stderr," The intended use of this tool is by using the --stdout flag and a pipe to avoid storing intermediate files. Example: \n");
- fprintf(stderr," las2pg 1.2-with-color.laz --parse xyzRGBi --stdout | psql -c \"copy flat from stdin with binary\" \n");
- fprintf(stderr," This obviously require a table called flat to be created in a PostgreSQL DB beforehand. The table must have \n");
-- fprintf(stderr," the columns in the same order as specified by the --parse option, and the column types must be the ones speficied above. Example: \n");
-+ fprintf(stderr," the columns in the same order as specified by the --parse option, and the column types must be the ones specified above. Example: \n");
- fprintf(stderr," psql -c \"create table flat (x double precision, y double precision, z double precision, r integer, g integer, b integer, i integer)\" \n\n");
- }
-
-@@ -417,7 +417,7 @@ int main(int argc, char *argv[])
- num_entries = strlen(parse_string);
-
- if (use_stdout == TRUE && file_name_out){
-- LASError_Print("If an ouput file is specified, --stdout must not be used!");
-+ LASError_Print("If an output file is specified, --stdout must not be used!");
- exit(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