This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pprepair.
commit d3b5ec2aaab7187adaf63e8edb7cdd7412d37df0 Author: Bas Couwenberg <[email protected]> Date: Wed Mar 2 20:50:51 2016 +0100 Drop gdal-2.0.patch, applied upstream. --- debian/changelog | 1 + debian/patches/gdal-2.0.patch | 169 ------------------------------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 170 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3227953..b5b3c92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pprepair (0.0~20151110-28dca91-1) UNRELEASED; urgency=medium * New upstream git snapshot. + * Drop gdal-2.0.patch, applied upstream. * Update Vcs-Git URL to use HTTPS. * Bump Standards-Version to 3.9.7, no changes. diff --git a/debian/patches/gdal-2.0.patch b/debian/patches/gdal-2.0.patch deleted file mode 100644 index afc5974..0000000 --- a/debian/patches/gdal-2.0.patch +++ /dev/null @@ -1,169 +0,0 @@ -Description: Add support for GDAL 2.0. -Author: Bas Couwenberg <[email protected]> -Bug: https://github.com/tudelft3d/pprepair/issues/29 -Bug-Debian: https://bugs.debian.org/802495 -Forwarded: https://github.com/tudelft3d/pprepair/pull/30 -Applied-Upstream: https://github.com/tudelft3d/pprepair/commit/28dca9198dfd06d70474bc61cc1f5da9d6eb8191 - ---- a/IOWorker.cpp -+++ b/IOWorker.cpp -@@ -27,17 +27,25 @@ IOWorker::IOWorker() { - - bool IOWorker::addToTriangulation(Triangulation &triangulation, TaggingVector &edgesToTag, const char *file, unsigned int schemaIndex) { - // Open file -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource *dataSource = OGRSFDriverRegistrar::Open(file, false); -+#else -+ GDALDataset *dataSource = (GDALDataset*) GDALOpenEx(file, GDAL_OF_READONLY, NULL, NULL, NULL); -+#endif - if (dataSource == NULL) { - std::cerr << "Error: Could not open file." << std::endl; - return false; - } - -- char *name = new char[strlen(dataSource->GetName())+1]; -- strcpy(name, dataSource->GetName()); -+ char *name = new char[strlen(file)+1]; -+ strcpy(name, file); - fileNames.push_back(name); - std::cout << "\tPath: " << name << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - std::cout << "\tType: " << dataSource->GetDriver()->GetName() << std::endl; -+#else -+ std::cout << "\tType: " << dataSource->GetDriverName() << std::endl; -+#endif - int numberOfLayers = dataSource->GetLayerCount(); - std::cout << "\tLayers: " << numberOfLayers << std::endl; - -@@ -316,7 +324,11 @@ bool IOWorker::addToTriangulation(Triang - } - - // Free OGR data source -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource(dataSource); -+#else -+ GDALClose(dataSource); -+#endif - - return true; - } -@@ -1248,23 +1260,43 @@ bool IOWorker::exportPolygons(std::vecto - - // Prepare file - const char *driverName = "ESRI Shapefile"; -+#if GDAL_VERSION_MAJOR < 2 - OGRSFDriver *driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driverName); -+#else -+ 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(file, false); -+#else -+ GDALDataset *dataSource = (GDALDataset*) GDALOpenEx(file, 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(file)!= 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 << "\tWriting file... " << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - dataSource = driver->CreateDataSource(file, NULL); -+#else -+ dataSource = driver->Create(file,0,0,0,GDT_Unknown,NULL); -+#endif - if (dataSource == NULL) { - std::cout << "\tError: Could not create file." << std::endl; - return false; -@@ -1356,7 +1388,11 @@ bool IOWorker::exportPolygons(std::vecto - } - - // Free OGR data source -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource(dataSource); -+#else -+ GDALClose(dataSource); -+#endif - - return true; - } -@@ -1365,23 +1401,43 @@ bool IOWorker::exportTriangulation(Trian - - // Prepare file - const char *driverName = "ESRI Shapefile"; -+#if GDAL_VERSION_MAJOR < 2 - OGRSFDriver *driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driverName); -+#else -+ GDALDriver *driver = GetGDALDriverManager()->GetDriverByName(driverName); -+#endif - if (driver == NULL) { - std::cout << "Driver not found." << std::endl; - return false; - } -- -+ -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource *dataSource = driver->Open(file, false); -+#else -+ GDALDataset *dataSource = (GDALDataset*) GDALOpenEx(file, GDAL_OF_READONLY, NULL, NULL, NULL); -+#endif - if (dataSource != NULL) { - std::cout << "Erasing current file..." << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - if (driver->DeleteDataSource(dataSource->GetName())!= OGRERR_NONE) { -+#else -+ if (driver->Delete(file)!= CE_None) { -+#endif - std::cout << "Couldn't erase current file." << std::endl; - return false; -+#if GDAL_VERSION_MAJOR < 2 - } OGRDataSource::DestroyDataSource(dataSource); -+#else -+ } GDALClose(dataSource); -+#endif - } - - std::cout << "Writing file... " << std::endl; -+#if GDAL_VERSION_MAJOR < 2 - dataSource = driver->CreateDataSource(file, NULL); -+#else -+ dataSource = driver->Create(file,0,0,0,GDT_Unknown,NULL); -+#endif - if (dataSource == NULL) { - std::cout << "Could not create file." << std::endl; - return false; -@@ -1496,7 +1552,11 @@ bool IOWorker::exportTriangulation(Trian - } - - // Free OGR data source -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource(dataSource); -+#else -+ GDALClose(dataSource); -+#endif - - return true; - } -@@ -2073,4 +2133,4 @@ void IOWorker::insertTriangulationInfo(s - "\tOverlaps: " << multipletags << " triangles (" << 100.0*multipletags/total << " %)" << std::endl; - - // Other info? --} -\ No newline at end of file -+} diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 261dade..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -gdal-2.0.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pprepair.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
