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 7c9c453d9d02290be96975ab0e4df2c4bdbaa5cd
Author: Markus Wanner <mar...@bluegap.ch>
Date: Thu Sep 25 16:02:57 2014 +0200
Add strip-invalid-whitespace-in-pom.patch by Bas Couwenberg.
Revert urgency back to medium.
---
debian/changelog | 3 ++-
debian/patches/series | 1 +
debian/patches/strip-invalid-whitespace-in-pom.patch | 13 +++++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f6fffe7..c425d29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-postgis (2.1.4+dfsg-1) UNRELEASED; urgency=low
+postgis (2.1.4+dfsg-1) UNRELEASED; urgency=medium
[ Paulo Flabiano Smorigo ]
* add -lm for liblwgeom to avoid linkage problem.
@@ -7,6 +7,7 @@ postgis (2.1.4+dfsg-1) UNRELEASED; urgency=low
[ Bas Couwenberg ]
* Add Swedish translation by Martin Bagge. Closes: #761975.
+ * Add strip-invalid-whitespace-in-pom.patch to fix mh_cleanpom failure.
[ Markus Wanner ]
* New upstream release, 2.1.4. Adapt packaging to the new version.
diff --git a/debian/patches/series b/debian/patches/series
index c03cc70..c8613f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ de-translation
add-lm-for-liblwgeom.patch
enable-ppc64el.patch
correct-java-version.patch
+strip-invalid-whitespace-in-pom.patch
diff --git a/debian/patches/strip-invalid-whitespace-in-pom.patch
b/debian/patches/strip-invalid-whitespace-in-pom.patch
new file mode 100644
index 0000000..3658703
--- /dev/null
+++ b/debian/patches/strip-invalid-whitespace-in-pom.patch
@@ -0,0 +1,13 @@
+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 <sebas...@xs4all.nl>
+
+--- a/java/jdbc/pom.xml
++++ b/java/jdbc/pom.xml
+@@ -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>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/postgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
