[postgis] 05/08: Update patches for new upstream release.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository postgis.

commit d87141f1e511d83c6fcb5a6f8c933d0b4ed093d5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Mar 21 12:19:44 2015 +0100

    Update patches for new upstream release.
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  2 +-
 .../patches/strip-invalid-whitespace-in-pom.patch  |  4 +-
 debian/patches/use-debian-maven                    | 43 +++++++++++-----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c143d89..fa01659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ postgis (2.1.6+dfsg-1~exp1) UNRELEASED; urgency=medium
   * New upstream release.
   * Skip tests on mipsel too, due to persistent buildd issues.
   * Use uscan repacking to exclude CITE tests from upstream source.
+  * Update patches for new upstream release.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 21 Mar 2015 02:10:45 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index eab69f8..bdeee6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,6 @@ honor-build-flags
 fix-manpage
 de-translation
 add-lm-for-liblwgeom.patch
-correct-java-version.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
index c837dd8..5573af3 100644
--- a/debian/patches/strip-invalid-whitespace-in-pom.patch
+++ b/debian/patches/strip-invalid-whitespace-in-pom.patch
@@ -3,8 +3,8 @@ Description: Strip invalid whitespace causing mh_cleanpom to fail with:
  Message: only whitespace content allowed before start tag and not \ufffd
 Author: Bas Couwenberg <sebastic at xs4all.nl>
 
---- a/java/jdbc/pom.xml
-+++ b/java/jdbc/pom.xml
+--- 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"
diff --git a/debian/patches/use-debian-maven b/debian/patches/use-debian-maven
index 986074c..3f32df5 100644
--- a/debian/patches/use-debian-maven
+++ b/debian/patches/use-debian-maven
@@ -19,8 +19,8 @@ Last-Update: 2013-05-21
       <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
-+++ b/java/jdbc/pom.xml
+--- a/java/jdbc/pom.xml.in
++++ b/java/jdbc/pom.xml.in
 @@ -3,12 +3,6 @@
  
      <modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,12 @@ Last-Update: 2013-05-21
 -
      <groupId>org.postgis</groupId>
      <artifactId>postgis-jdbc</artifactId>
-     <version>2.1.4dev</version>
-@@ -96,23 +90,27 @@
-         </resources>
+     <version>%VERSION%</version>
+@@ -97,22 +91,26 @@
  
          <plugins>
--	    <plugin>
-+            <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
+ 	    <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
 -                <artifactId>maven-source-plugin</artifactId>
 -                <version>2.2.1</version>
 -                <executions>
@@ -51,21 +49,22 @@ Last-Update: 2013-05-21
 -                        </goals>
 -                    </execution>
 -                </executions>
-+                <artifactId>maven-clean-plugin</artifactId>
++	        <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>
++	        <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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git