Import Debian changes 0.7.0-4

elki (0.7.0-4) unstable; urgency=low

  * Always prefer OpenJDK-7 for reproducible builds.
  * Avoid UTF-8 problems with JavaDoc failing reproducible build
    (caused by pom.xml rewriting via maven-debian-helper)

5 files changed, 41 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index d12c6e42..b9334d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+elki (0.7.0-4) unstable; urgency=low
+
+  * Always prefer OpenJDK-7 for reproducible builds.
+  * Avoid UTF-8 problems with JavaDoc failing reproducible build
+    (caused by pom.xml rewriting via maven-debian-helper)
+
+ -- Erich Schubert <erich@debian.org>  Wed, 06 Jan 2016 14:16:52 +0100
+
 elki (0.7.0-3) unstable; urgency=low
 
   * Fix exclusion of time-oriented test (unfortunately CPU dependent).
diff --git a/debian/control b/debian/control
index 8e2a007e..617a131a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: elki
 Section: science
 Priority: extra
 Maintainer: Erich Schubert <erich@debian.org>
-Build-Depends: debhelper (>= 9), default-jdk (>= 1.7) | java7-sdk, maven-debian-helper (>= 1.5),
+Build-Depends: debhelper (>= 9), openjdk-7-jdk | java7-sdk, maven-debian-helper (>= 1.5),
  libbatik-java, libsvm3-java, libtrove3-java, libxmlgraphics-commons-java, maven (>= 3),
  libmaven-antrun-plugin-java (>= 1.7), libmaven-antrun-plugin-java (<< 1.8),
  libmaven-compiler-plugin-java (>= 3.2), libmaven-compiler-plugin-java (<< 3.3),
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9), default-jdk (>= 1.7) | java7-sdk, maven-debian-
  libmaven-resources-plugin-java (>= 2.6), libmaven-resources-plugin-java (<< 2.7),
  libmaven-source-plugin-java (>= 2.4), libmaven-source-plugin-java (<< 2.5),
  libsurefire-java (>= 2.17), libsurefire-java (<< 2.18), junit4,
- default-jdk-doc
+ openjdk-7-doc | default-jdk-doc
 Standards-Version: 3.9.6
 Homepage: http://elki.dbs.ifi.lmu.de/
 
@@ -39,7 +39,7 @@ Description: Data mining algorithm development framework
 Package: elki-dev
 Architecture: all
 Depends: elki, default-jdk (>= 2:1.7) | java7-sdk, ${misc:Depends}, ${maven:Depends}
-Suggests: ${maven:OptionalDepends}
+Suggests: default-jdk-doc, ${maven:OptionalDepends}
 Description: Data mining algorithm development framework - development files
  ELKI: "Environment for Developing KDD-Applications Supported by
  Index-Structures" is a development framework for data mining algorithms
diff --git a/debian/patches/javadoc-encoding.patch b/debian/patches/javadoc-encoding.patch
new file mode 100644
index 00000000..f91dbcde
--- /dev/null
+++ b/debian/patches/javadoc-encoding.patch
@@ -0,0 +1,27 @@
+Index: elki-0.7.0/pom.xml
+===================================================================
+--- elki-0.7.0.orig/pom.xml
++++ elki-0.7.0/pom.xml
+@@ -1,3 +1,4 @@
++<?xml version='1.0' encoding='UTF-8'?>
+ <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/xsd/maven-4.0.0.xsd">
+ 	<modelVersion>4.0.0</modelVersion>
+@@ -208,13 +209,16 @@
+ 					</groups>
+ 					<header><![CDATA[<img src="{@docRoot}/figures/elki-logo-200.png" width="200">]]></header>
+ 					<footer><![CDATA[ELKI Version ${project.version}]]></footer>
+-					<bottom><![CDATA[Copyright © ${year} <a href="http://elki.dbs.ifi.lmu.de/">ELKI Development Team</a>, <a href="http://www.dbs.ifi.lmu.de/">Lehr- und Forschungseinheit für Datenbanksysteme</a>, <a href="http://www.lmu.de/">Ludwig-Maximilians-Universität München</a>. <a href="http://elki.dbs.ifi.lmu.de/wiki/License">License information.</a>]]></bottom>
++					<bottom><![CDATA[Copyright &copy; ${year} <a href="http://elki.dbs.ifi.lmu.de/">ELKI Development Team</a>, <a href="http://www.dbs.ifi.lmu.de/">Lehr- und Forschungseinheit f&uuml;r Datenbanksysteme</a>, <a href="http://www.lmu.de/">Ludwig-Maximilians-Universit&auml;t M&uuml;nchen</a>. <a href="http://elki.dbs.ifi.lmu.de/wiki/License">License information.</a>]]></bottom>
+ 					<links>
+ 						<!-- To link to related (external) JavaDoc -->
+ 						<link>http://trove4j.sourceforge.net/javadocs/</link>
+ 						<link>http://www.w3.org/2003/01/dom2-javadoc/</link>
+ 						<link>https://xmlgraphics.apache.org/batik/javadoc/</link>
+ 					</links>
++					<charset>UTF-8</charset>
++					<encoding>UTF-8</encoding>
++					<docencoding>UTF-8</docencoding>
+ 				</configuration>
+ 			</plugin>
+ 		</plugins>
diff --git a/debian/patches/series b/debian/patches/series
index cab1512c..c7858d52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ build.patch
 enable-profiles-hack.patch
 better-classpath.patch
 skip-cpu-dependent-test.patch
+javadoc-encoding.patch
diff --git a/debian/rules b/debian/rules
index d74fd9a5..0c0692c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
+# Prefer OpenJDK7 for reproducibility:
+export JAVA_HOME=$(shell . /usr/share/java-wrappers/java-wrappers.sh; find_java_runtime openjdk7 java7 java8; echo $$JAVA_HOME )
 # Debian local maven repository
 REPO=/usr/share/maven-repo
 # Ensure we use Maven 3