[postgis] 04/10: Drop patches for java bindings, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Sep 25 21:31:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository postgis.
commit 0b1617f7dd81151b3fa449055fb1d04cdc262e96
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 25 15:47:08 2015 +0200
Drop patches for java bindings, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/correct-java-version.patch | 26 --------------------------
debian/patches/honor-build-flags | 6 +++---
debian/patches/link-liblwgeom | 6 +++---
debian/patches/series | 1 -
5 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cffe223..10376d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ postgis (2.2.0~rc1+dfsg-1) UNRELEASED; urgency=medium
- Add license & copyright for address_standardizer extension
- Add license & copyright for bytebuffer files
- Drop license & copyright for java/* (separate project now)
+ * Drop patches for java bindings, refresh remaining patches.
-- Markus Wanner <markus at bluegap.ch> Fri, 25 Sep 2015 19:19:19 +0200
diff --git a/debian/patches/correct-java-version.patch b/debian/patches/correct-java-version.patch
deleted file mode 100644
index b8c843a..0000000
--- a/debian/patches/correct-java-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Strip 'dev' version suffix for java jdbc release build.
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2014-09-27
-
---- a/java/jdbc/pom.xml
-+++ b/java/jdbc/pom.xml
-@@ -5,7 +5,7 @@
-
- <groupId>org.postgis</groupId>
- <artifactId>postgis-jdbc</artifactId>
-- <version>2.1.4dev</version>
-+ <version>2.1.5</version>
- <packaging>jar</packaging>
- <name>Postgis JDBC Driver</name>
- <url>http://postgis.net</url>
---- a/java/jdbc_jtsparser/pom.xml
-+++ b/java/jdbc_jtsparser/pom.xml
-@@ -12,7 +12,7 @@
-
- <groupId>org.postgis</groupId>
- <artifactId>postgis-jdbc-jtsparser</artifactId>
-- <version>2.1.4dev</version>
-+ <version>2.1.5</version>
- <packaging>jar</packaging>
- <name>Postgis JDBC Driver JTS Parser</name>
- <url>http://postgis.net</url>
diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags
index 78f3fa0..e384290 100644
--- a/debian/patches/honor-build-flags
+++ b/debian/patches/honor-build-flags
@@ -8,7 +8,7 @@ Last-Update: 2013-04-23
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
-@@ -97,11 +97,11 @@
+@@ -97,11 +97,11 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2s
$(PGSQL2SHP-CLI): $(SHPLIB_OBJS) pgsql2shp-core.o pgsql2shp-cli.o $(LIBLWGEOM)
$(LIBTOOL) --mode=link \
@@ -22,7 +22,7 @@ Last-Update: 2013-04-23
shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgsql-core.h shpcommon.h
$(CC) $(CFLAGS) $(GTK_CFLAGS) $(PGSQL_FE_CPPFLAGS) -o $@ -c shp2pgsql-gui.c
-@@ -109,7 +109,7 @@
+@@ -109,7 +109,7 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgs
$(SHP2PGSQL-GUI): $(SHPLIB_OBJS) shp2pgsql-core.o shp2pgsql-gui.o pgsql2shp-core.o $(LIBLWGEOM) $(GTK_WIN32_RES)
$(LIBTOOL) --mode=link \
$(CC) $(CFLAGS) $(GTK_WIN32_FLAGS) $^ -o $@ \
@@ -41,7 +41,7 @@ Last-Update: 2013-04-23
CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @GEOS_LDFLAGS@ -lgeos_c @PROJ_LDFLAGS@ -lproj @JSON_LDFLAGS@
NUMERICFLAGS = @NUMERICFLAGS@
-@@ -184,10 +185,10 @@
+@@ -184,10 +185,10 @@ check: liblwgeom.la
# Command to build each of the .lo files
$(LT_SA_OBJS): %.lo: %.c
diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom
index b08d589..1ebbf7e 100644
--- a/debian/patches/link-liblwgeom
+++ b/debian/patches/link-liblwgeom
@@ -6,7 +6,7 @@ Last-Update: 2015-09-25
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
-@@ -84,14 +84,8 @@
+@@ -84,14 +84,8 @@ PG_OBJS= \
OBJS=$(PG_OBJS)
# Libraries to link into the module (proj, geos)
@@ -24,7 +24,7 @@ Last-Update: 2015-09-25
ifeq (@SFCGAL@,sfcgal)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
-@@ -50,14 +50,7 @@
+@@ -50,14 +50,7 @@ OBJS = \
rtpg_statistics.o
# Libraries to link into the module (proj, geos)
@@ -42,7 +42,7 @@ Last-Update: 2015-09-25
LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
RT_CORE=../rt_core
diff --git a/debian/patches/series b/debian/patches/series
index 25e3efb..73cf8cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@ honor-build-flags
fix-manpage
de-translation
add-lm-for-liblwgeom.patch
-#correct-java-version.patch
fix-hurd-i386-ftbfs.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git
More information about the Pkg-grass-devel
mailing list