diff options
| author | Erich Schubert <erich@debian.org> | 2017-10-02 16:29:24 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 22:30:51 +0000 |
| commit | 34518577fd348a93cbcb2650202f97b1c5c28ecd (patch) | |
| tree | 3f100a5e2e4824b80ca05dbb00f6f46c9a50291f | |
| parent | c39ce9926240499159bddee3bd19994db5354c54 (diff) | |
Import Debian changes 0.7.1-6
elki (0.7.1-6) unstable; urgency=low
* Next attempt to workaround for Batik broken dependencies.
The bug is in Batik; but it auses a FTBFS in elki in offline mode.
Because of this, we exclude the following maven dependencies:
- Rhino (ELKI does not use JavaScript in SVG)
- Jython (ELKI does not use Python scripting in SVG either)
- batik-svgrasterizer doesn't exist in the Batik package currently
* Update versioned depend to libbatik-java 1.9, as we now use 1.9 in the pom
* Update to debian policy 4.1.1:
switch priority extra to optional
* Update upstream homepage
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 9 | ||||
| -rw-r--r-- | debian/patches/update-maven.patch | 3 |
3 files changed, 22 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 6aa1ac08..5d50bcdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +elki (0.7.1-6) unstable; urgency=low + + * Next attempt to workaround for Batik broken dependencies. + The bug is in Batik; but it auses a FTBFS in elki in offline mode. + Because of this, we exclude the following maven dependencies: + - Rhino (ELKI does not use JavaScript in SVG) + - Jython (ELKI does not use Python scripting in SVG either) + - batik-svgrasterizer doesn't exist in the Batik package currently + * Update versioned depend to libbatik-java 1.9, as we now use 1.9 in the pom + * Update to debian policy 4.1.1: + switch priority extra to optional + * Update upstream homepage + + -- Erich Schubert <erich@debian.org> Mon, 02 Oct 2017 16:29:24 +0200 + elki (0.7.1-5) unstable; urgency=low * Workaround for batik bug: mask org.mozilla:rhino dependency of Batik. diff --git a/debian/control b/debian/control index 9eee9ebd..3b689314 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,11 @@ Source: elki Section: science -Priority: extra +Priority: optional Maintainer: Erich Schubert <erich@debian.org> Build-Depends: debhelper (>= 9), default-jdk (>= 2:1.7) | java7-sdk, maven-debian-helper (>= 1.5), maven (>= 3), - libbatik-java (>= 1.8), libxmlgraphics-commons-java, + libbatik-java (>= 1.9), + libxmlgraphics-commons-java, libsvm3-java, libtrove3-java, libmaven-antrun-plugin-java, @@ -16,8 +17,8 @@ Build-Depends: debhelper (>= 9), default-jdk (>= 2:1.7) | java7-sdk, maven-debia libsurefire-java, junit4, default-jdk-doc -Standards-Version: 3.9.6 -Homepage: http://elki.dbs.ifi.lmu.de/ +Standards-Version: 4.1.1 +Homepage: https://elki-project.github.io/ Package: elki Architecture: all diff --git a/debian/patches/update-maven.patch b/debian/patches/update-maven.patch index 026ffb09..2a639198 100644 --- a/debian/patches/update-maven.patch +++ b/debian/patches/update-maven.patch @@ -43,7 +43,7 @@ <!-- Profile for publishing to Sonatype Maven repository. --> <profile> <id>publish</id> -@@ -411,43 +417,49 @@ +@@ -411,43 +417,50 @@ <dependency> <groupId>net.sf.trove4j</groupId> <artifactId>trove4j</artifactId> @@ -58,6 +58,7 @@ + <version>1.9</version> + <exclusions> + <exclusion><groupId>org.python</groupId><artifactId>jython</artifactId></exclusion> ++ <exclusion><groupId>org.mozilla</groupId><artifactId>rhino</artifactId></exclusion> + </exclusions> </dependency> |