This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch master
in repository postgis.
commit 89459f75c2d63eb5a8622431211f70224dde137b
Author: Markus Wanner <mar...@bluegap.ch>
Date: Mon Mar 31 09:26:03 2014 +0200
Drop joinsel-issue2543, it got applied upstream as well. Tag fix-armel
with the upstream issue number.
---
debian/changelog | 6 ++++--
debian/patches/fix-armel | 2 ++
debian/patches/joinsel-issue2543 | 23 -----------------------
debian/patches/series | 1 -
4 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 83449f0..e908456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ postgis (2.1.2-1) UNRELEASED; urgency=medium
* Add a suggestion for postgis-doc. Closes: #737497.
* Refresh patches debian-versions, honor-build-flags, and
java-version-fix.
- * Drop patches fix-kfreebsd, fix-big-endian, and doc-resources - these
- got applied upstream.
+ * Drop patches fix-kfreebsd, fix-big-endian, joinsel-issue2543, and
+ doc-resources - these got applied upstream.
+ * Add upstream issue number to patch fix-armel - that one hasn't been
+ applied upstream, yet.
-- Markus Wanner <mar...@bluegap.ch> Sun, 30 Mar 2014 15:32:25 +0200
diff --git a/debian/patches/fix-armel b/debian/patches/fix-armel
index db47b40..0f71a37 100644
--- a/debian/patches/fix-armel
+++ b/debian/patches/fix-armel
@@ -3,6 +3,8 @@ Description: Fix FTBSF os armel, at least
functions return an int ranging from -1 to +1. This patch properly
preserves that type and prevents the bogus conversion to bool. Thus
correcting the return value and fixing multiple tests on armel.
+Forwarded: yes
+Bug-Upstream: http://trac.osgeo.org/postgis/ticket/2605
Author: Markus Wanner <mar...@bluegap.ch>
Last-Update: 2014-01-09
diff --git a/debian/patches/joinsel-issue2543 b/debian/patches/joinsel-issue2543
deleted file mode 100644
index 3210c0a..0000000
--- a/debian/patches/joinsel-issue2543
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Apply proposed patch from upstream bug #2543
- Not quite how important upstream issue #2543 is in the wild, but the
- proposed fix seems save in any case. On MIPS, I occasionally see very
- high selectivity values, with indicates a bug. For now, let's just
- cap the selectivity at 1.0.
-Author: Paul Ramsey <pram...@cleverelephant.ca>
-Bug: http://trac.osgeo.org/postgis/ticket/2543
-Origin: upstream,
http://trac.osgeo.org/postgis/attachment/ticket/2543/joinsel.patch
-Last-Update: 2013-11-13
-
---- a/postgis/gserialized_estimate.c
-+++ b/postgis/gserialized_estimate.c
-@@ -1081,6 +1081,10 @@
- if ( selectivity > 1.0 )
- selectivity = 1.0;
-
-+ /* Guard against over-estimates :) */
-+ if ( selectivity > 1.0 )
-+ selectivity = 1.0;
-+
- return selectivity;
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 96533db..75bba13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ use-debian-maven
honor-build-flags
fix-armel
fix-manpage
-joinsel-issue2543
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/postgis.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
