[pgrouting] 06/07: Drop vrp_basic-include-math.patch, applied upstream.
Bas Couwenberg
sebastic at debian.org
Tue Aug 9 23:13:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pgrouting.
commit 15d6c14c56f2e448128750ba9e39f908228e66d1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Aug 10 00:36:45 2016 +0200
Drop vrp_basic-include-math.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/vrp_basic-include-math.patch | 20 --------------------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5eae4a2..1dccd12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pgrouting (2.2.4-1) UNRELEASED; urgency=medium
- Change Source URL to GitHub
- Fix Upstream-Name capitalization
* Drop override for debian-watch-may-check-gpg-signature.
+ * Drop vrp_basic-include-math.patch, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Wed, 10 Aug 2016 00:26:21 +0200
diff --git a/debian/patches/series b/debian/patches/series
index f944646..1a4adf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
privacy-breach-uses-embedded-file.patch
-vrp_basic-include-math.patch
diff --git a/debian/patches/vrp_basic-include-math.patch b/debian/patches/vrp_basic-include-math.patch
deleted file mode 100644
index 033fcbf..0000000
--- a/debian/patches/vrp_basic-include-math.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Include math.h for ceil() to fix FTBFS.
- Build failed with:
- src/vrp_basic/src/VRP_Solver.cpp: In member function 'bool CVRPSolver::updateTourCosts(CTourInfo&)':
- src/vrp_basic/src/VRP_Solver.cpp:760:59: error: 'ceil' was not declared in this scope
- vecStartTimes.push_back(static_cast<int>(ceil(dTravelTime)));
- ^
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/pgRouting/pgrouting/pull/573
-Applied-Upstream: https://github.com/pgRouting/pgrouting/commit/de9843ed5b041dd0d44dcb5d28b05bc011a463cd
-
---- a/src/vrp_basic/src/VRP_Solver.h
-+++ b/src/vrp_basic/src/VRP_Solver.h
-@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include <map>
- #include <utility>
- #include <string>
-+#include <math.h>
-
- #define MAXIMUM_TRY 15
- #define TOTAL_NUMBER_OF_SEARCH 15
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git
More information about the Pkg-grass-devel
mailing list