summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Schubert <erich@debian.org>2012-12-20 21:28:46 +0100
committerAndrej Shadura <andrewsh@debian.org>2019-03-09 22:30:36 +0000
commit974d4cf6d54cadc06258039f2cd0515cc34aeac6 (patch)
tree022fd93114f42df09790feaaf60f944fde029ff2
parent357b2761a2c0ded8cad5e4d3c1e667b7639ff7a6 (diff)
Import Debian changes 0.5.5-2
elki (0.5.5-2) unstable; urgency=low * Fix package name in suggests: s/openjdk7-jdk/openjdk-7-jdk/ * Make "elki" command use ELKILauncher instead of the MiniGUI (then "elki <appname> <params>" works) * Prefer Java 7. This is the last version that will support Java 6. * Improve debian/rules clean
-rw-r--r--debian/changelog10
-rw-r--r--debian/control2
-rw-r--r--debian/extra/elki4
-rw-r--r--debian/extra/elki-cli2
-rwxr-xr-xdebian/rules2
5 files changed, 15 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 17d6b582..09cdebf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+elki (0.5.5-2) unstable; urgency=low
+
+ * Fix package name in suggests: s/openjdk7-jdk/openjdk-7-jdk/
+ * Make "elki" command use ELKILauncher instead of the MiniGUI
+ (then "elki <appname> <params>" works)
+ * Prefer Java 7. This is the last version that will support Java 6.
+ * Improve debian/rules clean
+
+ -- Erich Schubert <erich@debian.org> Thu, 20 Dec 2012 21:28:46 +0100
+
elki (0.5.5-1) unstable; urgency=low
* New upstream release: 0.5.5 interim release.
diff --git a/debian/control b/debian/control
index 5f3d6147..33619db3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://elki.dbs.ifi.lmu.de/
Package: elki
Architecture: all
Depends: openjdk-7-jre | java6-runtime, fop, libtrove3-java, java-wrappers, ${misc:Depends}
-Suggests: openjdk7-jdk | java6-sdk
+Suggests: openjdk-7-jdk | java6-sdk
Description: Data mining algorithm development framework
ELKI: "Environment for Developing KDD-Applications Supported by
Index-Structures" is a development framework for data mining algorithms
diff --git a/debian/extra/elki b/debian/extra/elki
index 053fff3a..fd0cbd37 100644
--- a/debian/extra/elki
+++ b/debian/extra/elki
@@ -1,8 +1,8 @@
#!/bin/sh
. /usr/lib/java-wrappers/java-wrappers.sh
-find_java_runtime openjdk6 sun6
+find_java_runtime openjdk7 openjdk6
find_jars elki fop
-run_java de.lmu.ifi.dbs.elki.gui.minigui.MiniGUI "$@"
+run_java de.lmu.ifi.dbs.elki.application.ELKILauncher "$@"
diff --git a/debian/extra/elki-cli b/debian/extra/elki-cli
index d1b56ad8..910e96a9 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 openjdk6 sun6
+find_java_runtime openjdk7 openjdk6 sun6
find_jars elki fop
diff --git a/debian/rules b/debian/rules
index 3135859b..01a139db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,5 @@ build:
ant
clean:
- ant clean
+ test -f build.xml && ant clean || true
dh clean