Import Debian changes 0.7.1-10

elki (0.7.1-10) unstable; urgency=low

  * Allow building with Java 11 again (Closes: #912217)
    Which is possible now that Apache Commons Lang3 was fixed.
  * Simplify lintian overrides
  * Add keywords to menu entry
  * Removed vcs entries from control, because these weren't package VCS
  * Update standards to 4.2.1 (no changes)

8 files changed, 20 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index c4154cec..0e9b1632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+elki (0.7.1-10) unstable; urgency=low
+
+  * Allow building with Java 11 again (Closes: #912217)
+    Which is possible now that Apache Commons Lang3 was fixed.
+  * Simplify lintian overrides
+  * Add keywords to menu entry
+  * Removed vcs entries from control, because these weren't package VCS
+  * Update standards to 4.2.1 (no changes)
+
+ -- Erich Schubert <erich@debian.org>  Thu, 01 Nov 2018 11:41:04 +0100
+
 elki (0.7.1-9) unstable; urgency=low
 
   * Try making the build reproducible by enforcing a sort order in
diff --git a/debian/control b/debian/control
index 31ade4cb..c9a767d6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: elki
 Section: science
 Priority: optional
 Maintainer: Erich Schubert <erich@debian.org>
-Build-Depends: debhelper (>= 9), openjdk-8-jdk, maven-debian-helper (>= 1.5),
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.5),
  maven (>= 3),
  libbatik-java (>= 1.10),
  libxmlgraphics-commons-java (>= 2.2),
@@ -17,14 +17,12 @@ Build-Depends: debhelper (>= 9), openjdk-8-jdk, maven-debian-helper (>= 1.5),
  libsurefire-java,
  junit4,
  default-jdk-doc
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Homepage: https://elki-project.github.io/
-Vcs-Git: https://github.com/elki-project/elki.git
-Vcs-browser: https://github.com/elki-project/elki
 
 Package: elki
 Architecture: all
-Depends: default-jre (>= 2:1.8) | java8-runtime, ${misc:Depends}, ${maven:Depends}, libbatik-java, libsvm3-java
+Depends: default-jre (>= 2:1.8), ${misc:Depends}, ${maven:Depends}, libbatik-java, libsvm3-java
 Suggests: elki-dev, libfop-java, ${maven:OptionalDepends}
 Description: Data mining algorithm development framework
  ELKI: "Environment for Developing KDD-Applications Supported by
@@ -45,7 +43,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}
+Depends: elki, default-jdk (>= 2:1.8), ${misc:Depends}, ${maven:Depends}
 Suggests: default-jdk-doc, ${maven:OptionalDepends}
 Description: Data mining algorithm development framework - development files
  ELKI: "Environment for Developing KDD-Applications Supported by
diff --git a/debian/elki-dev.lintian-overrides b/debian/elki-dev.lintian-overrides
index a6aa9f70..22bd5706 100644
--- a/debian/elki-dev.lintian-overrides
+++ b/debian/elki-dev.lintian-overrides
@@ -1,8 +1,2 @@
 elki-dev: codeless-jar usr/share/elki/elki-*-sources.jar
-elki-dev: codeless-jar usr/share/elki/elki-batik-visualization-*-sources.jar
-elki-dev: codeless-jar usr/share/elki/elki-libsvm-*-sources.jar
-elki-dev: codeless-jar usr/share/elki/elki-tutorial-*-sources.jar
 elki-dev: codeless-jar usr/share/elki/elki-*-javadoc.jar
-elki-dev: codeless-jar usr/share/elki/elki-batik-visualization-*-javadoc.jar
-elki-dev: codeless-jar usr/share/elki/elki-libsvm-*-javadoc.jar
-elki-dev: codeless-jar usr/share/elki/elki-tutorial-*-javadoc.jar
diff --git a/debian/extra/elki b/debian/extra/elki
index 447d3769..e335cdc8 100644
--- a/debian/extra/elki
+++ b/debian/extra/elki
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-find_java_runtime openjdk8 oracle8 java8 openjdk7 oracle7 java7
+find_java_runtime java8
 
 find_jars elki /usr/share/elki/addons/*.jar libsvm3 batik-all
 
diff --git a/debian/extra/elki-cli b/debian/extra/elki-cli
index 43f9d6f0..efaa2fd3 100644
--- a/debian/extra/elki-cli
+++ b/debian/extra/elki-cli
@@ -1,7 +1,7 @@
 #!/bin/sh
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-find_java_runtime openjdk8 oracle8 java8 openjdk7 oracle7 java7
+find_java_runtime java8
 
 find_jars elki /usr/share/elki/addons/*.jar libsvm3 batik-all
 
diff --git a/debian/extra/elki.desktop b/debian/extra/elki.desktop
index ae19861b..5d0003c8 100644
--- a/debian/extra/elki.desktop
+++ b/debian/extra/elki.desktop
@@ -4,6 +4,7 @@ Type=Application
 Categories=Development;Education;GTK;Science;ArtificialIntelligence;ComputerScience;DataVisualization
 Name=ELKI
 Comment=Data mining algorithm development framework
+Keywords=Clustering;Cluster;Outlier;Anomaly;Analysis
 TryExec=elki
 Exec=elki
 Icon=elki-icon
diff --git a/debian/patches/batik-performance.patch b/debian/patches/batik-performance.patch
index 6a329bab..1bf661d3 100644
--- a/debian/patches/batik-performance.patch
+++ b/debian/patches/batik-performance.patch
@@ -2,7 +2,7 @@ commit e02ba7683a45ffd3eb210d0d31a81c40f254e877
 Author: Erich Schubert <schubert@informatik.uni-heidelberg.de>
 Date:   Wed Mar 29 15:26:04 2017 +0200
 
-    Improve Batik performance by avoding `<symbol>` and `<use>`.
+    Improve Batik performance by avoiding `<symbol>` and `<use>`.
     
     Batik will materialize the copies otherwise and add too many listeners.
     So it is substantially faster to not use `<use>`
diff --git a/debian/rules b/debian/rules
index 96329ad4..e002c2fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export JAVA_HOME=$(shell . /usr/share/java-wrappers/java-wrappers.sh; find_java_runtime openjdk8; echo $$JAVA_HOME )
+export JAVA_HOME=$(shell . /usr/share/java-wrappers/java-wrappers.sh; find_java_runtime java8; echo $$JAVA_HOME )
 # Debian local maven repository
 REPO=/usr/share/maven-repo
 # Ensure we use Maven 3