[postgis] 01/01: Add libpostgis-java-doc package.
Markus Wanner
markus_wanner-guest at moszumanska.debian.org
Wed May 21 13:11:18 UTC 2014
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 3410da95d41ae4f7761a840c049bbe958e427431
Author: Markus Wanner <markus at bluegap.ch>
Date: Wed May 21 15:10:57 2014 +0200
Add libpostgis-java-doc package.
* Revert parts of the patch use-debian-maven to actually build the
javadocs. Add a libpostgis-java-doc package carrying the docs.
---
debian/changelog | 2 ++
debian/control | 15 +++++++++++++++
debian/control.in | 15 +++++++++++++++
debian/libpostgis-java-doc.install | 4 ++++
debian/libpostgis-java.install | 2 +-
debian/patches/use-debian-maven | 31 +++++++++----------------------
6 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf432f6..b1b9937 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ postgis (2.1.3+dfsg-2) unstable; urgency=high
* Add NEWS.Debian to warn about a possibly breaking change.
* Correct patch use-json-c. Drop explicit dependencies, but rely on
shlibs:Depends, instead. Closes: #748332.
+ * Revert parts of the patch use-debian-maven to actually build the
+ javadocs. Add a libpostgis-java-doc package carrying the docs.
-- Markus Wanner <markus at bluegap.ch> Wed, 21 May 2014 10:15:57 +0200
diff --git a/debian/control b/debian/control
index ed4f318..4e8ae08 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,21 @@ Description: Geographic objects support for PostgreSQL -- JDBC support
.
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.1.3
Architecture: any
Section: libs
diff --git a/debian/control.in b/debian/control.in
index bb755af..2486b80 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -71,6 +71,21 @@ Description: Geographic objects support for PostgreSQL -- JDBC support
.
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.1.3
Architecture: any
Section: libs
diff --git a/debian/libpostgis-java-doc.install b/debian/libpostgis-java-doc.install
new file mode 100644
index 0000000..e704a44
--- /dev/null
+++ b/debian/libpostgis-java-doc.install
@@ -0,0 +1,4 @@
+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
index 1d6fb19..15521ba 100644
--- a/debian/libpostgis-java.install
+++ b/debian/libpostgis-java.install
@@ -1 +1 @@
-java/jdbc/target/postgis-jdbc-*.jar /usr/share/java/
+java/jdbc/target/postgis-jdbc-2.1.3.jar /usr/share/java/
diff --git a/debian/patches/use-debian-maven b/debian/patches/use-debian-maven
index fd59357..169d042 100644
--- a/debian/patches/use-debian-maven
+++ b/debian/patches/use-debian-maven
@@ -1,6 +1,6 @@
Description: Adjust maven pom file to integrate with Debian
Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-04-14
+Last-Update: 2013-05-21
--- a/java/jdbc/build.xml
+++ b/java/jdbc/build.xml
@@ -34,7 +34,7 @@ Last-Update: 2013-04-14
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.1.3</version>
-@@ -96,21 +90,27 @@
+@@ -96,18 +90,23 @@
</resources>
<plugins>
@@ -52,9 +52,9 @@ Last-Update: 2013-04-14
- </execution>
- </executions>
+ <artifactId>maven-clean-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
++ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
@@ -66,23 +66,10 @@ Last-Update: 2013-04-14
+ </manifestEntries>
+ </archive>
+ </configuration>
-+ </plugin>
-+
-+ <!-- <plugin>
-+ <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
-@@ -124,7 +124,7 @@
- </goals>
- </execution>
- </executions>
-- </plugin>
-+ </plugin> -->
- </plugins>
- </build>
-
-@@ -132,16 +132,10 @@
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+@@ -132,16 +131,10 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
--
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