[spatial4j-0.4] 01/02: Imported Debian patch 0.3-1.1

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch spatial-0.3
in repository spatial4j-0.4.

commit df5cde237818d56caaf24ca57b2f244a188130c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 19 13:19:03 2016 +0100

    Imported Debian patch 0.3-1.1
---
 debian/changelog   | 8 ++++++++
 debian/control     | 2 +-
 debian/maven.rules | 2 +-
 debian/rules       | 4 ----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e64019..baa3b44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+spatial4j (0.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fixed the build failure with maven-debian-helper >= 2.0
+    (Closes: #806430, #807609)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 19 Jan 2016 13:19:03 +0100
+
 spatial4j (0.3-1) unstable; urgency=low
 
   * Initial release (Closes: #736653)
diff --git a/debian/control b/debian/control
index a8ab5a4..f85fb23 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Hilko Bengen <bengen at debian.org>
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.6.5),
  libmaven-install-plugin-java,
- libjts-java,
+ libjts-java (>= 1.13),
 Standards-Version: 3.9.5
 
 Package: libspatial4j-java
diff --git a/debian/maven.rules b/debian/maven.rules
index ef5f754..1c89b1f 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,2 @@
 
-com.vividsolutions jts * s/.*/fake/ * *
+com.vividsolutions jts * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index d7ecab2..3a4dd8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,3 @@ JAVA_HOME := /usr/lib/jvm/default-java
 
 %:
 	dh $@ --buildsystem=maven
-
-override_dh_auto_configure:
-	dh_auto_configure
-	mvn install:install-file -s/etc/maven2/settings-debian.xml -Dmaven.repo.local=`pwd`/debian/maven-repo -Dfile=/usr/share/java/jts.jar -DgroupId=com.vividsolutions -DartifactId=jts -Dversion=fake -Dpackaging=jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/spatial4j-0.4.git