diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/allow-empty-packages.patch (renamed from debian/patches/allow-empty-packages) | 26 | ||||
| -rw-r--r-- | debian/patches/better-classpath.patch | 82 | ||||
| -rw-r--r-- | debian/patches/build | 294 | ||||
| -rw-r--r-- | debian/patches/build.patch | 103 | ||||
| -rw-r--r-- | debian/patches/enable-profiles-hack.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 6 |
6 files changed, 226 insertions, 309 deletions
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 |