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 faf65ca527c7e584ebf82f86e0170353e9d37567
Author: Markus Wanner <markus at bluegap.ch>
Date: Thu May 22 17:59:35 2014 +0200
* In patch use-debian-maven: Also drop the version requirement for the
maven-javadoc-plugin.
---
debian/changelog | 7 +++++++
debian/patches/use-debian-maven | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1b9937..2ee718f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (2.1.3+dfsg-3) UNRELEASED; urgency=low
+
+ * In patch use-debian-maven: Also drop the version requirement for the
+ maven-javadoc-plugin.
+
+ -- Markus Wanner <markus at bluegap.ch> Thu, 22 May 2014 17:59:05 +0200
+
postgis (2.1.3+dfsg-2) unstable; urgency=high
[ Bas Couwenberg ]
diff --git a/debian/patches/use-debian-maven b/debian/patches/use-debian-maven
index 169d042..13c2e0a 100644
--- a/debian/patches/use-debian-maven
+++ b/debian/patches/use-debian-maven
@@ -34,7 +34,7 @@ Last-Update: 2013-05-21
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>2.1.3</version>
-@@ -96,18 +90,23 @@
+@@ -96,23 +90,27 @@
</resources>
<plugins>
@@ -69,7 +69,12 @@ Last-Update: 2013-05-21
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-@@ -132,16 +131,10 @@
+ <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>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git