[postgis] 02/03: Refresh patches to apply, again. Drop all java related stuff.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Fri Sep 25 18:17:25 UTC 2015
This is an automated email from the git hooks/post-receive script.
markus_wanner-guest pushed a commit to branch experimental
in repository postgis.
commit fcb6b9ba61657b8704e06788d2d1c785d1966471
Author: Markus Wanner <markus at bluegap.ch>
Date: Fri Sep 25 20:15:16 2015 +0200
Refresh patches to apply, again. Drop all java related stuff.
---
debian/README.Debian | 4 +-
debian/changelog | 3 +
debian/control | 42 +---------
debian/control.in | 42 +---------
debian/copyright | 11 ---
debian/libpostgis-java-doc.install | 4 -
debian/libpostgis-java.install | 1 -
debian/libpostgis-java.poms | 2 -
debian/patches/add-lm-for-liblwgeom.patch | 2 +-
debian/patches/fix-hurd-i386-ftbfs.patch | 6 +-
debian/patches/honor-build-flags | 23 ++----
debian/patches/link-liblwgeom | 12 +--
debian/patches/series | 2 -
.../patches/strip-invalid-whitespace-in-pom.patch | 13 ---
debian/patches/use-debian-maven | 95 ----------------------
debian/rules | 37 ---------
16 files changed, 23 insertions(+), 276 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 59f7100..1e23f91 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -47,8 +47,8 @@ postgis
libpostgis-java
- This package contains the Java library for using JDBC with a PostGIS-
- enabled PostgreSQL database.
+ This package used to be built from the 'postgis' source, but is no
+ longer shipped with it (since postgis-2.2.0~rc1)
Upgrading existing spatial databases
diff --git a/debian/changelog b/debian/changelog
index 0310f6f..293f93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ postgis (2.2.0~rc1+dfsg-1) UNRELEASED; urgency=medium
* New upstream version
* Update package names, control, and rules for the new version 2.2.
+ * Refresh patches to apply, again.
* Drop old deprecation warnings for 2.0 and the transitional
package postgresql-9.4-postgis-2.1-scripts.
+ * Drop all Java related things, including the patches use-debian-maven
+ and strip-invalid-whitespace-in-pom.patch.
* Update copyright information.
-- Markus Wanner <markus at bluegap.ch> Fri, 25 Sep 2015 19:19:19 +0200
diff --git a/debian/control b/debian/control
index 60f3f80..0a702c8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,15 +12,7 @@ Build-Depends: debhelper (>= 9), po-debconf,
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
- postgresql-server-dev-all, postgresql-common (>= 148~), postgresql,
- maven-repo-helper
-Build-Depends-Indep: default-jdk, openjdk-7-jdk | java7-sdk,
- libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
- libmaven-clean-plugin-java, libmaven-jar-plugin-java,
- libsurefire-java,
- libmaven-compiler-plugin-2.5-java | libmaven-compiler-plugin-java,
- libmaven-resources-plugin-java,
- libmaven-javadoc-plugin-java
+ postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
Standards-Version: 3.9.6
Homepage: http://postgis.net/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/postgis.git
@@ -55,38 +47,6 @@ Description: Geographic objects support for PostgreSQL -- documentation
.
This package contains the PostGIS documentation.
-Package: libpostgis-java
-Architecture: all
-Section: java
-Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-9.4-postgis-2.2
-Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
-Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
-Description: Geographic objects support for PostgreSQL -- JDBC support
- PostGIS adds support for geographic objects to the PostgreSQL
- object-relational database. In effect, PostGIS "spatially enables"
- the PostgreSQL server, allowing it to be used as a backend spatial
- database for geographic information systems (GIS), much like ESRI's
- SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
- "Simple Features Specification for SQL".
- .
- This package contains JDBC support for PostGIS.
-
-Package: libpostgis-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libpostgis-java
-Description: Geographic objects support for PostgreSQL -- JDBC documentation
- PostGIS adds support for geographic objects to the PostgreSQL
- object-relational database. In effect, PostGIS "spatially enables"
- the PostgreSQL server, allowing it to be used as a backend spatial
- database for geographic information systems (GIS), much like ESRI's
- SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
- "Simple Features Specification for SQL".
- .
- This package contains the documentation for the JDBC support for PostGIS.
-
Package: liblwgeom-2.2
Architecture: any
Section: libs
diff --git a/debian/control.in b/debian/control.in
index 03fa0eb..9599b7a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,15 +12,7 @@ Build-Depends: debhelper (>= 9), po-debconf,
libproj-dev (>= 4.6.0), libssl-dev, xsltproc, docbook, docbook-xsl,
imagemagick, libcunit1-dev, dblatex, libxml2-dev (>= 2.5.0~),
libgtk2.0-dev, libgdal-dev (>= 1.11.2+dfsg-3~) | libgdal1-dev (>= 1.9.0~),
- postgresql-server-dev-all, postgresql-common (>= 148~), postgresql,
- maven-repo-helper
-Build-Depends-Indep: default-jdk, openjdk-7-jdk | java7-sdk,
- libpostgresql-jdbc-java, fastjar, libjts-java (>= 1.7), maven2,
- libmaven-clean-plugin-java, libmaven-jar-plugin-java,
- libsurefire-java,
- libmaven-compiler-plugin-2.5-java | libmaven-compiler-plugin-java,
- libmaven-resources-plugin-java,
- libmaven-javadoc-plugin-java
+ postgresql-server-dev-all, postgresql-common (>= 148~), postgresql
Standards-Version: 3.9.6
Homepage: http://postgis.net/
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/postgis.git
@@ -55,38 +47,6 @@ Description: Geographic objects support for PostgreSQL -- documentation
.
This package contains the PostGIS documentation.
-Package: libpostgis-java
-Architecture: all
-Section: java
-Depends: libpostgresql-jdbc-java, ${misc:Depends}
-Suggests: postgresql-NEWEST_PGVERSION-postgis-2.2
-Breaks: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
-Replaces: libpostgis-jdbc, libpostgisjava, postgresql-postgis-java
-Description: Geographic objects support for PostgreSQL -- JDBC support
- PostGIS adds support for geographic objects to the PostgreSQL
- object-relational database. In effect, PostGIS "spatially enables"
- the PostgreSQL server, allowing it to be used as a backend spatial
- database for geographic information systems (GIS), much like ESRI's
- SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
- "Simple Features Specification for SQL".
- .
- This package contains JDBC support for PostGIS.
-
-Package: libpostgis-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libpostgis-java
-Description: Geographic objects support for PostgreSQL -- JDBC documentation
- PostGIS adds support for geographic objects to the PostgreSQL
- object-relational database. In effect, PostGIS "spatially enables"
- the PostgreSQL server, allowing it to be used as a backend spatial
- database for geographic information systems (GIS), much like ESRI's
- SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
- "Simple Features Specification for SQL".
- .
- This package contains the documentation for the JDBC support for PostGIS.
-
Package: liblwgeom-2.2
Architecture: any
Section: libs
diff --git a/debian/copyright b/debian/copyright
index 05947b0..c3cde7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -166,17 +166,6 @@ Files: macros/intltool.m4
Copyright: 2001, Eazel, Inc.
License: GPL-2+ with Autoconf exception
-Files: java/ejb3/*
-Copyright: 2006, Norman Barker <norman.barker at gmail.com>
-License: LGPL-2.1+
-
-Files: java/jdbc/*
-Copyright: 2004, Paul Ramsey, pramsey at refractions.net
- 2005, Markus Schaber <markus.schaber at logix-tt.com>
- 2007, Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
- 2012, Maria Arias de Reyna <delawen at gmail.com>
-License: LGPL-2.1+
-
Files: liblwgeom/stringbuffer.*
liblwgeom/bytebuffer.*
Copyright: 2002, Thamer Alharbash
diff --git a/debian/libpostgis-java-doc.install b/debian/libpostgis-java-doc.install
deleted file mode 100644
index e704a44..0000000
--- a/debian/libpostgis-java-doc.install
+++ /dev/null
@@ -1,4 +0,0 @@
-java/jdbc/target/apidocs/*.html /usr/share/java/
-java/jdbc/target/apidocs/examples /usr/share/java/
-java/jdbc/target/apidocs/resources /usr/share/java/
-java/jdbc/target/apidocs/org /usr/share/java/
\ No newline at end of file
diff --git a/debian/libpostgis-java.install b/debian/libpostgis-java.install
deleted file mode 100644
index d5f6b5e..0000000
--- a/debian/libpostgis-java.install
+++ /dev/null
@@ -1 +0,0 @@
-java/jdbc/target/postgis-jdbc-2.1.?.jar /usr/share/java/
diff --git a/debian/libpostgis-java.poms b/debian/libpostgis-java.poms
deleted file mode 100644
index 28b8cd4..0000000
--- a/debian/libpostgis-java.poms
+++ /dev/null
@@ -1,2 +0,0 @@
-java/jdbc/pom.xml
-java/jdbc_jtsparser/pom.xml
diff --git a/debian/patches/add-lm-for-liblwgeom.patch b/debian/patches/add-lm-for-liblwgeom.patch
index 85adf9e..0acfba1 100644
--- a/debian/patches/add-lm-for-liblwgeom.patch
+++ b/debian/patches/add-lm-for-liblwgeom.patch
@@ -3,7 +3,7 @@ Author: Paulo Flabiano Smorigo <pfsmorigo at linux.vnet.ibm.com>
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
CC = @CC@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ @JSON_CPPFLAGS@
diff --git a/debian/patches/fix-hurd-i386-ftbfs.patch b/debian/patches/fix-hurd-i386-ftbfs.patch
index 02b095d..02a7ad9 100644
--- a/debian/patches/fix-hurd-i386-ftbfs.patch
+++ b/debian/patches/fix-hurd-i386-ftbfs.patch
@@ -1,9 +1,9 @@
Description: Detect GNU/Hurd and treat it like Linux just as BSD.
Author: Bas Couwenberg <sebastic at xs4all.nl>
---- a/raster/rt_core/rt_api.h
-+++ b/raster/rt_core/rt_api.h
-@@ -51,6 +51,15 @@
+--- a/raster/rt_core/librtcore.h
++++ b/raster/rt_core/librtcore.h
+@@ -79,6 +79,15 @@
#endif
#endif
diff --git a/debian/patches/honor-build-flags b/debian/patches/honor-build-flags
index 66455c0..78f3fa0 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 @@ pgsql2shp-cli.o: pgsql2shp-cli.c pgsql2s
+@@ -97,11 +97,11 @@
$(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 @@ shp2pgsql-gui.o: shp2pgsql-gui.c shp2pgs
+@@ -109,7 +109,7 @@
$(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 $@ \
@@ -33,7 +33,7 @@ Last-Update: 2013-04-23
@mkdir -p $(DESTDIR)$(bindir)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
-@@ -11,6 +11,7 @@
+@@ -10,6 +10,7 @@
# **********************************************************************
CC = @CC@
@@ -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@
-@@ -153,10 +154,10 @@ check: liblwgeom.la
+@@ -184,10 +185,10 @@
# Command to build each of the .lo files
$(LT_SA_OBJS): %.lo: %.c
@@ -52,16 +52,5 @@ Last-Update: 2013-04-23
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $<
+ $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(NUMERICFLAGS) -c -o $@ $<
- # Manually generate WKT parser from Flex/Bison inputs
- # Bison 2.5, Flex 2.5.35
---- a/configure
-+++ b/configure
-@@ -20397,7 +20397,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
-
-
--CPPFLAGS="$PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $PGSQL_CPPFLAGS $GEOS_CPPFLAGS $PROJ_CPPFLAGS $XML2_CPPFLAGS $SFCGAL_CPPFLAGS $CPPFLAGS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: CPPFLAGS: $CPPFLAGS" >&5
- $as_echo "CPPFLAGS: $CPPFLAGS" >&6; }
-
+ lwin_wkt_parse.c lwin_wkt_parse.h: lwin_wkt_parse.y
+ $(YACC) -o'lwin_wkt_parse.c' -d lwin_wkt_parse.y
diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom
index 0ecc7bc..b08d589 100644
--- a/debian/patches/link-liblwgeom
+++ b/debian/patches/link-liblwgeom
@@ -2,11 +2,11 @@ Description: Dynamically link to liblwgeom
Instead of statically pulling liblwgeom into the postgis.so, dynamically
link to it.
Author: Stephen Frost <sfrost at snowman.net>, Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-04-23
+Last-Update: 2015-09-25
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
-@@ -83,14 +83,8 @@ PG_OBJS= \
+@@ -84,14 +84,8 @@
OBJS=$(PG_OBJS)
# Libraries to link into the module (proj, geos)
@@ -14,7 +14,7 @@ Last-Update: 2013-04-23
-# Note: we specify liblwgeom.a directly in SHLIB_LINK rather than using
-# -L... -l options to prevent issues with some platforms trying to link
-# to an existing liblwgeom.so in the PostgreSQL $libdir supplied by an
--# older version of PostGIS, rather than with the static liblwgeom.a
+-# older version of PostGIS, rather than with the static liblwgeom.a
-# supplied with newer versions of PostGIS
PG_CPPFLAGS += -I../liblwgeom -I../libpgcommon @CPPFLAGS@ -fPIC
-SHLIB_LINK_F = ../libpgcommon/libpgcommon.a ../liblwgeom/.libs/liblwgeom.a @SHLIB_LINK@
@@ -24,8 +24,8 @@ Last-Update: 2013-04-23
ifeq (@SFCGAL@,sfcgal)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
-@@ -38,14 +38,7 @@ SQL_OBJS=rtpostgis.sql rtpostgis_drop.sq
- OBJS=rt_pg.o
+@@ -50,14 +50,7 @@
+ rtpg_statistics.o
# Libraries to link into the module (proj, geos)
-#
@@ -42,7 +42,7 @@ Last-Update: 2013-04-23
LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
-@@ -37,7 +37,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
+@@ -36,7 +36,7 @@
RT_CORE=../rt_core
diff --git a/debian/patches/series b/debian/patches/series
index bdeee6e..25e3efb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,8 @@
fix-spelling
link-liblwgeom
-use-debian-maven
honor-build-flags
fix-manpage
de-translation
add-lm-for-liblwgeom.patch
#correct-java-version.patch
-strip-invalid-whitespace-in-pom.patch
fix-hurd-i386-ftbfs.patch
diff --git a/debian/patches/strip-invalid-whitespace-in-pom.patch b/debian/patches/strip-invalid-whitespace-in-pom.patch
deleted file mode 100644
index 5573af3..0000000
--- a/debian/patches/strip-invalid-whitespace-in-pom.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Strip invalid whitespace causing mh_cleanpom to fail with:
- javax.xml.stream.XMLStreamException: ParseError at [row,col]:[1,1]
- Message: only whitespace content allowed before start tag and not \ufffd
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-
---- a/java/jdbc/pom.xml.in
-+++ b/java/jdbc/pom.xml.in
-@@ -1,4 +1,4 @@
--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
diff --git a/debian/patches/use-debian-maven b/debian/patches/use-debian-maven
deleted file mode 100644
index 3f32df5..0000000
--- a/debian/patches/use-debian-maven
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Adjust maven pom file to integrate with Debian
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-05-21
-
---- a/java/jdbc/build.xml
-+++ b/java/jdbc/build.xml
-@@ -53,13 +53,8 @@
- <pathelement location="postgis_${postgis_version}.jar"/>
- </path>
-
--
- <!-- Loading Maven dependencies -->
-- <mkdir dir="lib"/>
-- <get src="http://www.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar"
-- dest="lib/maven-ant-tasks-2.1.3.jar"/>
--
-- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
-+ <path id="maven-ant-tasks.classpath" path="/usr/share/java/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath" />
---- a/java/jdbc/pom.xml.in
-+++ b/java/jdbc/pom.xml.in
-@@ -3,12 +3,6 @@
-
- <modelVersion>4.0.0</modelVersion>
-
-- <parent>
-- <groupId>org.sonatype.oss</groupId>
-- <artifactId>oss-parent</artifactId>
-- <version>7</version>
-- </parent>
--
- <groupId>org.postgis</groupId>
- <artifactId>postgis-jdbc</artifactId>
- <version>%VERSION%</version>
-@@ -97,22 +91,26 @@
-
- <plugins>
- <plugin>
-- <groupId>org.apache.maven.plugins</groupId>
-- <artifactId>maven-source-plugin</artifactId>
-- <version>2.2.1</version>
-- <executions>
-- <execution>
-- <id>attach-sources</id>
-- <goals>
-- <goal>jar</goal>
-- </goals>
-- </execution>
-- </executions>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-clean-plugin</artifactId>
-+ </plugin>
-+ <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
-+ <artifactId>maven-jar-plugin</artifactId>
-+ <configuration>
-+ <archive>
-+ <manifest>
-+ <addClasspath>true</addClasspath>
-+ </manifest>
-+ <manifestEntries>
-+ <Class-Path>/usr/share/java/postgresql-jdbc3.jar</Class-Path>
-+ </manifestEntries>
-+ </archive>
-+ </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
-- <version>2.9.1</version>
- <configuration>
- <overview>${basedir}/src/java/org/postgis/overview.html</overview>
- </configuration>
-@@ -132,16 +130,10 @@
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
-- <version>9.1-901.jdbc4</version>
-+ <version>9.1-901.jdbc3</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/postgresql-jdbc3.jar</systemPath>
- </dependency>
- </dependencies>
-
-- <distributionManagement>
-- <repository>
-- <id>sonatype-postgis-releases</id>
-- <name>Sonatype Postgis Releases Repo</name>
-- <url>http://oss.sonatype.org/content/repositories/postgis-releases</url>
-- </repository>
-- </distributionManagement>
--
- </project>
diff --git a/debian/rules b/debian/rules
index 797bebb..79c7947 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,22 +66,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-# Determine JAVA_HOME to use. Depends on which Build-Depends-Indep
-# variant has been used.
-JAVA_HOME = /usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
-ifeq ("$(wildcard $(JAVA_HOME))","")
- JAVA_HOME = /usr/lib/jvm/java-7-openjdk-$(DEB_BUILD_ARCH)
- ifeq ("$(wildcard $(JAVA_HOME))","")
- JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH)
- ifeq ("$(wildcard $(JAVA_HOME))","")
- JAVA_HOME =
- endif
- endif
-endif
-
-# Use maven in offline mode and with the local Debian repo
-MVN = JAVA_HOME=$(JAVA_HOME) mvn --offline -Dmaven.repo.local=/usr/share/maven-repo
-
MAJOR_VERSION = $(shell grep POSTGIS_MAJOR_VERSION Version.config|cut -d= -f2)
MINOR_VERSION = $(shell grep POSTGIS_MINOR_VERSION Version.config|cut -d= -f2)
MICRO_VERSION = $(shell grep POSTGIS_MICRO_VERSION Version.config|cut -d= -f2)
@@ -128,13 +112,6 @@ build-arch-stamp: configuration-stamp
build-indep: build-indep-stamp
build-indep-stamp: configuration-stamp
-# Re-check JAVA_HOME
- @[ -n "$(JAVA_HOME)" ] || (echo "ERROR: didn't find a Java JDK"; exit 2)
- @[ -x "$(JAVA_HOME)/bin/javac" ] || (echo "ERROR: no javac in JAVA_HOME=$(JAVA_HOME)"; exit 2)
-
-# PostGIS JDBC (with debug support)
- cd $(CURDIR)/java/jdbc && make pom.xml && $(MVN) package
-
# Let PostGIS create a perl script from postgis_restore.pl.in
$(MAKE) -C utils
@@ -199,11 +176,6 @@ clean: debian/control
[ ! -f GNUmakefile ] || $(MAKE) distclean || true
[ ! -f GNUmakefile ] || $(MAKE) -C doc images-clean || true
-# We used to invoke 'mvn clean', but plain 'rm' is a lot quicker and
-# simpler, as it doesn't require all of the Java stuff in B-D, but
-# having it in Build-Depneds-Indep is enough.
- rm -rf $(CURDIR)/java/jdbc/target
-
# Cleanup after the Makefile
rm -f postgis/postgis_upgrade_20_minor.sql.in \
raster/rt_pg/rtpostgis_drop.sql \
@@ -220,7 +192,6 @@ clean: debian/control
dh_autotools-dev_restoreconfig
dh_autoreconf_clean
- -mh_clean
dh_clean
install: install-indep install-arch
@@ -250,11 +221,6 @@ install-indep: build-indep
dh_install -i
-# Link the resulting JAR file, so it's available via it's old
-# name. (Even if postgis-jdbc.jar might be more appropriate.)
- ln -sf postgis-jdbc-$(POSTGIS_VERSION).jar \
- $(CURDIR)/debian/libpostgis-java/usr/share/java/postgis.jar
-
# De-duplicate upgrade scripts - using hard-links for exactly one
# directory (so we don't generate cross-directory hard ones).
(set -e; \
@@ -274,9 +240,6 @@ install-indep: build-indep
> $(CURDIR)/debian/postgresql-$$PGVER-postgis-2.0-scripts/DEBIAN/templates; \
done)
- mh_installjar -v -plibpostgis-java -l java/jdbc/pom.xml java/jdbc/target/postgis-jdbc-$(POSTGIS_VERSION).jar
- mh_installpoms -v -plibpostgis-java
-
install-arch: build-arch
dh_testdir
dh_testroot
--
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