Import Debian changes 0.7.0-2

elki (0.7.0-2) unstable; urgency=low

  * Use maven-debian-helper for Maven 3 to manage Maven dependencies,
    which is now available in testing, too.
    (Closes: #808856 - FTBFS because of changed Maven module versions)
  * Tighten down build-dependencies on Maven plugins (unfortunately, this
    appears to be necessary, even with maven-debian-helper)
  * Drop incorrect VCS links
  * Improve dependency information in jars
  * Improve dependencies on JRE/JDKs (Closes: #809778)

20 files changed, 304 insertions, 342 deletions

diff --git a/debian/changelog b/debian/changelog
index 43263e3d..6228b37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+elki (0.7.0-2) unstable; urgency=low
+
+  * Use maven-debian-helper for Maven 3 to manage Maven dependencies,
+    which is now available in testing, too.
+    (Closes: #808856 - FTBFS because of changed Maven module versions)
+  * Tighten down build-dependencies on Maven plugins (unfortunately, this
+    appears to be necessary, even with maven-debian-helper)
+  * Drop incorrect VCS links
+  * Improve dependency information in jars
+  * Improve dependencies on JRE/JDKs (Closes: #809778)
+
+ -- Erich Schubert <erich@debian.org>  Mon, 04 Jan 2016 01:11:11 +0100
+
 elki (0.7.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 18f3d7f6..8e2a007e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,23 @@ Source: elki
 Section: science
 Priority: extra
 Maintainer: Erich Schubert <erich@debian.org>
-Build-Depends: default-jdk (>= 1.7) | openjdk-7-jdk, libbatik-java, libsvm3-java, libtrove3-java, debhelper (>= 8.0.0), maven-repo-helper, libmaven-source-plugin-java (>= 2.2.1), libmaven-resources-plugin-java (>= 2.3), libmaven-javadoc-plugin-java (>= 2.10.3), libmaven-compiler-plugin-java (>= 3.2), libsurefire-java (>= 2.17), libmaven-jar-plugin-java (>=2.4), libmaven-clean-plugin-java, maven (>= 3)
+Build-Depends: debhelper (>= 9), default-jdk (>= 1.7) | 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),
+ libmaven-exec-plugin-java (>= 1.1.1), libmaven-exec-plugin-java (<< 1.2),
+ libmaven-javadoc-plugin-java (>= 2.10.3), libmaven-javadoc-plugin-java (<< 2.11),
+ 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
 Standards-Version: 3.9.6
 Homepage: http://elki.dbs.ifi.lmu.de/
-Vcs-Browser: http://elki.dbs.ifi.lmu.de/browser/elki
-Vcs-Git: https://github.com/elki-project/elki.git
 
 Package: elki
 Architecture: all
-Depends: default-jre (>= 1.7) | openjdk-7-jre, fop | libbatik-java, libsvm3-java, libtrove3-java, java-wrappers, ${misc:Depends}
+Depends: default-jre (>= 2:1.7) | java7-runtime, ${misc:Depends}, ${maven:Depends}, fop | libbatik-java
+Suggests: elki-dev, ${maven:OptionalDepends}
 Description: Data mining algorithm development framework
  ELKI: "Environment for Developing KDD-Applications Supported by
  Index-Structures" is a development framework for data mining algorithms
@@ -30,9 +38,9 @@ Description: Data mining algorithm development framework
 
 Package: elki-dev
 Architecture: all
-Depends: elki, ${misc:Depends}
-Suggests: default-jdk (>= 1.7) | openjdk-7-jdk
-Description: Data mining algorithm development framework - Development Files
+Depends: elki, default-jdk (>= 2:1.7) | java7-sdk, ${misc:Depends}, ${maven:Depends}
+Suggests: ${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
  written in Java.  It includes a large variety of popular data mining
diff --git a/debian/copyright b/debian/copyright
index 2f54576f..643a0f43 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ELKI: Environment for Developing KDD-Applications Supported by Index-Structures
 Source: http://elki.dbs.ifi.lmu.de/
 
 Files: *
-Copyright: 2011 Lehr- und Forschungseinheit für Datenbanksysteme, Ludwig-Maximilians-Universität München
+Copyright: 2005-2015, ELKI Development Team, Lehr- und Forschungseinheit für Datenbanksysteme, Ludwig-Maximilians-Universität München
 License: AGPL-3+
 
 Files: debian/*
-Copyright: 2011 Erich Schubert <erich@debian.org>
+Copyright: 2016, Erich Schubert <erich@debian.org>
 License: AGPL-3+
 
 License: AGPL-3+
diff --git a/debian/elki.poms b/debian/elki.poms
index 7c9fd77f..bc58059c 100644
--- a/debian/elki.poms
+++ b/debian/elki.poms
@@ -25,12 +25,12 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --ignore
-elki/pom.xml --has-package-version --no-parent --java-lib --package=elki --artifact=elki/target/elki-0.7.0.jar
+pom.xml --ignore-pom
+elki/pom.xml --has-package-version --artifact=elki/target/elki-0.7.0.jar --java-lib
 addons/3dpc/pom.xml --ignore
-addons/batikvis/pom.xml --has-package-version --no-parent --java-lib --package=elki --artifact=addons/batikvis/target/elki-batik-visualization-0.7.0.jar
+addons/batikvis/pom.xml --has-package-version --artifact=addons/batikvis/target/elki-batik-visualization-0.7.0.jar --java-lib
 addons/bundle/pom.xml --ignore
 addons/joglvis/pom.xml --ignore
-addons/libsvm/pom.xml --has-package-version --no-parent --java-lib --artifact=addons/libsvm/target/elki-libsvm-0.7.0.jar
+addons/libsvm/pom.xml --has-package-version --artifact=addons/libsvm/target/elki-libsvm-0.7.0.jar --java-lib
 addons/lucene/pom.xml --ignore
-addons/tutorial/pom.xml --has-package-version --no-parent --java-lib --artifact=addons/tutorial/target/elki-tutorial-0.7.0.jar --package=elki-dev
+addons/tutorial/pom.xml --has-package-version --package=elki-dev --artifact=addons/tutorial/target/elki-tutorial-0.7.0.jar --java-lib
diff --git a/debian/extra/elki b/debian/extra/elki
index e43ec3a4..c0319c9d 100644
--- a/debian/extra/elki
+++ b/debian/extra/elki
@@ -3,6 +3,6 @@
 
 find_java_runtime openjdk8 oracle8 java8 openjdk7 oracle7 java7
 
-find_jars elki fop /usr/share/elki/addons/*.jar
+find_jars elki /usr/share/elki/addons/*.jar libsvm3
 
 run_java de.lmu.ifi.dbs.elki.application.ELKILauncher "$@"
diff --git a/debian/extra/elki-cli b/debian/extra/elki-cli
index 404196d5..9872aaf9 100644
--- a/debian/extra/elki-cli
+++ b/debian/extra/elki-cli
@@ -3,6 +3,6 @@
 
 find_java_runtime openjdk8 oracle8 java8 openjdk7 oracle7 java7
 
-find_jars elki fop /usr/share/elki/addons/*.jar
+find_jars elki /usr/share/elki/addons/*.jar libsvm3
 
 run_java de.lmu.ifi.dbs.elki.application.KDDCLIApplication "$@"
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1 @@
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 00000000..c90b2201
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,5 @@
+
+de.lmu.ifi.dbs.elki elki-bundle jar * * *
+de.lmu.ifi.dbs.elki elki-libsvm jar * * *
+de.lmu.ifi.dbs.elki elki-tutorial jar * * *
+org.apache.maven.plugins maven-dependency-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 00000000..eaaf47b9
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,7 @@
+#maven.compiler.source=1.7
+#maven.compiler.target=1.7
+#project.build.sourceEncoding=UTF-8
+
+failIfNoTests=false
+test=!*HeapPerformance*,*
+surefire.excludesFile=**/TestHeapPerformance*
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 00000000..a5e91e77
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,5 @@
+
+de.lmu.ifi.dbs.elki elki-batik-visualization jar * * *
+de.lmu.ifi.dbs.elki elki-libsvm jar * * *
+de.lmu.ifi.dbs.elki elki-project pom * * *
+de.lmu.ifi.dbs.elki elki jar * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 00000000..81e1a138
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,14 @@
+
+de.lmu.ifi.dbs.elki elki-batik-visualization jar * * *
+de.lmu.ifi.dbs.elki elki-libsvm jar * * *
+de.lmu.ifi.dbs.elki elki-project pom * * *
+de.lmu.ifi.dbs.elki elki jar * * *
+junit junit jar s/4\..*/4.x/ * *
+org.apache.maven.plugins maven-compiler-plugin * s/.*/3.2/ * *
+org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
+org.apache.maven.plugins maven-javadoc-plugin * s/.*/2.10.3/ * *
+org.apache.maven.plugins maven-resources-plugin * s/.*/2.6/ * *
+org.apache.maven.plugins maven-source-plugin * s/.*/2.4/ * *
+org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ * *
+org.codehaus.mojo exec-maven-plugin * s/.*/1.1.1/ * *
+tw.edu.ntu.csie libsvm * * * *
diff --git a/debian/patches/allow-empty-packages b/debian/patches/allow-empty-packages.patch
index 50ceb154..63c0b635 100644
--- a/debian/patches/allow-empty-packages
+++ b/debian/patches/allow-empty-packages.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] Robustness: allow default package for user extensions.
  .../de/lmu/ifi/dbs/elki/gui/util/ClassTree.java    | 27 +++++++++++-----------
  1 file changed, 14 insertions(+), 13 deletions(-)
 
-diff --git a/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java b/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
-index 8c524cd..2cc1769 100644
---- a/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
-+++ b/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
-@@ -31,15 +31,15 @@
+Index: elki-0.7.0/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
+===================================================================
+--- elki-0.7.0.orig/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
++++ elki-0.7.0/elki/src/main/java/de/lmu/ifi/dbs/elki/gui/util/ClassTree.java
+@@ -31,15 +31,15 @@ import javax.swing.tree.TreeNode;
  
  /**
   * Build a tree of available classes for use in Swing UIs.
@@ -30,7 +30,7 @@ index 8c524cd..2cc1769 100644
     * @param choices Class choices
     * @param rootpkg Root package name (to strip / hide)
     * @return Root node.
-@@ -59,7 +59,8 @@ public static TreeNode build(List<Class<?>> choices, String rootpkg) {
+@@ -59,7 +59,8 @@ public class ClassTree {
      for(Class<?> impl : choices) {
        String name = impl.getName();
        name = (prefix != null && name.startsWith(prefix)) ? name.substring(prefix.length()) : name;
@@ -40,7 +40,7 @@ index 8c524cd..2cc1769 100644
  
        MutableTreeNode p = null;
        int l = name.lastIndexOf('.');
-@@ -96,7 +97,7 @@ public static TreeNode build(List<Class<?>> choices, String rootpkg) {
+@@ -96,7 +97,7 @@ public class ClassTree {
  
    /**
     * Simplify the tree.
@@ -49,7 +49,7 @@ index 8c524cd..2cc1769 100644
     * @param cur Current node
     * @param prefix Prefix to add
     * @return Replacement node
-@@ -133,9 +134,9 @@ else if(cur instanceof ClassNode) {
+@@ -133,9 +134,9 @@ public class ClassTree {
  
    /**
     * Tree node representing a single class.
@@ -61,7 +61,7 @@ index 8c524cd..2cc1769 100644
     * @apiviz.exclude
     */
    public static class PackageNode extends DefaultMutableTreeNode {
-@@ -151,7 +152,7 @@ else if(cur instanceof ClassNode) {
+@@ -151,7 +152,7 @@ public class ClassTree {
  
      /**
       * Current class name.
@@ -70,7 +70,7 @@ index 8c524cd..2cc1769 100644
       * @param display Displayed name
       * @param pkgname Actual class name
       */
-@@ -162,7 +163,7 @@ public PackageNode(String display, String pkgname) {
+@@ -162,7 +163,7 @@ public class ClassTree {
  
      /**
       * Return the package name.
@@ -79,7 +79,7 @@ index 8c524cd..2cc1769 100644
       * @return Package name
       */
      public String getPackageName() {
-@@ -172,9 +173,9 @@ public String getPackageName() {
+@@ -172,9 +173,9 @@ public class ClassTree {
  
    /**
     * Tree node representing a single class.
@@ -91,7 +91,7 @@ index 8c524cd..2cc1769 100644
     * @apiviz.exclude
     */
    public static class ClassNode extends DefaultMutableTreeNode {
-@@ -190,7 +191,7 @@ public String getPackageName() {
+@@ -190,7 +191,7 @@ public class ClassTree {
  
      /**
       * Current class name.
@@ -100,7 +100,7 @@ index 8c524cd..2cc1769 100644
       * @param display Displayed name
       * @param clsname Actual class name
       */
-@@ -201,7 +202,7 @@ public ClassNode(String display, String clsname) {
+@@ -201,7 +202,7 @@ public class ClassTree {
  
      /**
       * Return the class name.
diff --git a/debian/patches/better-classpath.patch b/debian/patches/better-classpath.patch
new file mode 100644
index 00000000..0c75d573
--- /dev/null
+++ b/debian/patches/better-classpath.patch
@@ -0,0 +1,82 @@
+Index: elki-0.7.0/addons/batikvis/pom.xml
+===================================================================
+--- elki-0.7.0.orig/addons/batikvis/pom.xml
++++ elki-0.7.0/addons/batikvis/pom.xml
+@@ -38,8 +38,10 @@
+ 						<manifest>
+ 							<addClasspath>true</addClasspath>
+ 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
+-							<classpathPrefix>dependency/</classpathPrefix>
++							<classpathPrefix>/usr/share/maven-repo/</classpathPrefix>
++							<classpathLayoutType>repository</classpathLayoutType>
+ 						</manifest>
++						<index>true</index>
+ 					</archive>
+ 				</configuration>
+ 			</plugin>
+Index: elki-0.7.0/addons/tutorial/pom.xml
+===================================================================
+--- elki-0.7.0.orig/addons/tutorial/pom.xml
++++ elki-0.7.0/addons/tutorial/pom.xml
+@@ -38,7 +38,7 @@
+ 						<manifest>
+ 							<addClasspath>true</addClasspath>
+ 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
+-							<classpathPrefix>dependency/</classpathPrefix>
++							<classpathPrefix>./</classpathPrefix>
+ 						</manifest>
+ 					</archive>
+ 				</configuration>
+Index: elki-0.7.0/elki/pom.xml
+===================================================================
+--- elki-0.7.0.orig/elki/pom.xml
++++ elki-0.7.0/elki/pom.xml
+@@ -60,8 +60,10 @@
+ 						<manifest>
+ 							<addClasspath>true</addClasspath>
+ 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
+-							<classpathPrefix>dependency/</classpathPrefix>
++							<classpathPrefix>/usr/share/maven-repo/</classpathPrefix>
++							<classpathLayoutType>repository</classpathLayoutType>
+ 						</manifest>
++						<index>true</index>
+ 					</archive>
+ 				</configuration>
+ 			</plugin>
+Index: elki-0.7.0/addons/libsvm/pom.xml
+===================================================================
+--- elki-0.7.0.orig/addons/libsvm/pom.xml
++++ elki-0.7.0/addons/libsvm/pom.xml
+@@ -26,6 +26,32 @@
+ 		<elki.projdir>${basedir}/../..</elki.projdir>
+ 	</properties>
+ 
++	<build>
++		<plugins>
++			<!-- jar packaging -->
++			<plugin>
++				<groupId>org.apache.maven.plugins</groupId>
++				<artifactId>maven-jar-plugin</artifactId>
++				<version>2.3.1</version>
++				<configuration>
++					<archive>
++						<manifestFile>${elki.projdir}/elki/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
++						<manifest>
++							<addClasspath>true</addClasspath>
++							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
++							<classpathPrefix>/usr/share/maven-repo/</classpathPrefix>
++							<classpathLayoutType>repository</classpathLayoutType>
++						</manifest>
++						<manifestEntries>
++							<Class-Path>/usr/share/java/libsvm3.jar</Class-Path>
++						</manifestEntries>
++						<index>true</index>
++					</archive>
++				</configuration>
++			</plugin>
++		</plugins>
++	</build>
++
+ 	<dependencies>
+ 		<dependency>
+ 			<groupId>de.lmu.ifi.dbs.elki</groupId>
diff --git a/debian/patches/build b/debian/patches/build
deleted file mode 100644
index ee372e85..00000000
--- a/debian/patches/build
+++ /dev/null
@@ -1,294 +0,0 @@
-Index: elki-0.7.0/addons/batikvis/pom.xml
-===================================================================
---- elki-0.7.0.orig/addons/batikvis/pom.xml
-+++ elki-0.7.0/addons/batikvis/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>
-@@ -31,19 +32,20 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-jar-plugin</artifactId>
--				<version>2.3.1</version>
-+				<version>2.4</version>
- 				<configuration>
- 					<archive>
- 						<manifestFile>${elki.projdir}/elki/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- 						<manifest>
- 							<addClasspath>true</addClasspath>
- 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
--							<classpathPrefix>dependency/</classpathPrefix>
-+							<!-- <classpathPrefix>dependency/</classpathPrefix> -->
- 						</manifest>
- 					</archive>
- 				</configuration>
- 			</plugin>
- 			<!-- Ensure the directory exists, for code below. -->
-+<!--
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-antrun-plugin</artifactId>
-@@ -62,7 +64,9 @@
- 					</execution>
- 				</executions>
- 			</plugin>
-+-->
- 			<!-- Generate additional files for javadoc -->
-+<!--
- 			<plugin>
- 				<groupId>org.codehaus.mojo</groupId>
- 				<artifactId>exec-maven-plugin</artifactId>
-@@ -104,6 +108,7 @@
- 					</execution>
- 				</executions>
- 			</plugin>
-+-->
- 		</plugins>
- 	</build>
- 
-Index: elki-0.7.0/addons/tutorial/pom.xml
-===================================================================
---- elki-0.7.0.orig/addons/tutorial/pom.xml
-+++ elki-0.7.0/addons/tutorial/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>
-@@ -31,14 +32,14 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-jar-plugin</artifactId>
--				<version>2.3.1</version>
-+				<version>2.4</version>
- 				<configuration>
- 					<archive>
- 						<manifestFile>${elki.projdir}/elki/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- 						<manifest>
- 							<addClasspath>true</addClasspath>
- 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
--							<classpathPrefix>dependency/</classpathPrefix>
-+							<!-- <classpathPrefix>dependency/</classpathPrefix> -->
- 						</manifest>
- 					</archive>
- 				</configuration>
-Index: elki-0.7.0/elki/pom.xml
-===================================================================
---- elki-0.7.0.orig/elki/pom.xml
-+++ elki-0.7.0/elki/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>
-@@ -53,14 +54,14 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-jar-plugin</artifactId>
--				<version>2.3.1</version>
-+				<version>2.4</version>
- 				<configuration>
- 					<archive>
- 						<manifestFile>${elki.projdir}/elki/src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- 						<manifest>
- 							<addClasspath>true</addClasspath>
- 							<mainClass>de.lmu.ifi.dbs.elki.application.ELKILauncher</mainClass>
--							<classpathPrefix>dependency/</classpathPrefix>
-+							<!-- <classpathPrefix>dependency/</classpathPrefix> -->
- 						</manifest>
- 					</archive>
- 				</configuration>
-@@ -68,7 +69,7 @@
- 			<!-- copy additional javadoc resources -->
- 			<plugin>
- 				<artifactId>maven-resources-plugin</artifactId>
--				<version>2.7</version>
-+				<version>2.3</version>
- 				<executions>
- 					<execution>
- 						<id>copy-resources</id>
-@@ -91,6 +92,7 @@
- 				</executions>
- 			</plugin>
- 			<!-- Generate additional files for javadoc -->
-+<!--
- 			<plugin>
- 				<groupId>org.codehaus.mojo</groupId>
- 				<artifactId>exec-maven-plugin</artifactId>
-@@ -132,11 +134,12 @@
- 					</execution>
- 				</executions>
- 			</plugin>
-+-->
- 			<!-- Build JavaDoc -->
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-javadoc-plugin</artifactId>
--				<version>2.10.1</version>
-+				<version>2.10.3</version>
- 				<executions>
- 					<execution>
- 						<id>attach-javadocs</id>
-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>
-@@ -29,7 +30,7 @@
- 
- 	<properties>
- 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--		<skipTests>true</skipTests>
-+		<skipTests>false</skipTests>
- 		<elki.projdir>${basedir}</elki.projdir>
- 		<year>2015</year>
- 	</properties>
-@@ -40,7 +41,7 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-compiler-plugin</artifactId>
--				<version>3.0</version>
-+				<version>3.2</version>
- 				<configuration>
- 					<useIncrementalCompilation>false</useIncrementalCompilation>
- 					<source>1.7</source>
-@@ -56,7 +57,7 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-surefire-plugin</artifactId>
--				<version>2.7.2</version>
-+				<version>2.17</version>
- 				<configuration>
- 					<!-- to have the desired paths to the data files -->
- 					<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
-@@ -78,6 +79,7 @@
- 				</configuration>
- 			</plugin>
- 			<!-- Dependencies -->
-+<!--
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-dependency-plugin</artifactId>
-@@ -96,6 +98,7 @@
- 					</execution>
- 				</executions>
- 			</plugin>
-+-->
- 			<!-- Source code packaging -->
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
-@@ -113,7 +116,7 @@
- 			<!-- Additional JavaDoc resources to install -->
- 			<plugin>
- 				<artifactId>maven-resources-plugin</artifactId>
--				<version>2.7</version>
-+				<version>2.3</version>
- 				<executions>
- 					<execution>
- 						<id>copy-resources</id>
-@@ -142,7 +145,7 @@
- 			<plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-javadoc-plugin</artifactId>
--				<version>2.10.1</version>
-+				<version>2.10.3</version>
- 				<executions>
- 					<execution>
- 						<id>attach-javadocs</id>
-@@ -241,20 +244,25 @@
- 			</modules>
- 		</profile>
- 		<!-- Image search -->
-+<!--
- 		<profile>
- 			<id>imagesearch</id>
- 			<modules>
- 				<module>addons/imagesearch</module>
- 			</modules>
- 		</profile>
-+-->
- 		<!-- Luence backend for text mining -->
-+<!--
- 		<profile>
- 			<id>lucene</id>
- 			<modules>
- 				<module>addons/lucene</module>
- 			</modules>
- 		</profile>
-+-->
- 		<!-- OpenGL based visualization -->
-+<!--
- 		<profile>
- 			<id>jogl</id>
- 			<modules>
-@@ -263,6 +271,7 @@
- 				<module>addons/joglviz</module>
- 			</modules>
- 		</profile>
-+-->
- 		<!-- Profile for publishing to Sonatype Maven repository. -->
- 		<profile>
- 			<id>publish</id>
-@@ -316,37 +325,37 @@
- 			<dependency>
- 				<groupId>net.sf.trove4j</groupId>
- 				<artifactId>trove4j</artifactId>
--				<version>[3.0.3,)</version>
-+				<version>debian</version>
- 			</dependency>
- 
- 			<dependency>
- 				<groupId>org.apache.xmlgraphics</groupId>
- 				<artifactId>batik-swing</artifactId>
--				<version>[1.7,1.9)</version>
-+				<version>debian</version>
- 			</dependency>
- 
- 			<dependency>
- 				<groupId>org.apache.xmlgraphics</groupId>
- 				<artifactId>batik-rasterizer</artifactId>
--				<version>[1.7,1.9)</version>
-+				<version>debian</version>
- 			</dependency>
- 
- 			<dependency>
- 				<groupId>org.apache.xmlgraphics</groupId>
- 				<artifactId>batik-ext</artifactId>
--				<version>[1.7,1.9)</version>
-+				<version>debian</version>
- 			</dependency>
- 
- 			<dependency>
- 				<groupId>org.apache.xmlgraphics</groupId>
- 				<artifactId>xmlgraphics-commons</artifactId>
--				<version>[2,3)</version>
-+				<version>debian</version>
- 			</dependency>
- 
- 			<dependency>
- 				<groupId>junit</groupId>
- 				<artifactId>junit</artifactId>
--				<version>[4.8,)</version>
-+				<version>4.x</version>
- 				<scope>test</scope>
- 			</dependency>
- 		</dependencies>
-Index: elki-0.7.0/addons/libsvm/pom.xml
-===================================================================
---- elki-0.7.0.orig/addons/libsvm/pom.xml
-+++ elki-0.7.0/addons/libsvm/pom.xml
-@@ -36,6 +36,8 @@
- 			<groupId>tw.edu.ntu.csie</groupId>
- 			<artifactId>libsvm</artifactId>
- 			<version>3.17</version>
-+			<scope>system</scope>
-+			<systemPath>/usr/share/java/libsvm3.jar</systemPath>
- 		</dependency>
- 	</dependencies>
- </project>
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 00000000..87efedc4
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,103 @@
+Index: elki-0.7.0/pom.xml
+===================================================================
+--- elki-0.7.0.orig/pom.xml
++++ elki-0.7.0/pom.xml
+@@ -29,7 +29,6 @@
+ 
+ 	<properties>
+ 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+-		<skipTests>true</skipTests>
+ 		<elki.projdir>${basedir}</elki.projdir>
+ 		<year>2015</year>
+ 	</properties>
+@@ -241,20 +240,25 @@
+ 			</modules>
+ 		</profile>
+ 		<!-- Image search -->
++<!--
+ 		<profile>
+ 			<id>imagesearch</id>
+ 			<modules>
+ 				<module>addons/imagesearch</module>
+ 			</modules>
+ 		</profile>
++-->
+ 		<!-- Luence backend for text mining -->
++<!--
+ 		<profile>
+ 			<id>lucene</id>
+ 			<modules>
+ 				<module>addons/lucene</module>
+ 			</modules>
+ 		</profile>
++-->
+ 		<!-- OpenGL based visualization -->
++<!--
+ 		<profile>
+ 			<id>jogl</id>
+ 			<modules>
+@@ -263,6 +267,7 @@
+ 				<module>addons/joglviz</module>
+ 			</modules>
+ 		</profile>
++-->
+ 		<!-- Profile for publishing to Sonatype Maven repository. -->
+ 		<profile>
+ 			<id>publish</id>
+@@ -316,37 +321,37 @@
+ 			<dependency>
+ 				<groupId>net.sf.trove4j</groupId>
+ 				<artifactId>trove4j</artifactId>
+-				<version>[3.0.3,)</version>
++				<version>3.0.3</version>
+ 			</dependency>
+ 
+ 			<dependency>
+ 				<groupId>org.apache.xmlgraphics</groupId>
+ 				<artifactId>batik-swing</artifactId>
+-				<version>[1.7,1.9)</version>
++				<version>1.9</version>
+ 			</dependency>
+ 
+ 			<dependency>
+ 				<groupId>org.apache.xmlgraphics</groupId>
+ 				<artifactId>batik-rasterizer</artifactId>
+-				<version>[1.7,1.9)</version>
++				<version>1.9</version>
+ 			</dependency>
+ 
+ 			<dependency>
+ 				<groupId>org.apache.xmlgraphics</groupId>
+ 				<artifactId>batik-ext</artifactId>
+-				<version>[1.7,1.9)</version>
++				<version>1.9</version>
+ 			</dependency>
+ 
+ 			<dependency>
+ 				<groupId>org.apache.xmlgraphics</groupId>
+ 				<artifactId>xmlgraphics-commons</artifactId>
+-				<version>[2,3)</version>
++				<version>2.0.1</version>
+ 			</dependency>
+ 
+ 			<dependency>
+ 				<groupId>junit</groupId>
+ 				<artifactId>junit</artifactId>
+-				<version>[4.8,)</version>
++				<version>4.12</version>
+ 				<scope>test</scope>
+ 			</dependency>
+ 		</dependencies>
+Index: elki-0.7.0/addons/libsvm/pom.xml
+===================================================================
+--- elki-0.7.0.orig/addons/libsvm/pom.xml
++++ elki-0.7.0/addons/libsvm/pom.xml
+@@ -36,6 +36,8 @@
+ 			<groupId>tw.edu.ntu.csie</groupId>
+ 			<artifactId>libsvm</artifactId>
+ 			<version>3.17</version>
++			<scope>system</scope>
++			<systemPath>/usr/share/java/libsvm3.jar</systemPath>
+ 		</dependency>
+ 	</dependencies>
+ </project>
diff --git a/debian/patches/enable-profiles-hack.patch b/debian/patches/enable-profiles-hack.patch
new file mode 100644
index 00000000..8f37c003
--- /dev/null
+++ b/debian/patches/enable-profiles-hack.patch
@@ -0,0 +1,24 @@
+Index: elki-0.7.0/pom.xml
+===================================================================
+--- elki-0.7.0.orig/pom.xml
++++ elki-0.7.0/pom.xml
+@@ -228,6 +228,9 @@
+ 		<!-- Batik visualization -->
+ 		<profile>
+ 			<id>svg</id>
++			<activation>
++				<activeByDefault>true</activeByDefault>
++			</activation>
+ 			<modules>
+ 				<module>addons/batikvis</module>
+ 			</modules>
+@@ -235,6 +238,9 @@
+ 		<!-- LibSVM outlier detection -->
+ 		<profile>
+ 			<id>svm</id>
++			<activation>
++				<activeByDefault>true</activeByDefault>
++			</activation>
+ 			<modules>
+ 				<module>addons/libsvm</module>
+ 			</modules>
diff --git a/debian/patches/series b/debian/patches/series
index a508e6d5..1c3d4a11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
-build
-allow-empty-packages
+allow-empty-packages.patch
+build.patch
+enable-profiles-hack.patch
+better-classpath.patch
diff --git a/debian/rules b/debian/rules
index 81b51cec..d74fd9a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,21 +4,10 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 REPO=/usr/share/maven-repo
 # Ensure we use Maven 3
 MVN=/usr/share/maven/bin/mvn -Dmaven.repo.local=$(REPO)
-# Version
-ELKIVERSION=0.7.0
 
 %:
-	dh $@ --with maven_repo_helper
+	dh $@ --buildsystem=maven
 
-build:
-	$(MVN) --offline -P svg,svm package
-
-#binary-post-install/elki::
-#	mh_installpoms -pelki
-#	mh_installjar -pelki -l elki/pom.xml elki/target/elki-$(ELKIVERSION).jar
-#	mh_installjar -pelki -l addons/batikvis/pom.xml addons/batikvis/target/elki-batik-visualization-$(ELKIVERSION).jar
-#	mh_installjar -pelki -l addons/libsvm/pom.xml addons/libsvm/target/elki-libsvm-$(ELKIVERSION).jar
-#	mh_installjar -pelki -l addons/tutorial/pom.xml addons/tutorial/target/elki-tutorial-$(ELKIVERSION).jar
-
-override_dh_auto_clean:
-	$(MVN) --offline -P svg,svm clean
+#build:
+#	mh_patchpoms -pelki
+#	$(MVN) --offline -Psvg,svm -DskipTests=true package
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 00000000..7f97b273
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=filenamemangle=s/.+\/release(\d\S*)\.tar\.gz/elki-$1\.tar\.gz/ \
+  https://github.com/elki-project/elki/releases .*/release(\d\S*)\.tar\.gz