This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository postgis.
commit b8bad3ecef5bcc0554c57f743a57f0c42685b66a Author: Jérémy Lal <kapo...@melix.org> Date: Mon Aug 11 14:19:38 2014 +0200 Add postgres-9.4-fixes.patch --- debian/changelog | 1 + debian/patches/postgres-9.4-fixes.patch | 24 ++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) diff --git a/debian/changelog b/debian/changelog index cd6179e..d22f096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ postgis (2.1.3+dfsg-4) UNRELEASED; urgency=medium [ Jérémy Lal ] * Switch Build-Deps back to default-jdk instead of openjdk 7 | 8, as gcj-jdk does work now. + * Backport upstream commits fixing test results with PostgreSQL 9.4. -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 08 Aug 2014 21:32:50 +0200 diff --git a/debian/patches/postgres-9.4-fixes.patch b/debian/patches/postgres-9.4-fixes.patch new file mode 100644 index 0000000..d8a1782 --- /dev/null +++ b/debian/patches/postgres-9.4-fixes.patch @@ -0,0 +1,24 @@ +Description: backports of upstream 2.2 commits for pg 9.4 compatibility +Last-Update: 2014-08-11 +Forwarded: not-needed +Origin: upstream, http://trac.osgeo.org/postgis/ticket/2685 +--- a/regress/run_test.pl ++++ b/regress/run_test.pl +@@ -572,7 +572,7 @@ + + # Strip the lines we don't care about + @lines = grep(!/^\$/, @lines); +- @lines = grep(!/^(INSERT|DELETE|UPDATE|SELECT)/, @lines); ++ @lines = grep(!/^(INSERT|DELETE|UPDATE|SELECT|COPY)/, @lines); + @lines = grep(!/^(CONTEXT|RESET|ANALYZE)/, @lines); + @lines = grep(!/^(DROP|CREATE|VACUUM)/, @lines); + @lines = grep(!/^(LOG|SET|TRUNCATE)/, @lines); +--- a/regress/binary_expected ++++ b/regress/binary_expected +@@ -1,6 +1,2 @@ +-COPY 114 +-COPY 114 + geometry|106 +-COPY 56 +-COPY 56 + geometry|48 diff --git a/debian/patches/series b/debian/patches/series index fd8f9f6..45fbfab 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ fix-armel fix-manpage de-translation use-json-c +postgres-9.4-fixes.patch -- 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