summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Schubert <erich@debian.org>2016-01-05 17:36:56 +0100
committerAndrej Shadura <andrewsh@debian.org>2019-03-09 22:30:43 +0000
commit4048956ea9bdd29a14eae0a494d0ab843e8b2478 (patch)
tree1875d92d542c8ccbbb3741cb289e123045d37ae4
parentfa7023cb626a495f108b2490c5ef8a18905408e3 (diff)
Import Debian changes 0.7.0-3
elki (0.7.0-3) unstable; urgency=low * Fix exclusion of time-oriented test (unfortunately CPU dependent). Solves FTBFS from reproducibility project.
-rw-r--r--debian/changelog7
-rw-r--r--debian/maven.properties2
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/skip-cpu-dependent-test.patch14
4 files changed, 22 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 6228b37e..d12c6e42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+elki (0.7.0-3) unstable; urgency=low
+
+ * Fix exclusion of time-oriented test (unfortunately CPU dependent).
+ Solves FTBFS from reproducibility project.
+
+ -- Erich Schubert <erich@debian.org> Tue, 05 Jan 2016 17:36:56 +0100
+
elki (0.7.0-2) unstable; urgency=low
* Use maven-debian-helper for Maven 3 to manage Maven dependencies,
diff --git a/debian/maven.properties b/debian/maven.properties
index eaaf47b9..14ec9ff2 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -3,5 +3,3 @@
#project.build.sourceEncoding=UTF-8
failIfNoTests=false
-test=!*HeapPerformance*,*
-surefire.excludesFile=**/TestHeapPerformance*
diff --git a/debian/patches/series b/debian/patches/series
index 1c3d4a11..cab1512c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ allow-empty-packages.patch
build.patch
enable-profiles-hack.patch
better-classpath.patch
+skip-cpu-dependent-test.patch
diff --git a/debian/patches/skip-cpu-dependent-test.patch b/debian/patches/skip-cpu-dependent-test.patch
new file mode 100644
index 00000000..5793bf12
--- /dev/null
+++ b/debian/patches/skip-cpu-dependent-test.patch
@@ -0,0 +1,14 @@
+Index: elki-0.7.0/pom.xml
+===================================================================
+--- elki-0.7.0.orig/pom.xml
++++ elki-0.7.0/pom.xml
+@@ -60,6 +60,9 @@
+ <!-- to have the desired paths to the data files -->
+ <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+ <skipTests>${skipTests}</skipTests>
++ <excludes>
++ <exclude>**/TestHeapPerformance*</exclude>
++ </excludes>
+ </configuration>
+ </plugin>
+ <!-- Include more metadata in the jar -->