This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository prepair.
commit c8d02cd5bda900278c8f9c489f183cba85aa7089 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Jul 1 17:47:37 2017 +0200 Drop patches applied upstream. --- debian/changelog | 1 + ...he-shpOut-option-in-the-usage-information.patch | 17 ----- debian/patches/gdal-2.0.patch | 82 ---------------------- debian/patches/hardening.patch | 25 ------- debian/patches/readme-example-paths.patch | 11 +-- debian/patches/series | 3 - 6 files changed, 8 insertions(+), 131 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57f2a1a..d89c07e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ prepair (0.7+20160519-417f1bc-1) UNRELEASED; urgency=medium * Bump Standards-Version to 4.0.0, no changes. * Add autopkgtest to test installability. * Use pkg-info.mk variables instead of dpkg-parsechangelog output. + * Drop patches applied upstream. -- Bas Couwenberg <sebas...@debian.org> Sat, 01 Jul 2017 17:43:52 +0200 diff --git a/debian/patches/0001-Also-list-the-shpOut-option-in-the-usage-information.patch b/debian/patches/0001-Also-list-the-shpOut-option-in-the-usage-information.patch deleted file mode 100644 index 839ec09..0000000 --- a/debian/patches/0001-Also-list-the-shpOut-option-in-the-usage-information.patch +++ /dev/null @@ -1,17 +0,0 @@ -From 3eca44b8e7cf4e9e654053835f44dc2b96e0461d Mon Sep 17 00:00:00 2001 -From: Bas Couwenberg <sebas...@xs4all.nl> -Date: Fri, 28 Nov 2014 02:45:44 +0100 -Subject: Also list the --shpOut option in the usage information. -Origin: https://github.com/tudelft3d/prepair/commit/031c45738ac7e946b6a5923d67cc298378adf580 - - ---- a/prepair.cpp -+++ b/prepair.cpp -@@ -208,6 +208,7 @@ void usage() { - std::cout << "--minarea AREA Only output polygons larger than AREA" << std::endl; - std::cout << "--isr GRIDSIZE Snap round the input before repairing" << std::endl; - std::cout << "--time Benchmark the different stages of the process" << std::endl; -+ std::cout << "--shpOut Output a shapefile (out.shp) instead of a WKT" << std::endl; - - } - diff --git a/debian/patches/gdal-2.0.patch b/debian/patches/gdal-2.0.patch deleted file mode 100644 index 72b9fef..0000000 --- a/debian/patches/gdal-2.0.patch +++ /dev/null @@ -1,82 +0,0 @@ -Description: Add support for GDAL 2.0. -Author: Bas Couwenberg <sebas...@debian.org> -Bug: https://github.com/tudelft3d/prepair/issues/22 -Bug-Debian: https://bugs.debian.org/802497 -Forwarded: https://github.com/tudelft3d/prepair/pull/23 -Applied-Upstream: https://github.com/tudelft3d/prepair/commit/0f11b66a02e9c35e9a7cde6131c2f4796f5864fc - ---- a/PolygonRepair.cpp -+++ b/PolygonRepair.cpp -@@ -305,22 +305,44 @@ double PolygonRepair::computeRobustness( - - bool PolygonRepair::saveToShp(OGRGeometry* geometry, const char *fileName) { - const char *driverName = "ESRI Shapefile"; -+#if GDAL_VERSION_MAJOR < 2 - OGRRegisterAll(); - OGRSFDriver *driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driverName); -+#else -+ GDALAllRegister(); -+ GDALDriver *driver = GetGDALDriverManager()->GetDriverByName(driverName); -+#endif - if (driver == NULL) { - std::cout << "\tError: OGR Shapefile driver not found." << std::endl; - return false; - } -+ -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource *dataSource = driver->Open(fileName, false); -+#else -+ GDALDataset *dataSource = (GDALDataset*) GDALOpenEx(fileName, GDAL_OF_READONLY, NULL, NULL, NULL); -+#endif - if (dataSource != NULL) { - std::cout << "\tOverwriting file..." << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - if (driver->DeleteDataSource(dataSource->GetName())!= OGRERR_NONE) { -+#else -+ if (driver->Delete(fileName)!= CE_None) { -+#endif - std::cout << "\tError: Couldn't erase file with same name." << std::endl; - return false; -+#if GDAL_VERSION_MAJOR < 2 - } OGRDataSource::DestroyDataSource(dataSource); -+#else -+ } GDALClose(dataSource); -+#endif - } - std::cout << "\tCreating " << fileName << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - dataSource = driver->CreateDataSource(fileName, NULL); -+#else -+ dataSource = driver->Create(fileName,0,0,0,GDT_Unknown,NULL); -+#endif - if (dataSource == NULL) { - std::cout << "\tError: Could not create file." << std::endl; - return false; -@@ -337,7 +359,11 @@ bool PolygonRepair::saveToShp(OGRGeometr - std::cout << "\tError: Could not create feature." << std::endl; - } - OGRFeature::DestroyFeature(feature); -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource(dataSource); -+#else -+ GDALClose(dataSource); -+#endif - return true; - } - ---- a/prepair.cpp -+++ b/prepair.cpp -@@ -112,8 +112,13 @@ int main (int argc, const char * argv[]) - - //-- reading from a ogr dataset (most supported: shp, geojson, gml, etc) - else if (strcmp(argv[argNum], "--ogr") == 0) { -+#if GDAL_VERSION_MAJOR < 2 - OGRRegisterAll(); - OGRDataSource *dataSource = OGRSFDriverRegistrar::Open(argv[argNum+1], false); -+#else -+ GDALAllRegister(); -+ GDALDataset *dataSource = (GDALDataset*) GDALOpenEx(argv[argNum+1], GDAL_OF_READONLY, NULL, NULL, NULL); -+#endif - ++argNum; - if (dataSource == NULL) { - std::cerr << "Error: Could not open file." << std::endl; diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch deleted file mode 100644 index 01c9029..0000000 --- a/debian/patches/hardening.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Use hardening buildflags set in the environment. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/tudelft3d/prepair/pull/27 -Applied-Upstream: https://github.com/tudelft3d/prepair/commit/417f1bc9c4375bfe293e4c096cadc9911feb6266 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,6 +63,10 @@ endif() - - include_directories( ${GDAL_INCLUDE_DIR} ) - -+# Hardening buildflags -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{CXXFLAGS}") -+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} $ENV{LDFLAGS}") -+ - # Creating entries for target: prepair - # ############################ - -@@ -75,4 +79,4 @@ endif() - add_to_cached_list( CGAL_EXECUTABLE_TARGETS prepair ) - - # Link to CGAL and third-party libraries --target_link_libraries(prepair ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${GDAL_LIBRARY}) -\ No newline at end of file -+target_link_libraries(prepair ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${GDAL_LIBRARY}) diff --git a/debian/patches/readme-example-paths.patch b/debian/patches/readme-example-paths.patch index 2b11e73..41b8dcd 100644 --- a/debian/patches/readme-example-paths.patch +++ b/debian/patches/readme-example-paths.patch @@ -1,9 +1,10 @@ Description: Change the paths to work the files as installed by the package. Author: Bas Couwenberg <sebas...@debian.org> +Forwarded: not-needed --- a/README.md +++ b/README.md -@@ -39,26 +39,26 @@ Afterwards run: +@@ -53,28 +53,28 @@ You can run prepair from the command-lin A [WKT](http://en.wikipedia.org/wiki/Well-known_text) or an OGR dataset (shapefile, geojson or GML for instance) is read as input, and a WKT or a shapefile (a MultiPolygon) is given as output: @@ -19,13 +20,15 @@ Author: Bas Couwenberg <sebas...@debian.org> + $ prepair --shpOut --ogr /usr/share/doc/prepair-data/examples/data/CLC2006_180927.geojson Creating out.shp - [Snap rounding](http://www.cgal.org/Manual/latest/doc_html/cgal_manual/Snap_rounding_2/Chapter_main.html) of the input segments can be performed: -- $ /prepair --isr 2 --wkt "POLYGON((0 0, 10 0, 15 5, 10 0, 10 10, 0 10, 0 0))" + [Snap rounding](http://www.cgal.org/Manual/latest/doc_html/cgal_manual/Snap_rounding_2/Chapter_main.html) of the input segments can be performed with the --isr option: + +- $ ./prepair --isr 2 --wkt "POLYGON((0 0, 10 0, 15 5, 10 0, 10 10, 0 10, 0 0))" + $ prepair --isr 2 --wkt "POLYGON((0 0, 10 0, 15 5, 10 0, 10 10, 0 10, 0 0))" MULTIPOLYGON (((11 1,11 11,1 11,1 1,11 1))) - It's possible to remove small (sliver) polygons in the output by giving the smallest area allowed: + + It's also possible to remove small (sliver) polygons in the output by giving the smallest area allowed with the --minarea option: - $ ./prepair --wkt 'POLYGON((0 0, 10 0, 10 11, 11 10, 0 10))' + $ prepair --wkt 'POLYGON((0 0, 10 0, 10 11, 11 10, 0 10))' diff --git a/debian/patches/series b/debian/patches/series index 04bf519..a149f95 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ readme-example-paths.patch -0001-Also-list-the-shpOut-option-in-the-usage-information.patch -gdal-2.0.patch -hardening.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/prepair.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel