This is an automated email from the git hooks/post-receive script. fnatter-guest pushed a commit to branch master in repository insubstantial.
commit 0fedf7e5281a7efc461753bced20b3148f914f37 Author: Felix Natter <[email protected]> Date: Sat Jan 16 15:35:49 2016 +0100 basic gradle packaging --- debian/compat | 1 + debian/control | 221 ++++++++++++++++++++++ debian/docs | 1 + debian/patches/asm5.patch | 305 ++++++++++++++++++++++++++++++ debian/patches/build_usr_share_java.patch | 149 +++++++++++++++ debian/patches/javadoc_encoding.patch | 16 ++ debian/patches/no_android.patch | 124 ++++++++++++ debian/patches/series | 5 + debian/patches/version.patch | 23 +++ debian/source/format | 1 + 10 files changed, 846 insertions(+) diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4cf9cda --- /dev/null +++ b/debian/control @@ -0,0 +1,221 @@ +Source: insubstantial +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Felix Natter <[email protected]> +Build-Depends: debhelper (>= 9), + default-jdk +Build-Depends-Indep: libjcip-annotations-java, + libswt-gtk-3-java, + libasm4-java, + gradle, + libswingx-java, + gradle-debian-helper, + maven-repo-helper +Standards-Version: 3.9.6 +Homepage: https://github.com/Insubstantial/insubstantial +#Vcs-Git: git://anonscm.debian.org/collab-maint/insubstantial.git +#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/insubstantial.git;a=summary + +Package: libflamingo-java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} +Suggests: libflamingo-java-doc +Description: Provides a swing ribbon container for Java applications + The goal of this project is to provide a Swing implementation of the + ribbon container and related components. The components have + consistent visuals under the existing core and third-party + look-and-feels, respect the DPI settings of the user desktop and + follow the core Swing guidelines in the external APIs and the internal + implementation details. + +Package: libflamingo-java-doc +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} +Suggests: default-jdk-doc, + libflamingo-java +Section: doc +Description: Provides a swing ribbon container for Java applications (documentation) + The goal of this project is to provide a Swing implementation of the + ribbon container and related components. The components have + consistent visuals under the existing core and third-party + look-and-feels, respect the DPI settings of the user desktop and + follow the core Swing guidelines in the external APIs and the internal + implementation details. + . + This package contains API documentation (Javadoc) for libflamingo-java. + +Package: liblaf-plugin-java +Architecture: all +Depends: ${misc:Depends} +Suggests: liblaf-plugin-java-doc +Description: Support for third-party components in Java look-and-feel libraries + The goal of this project is to provide a generic plugin framework for + look-and-feels and define the interface of a common kind of plugins - the + component plugins. + +Package: liblaf-plugin-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: default-jdk-doc, + liblaf-plugin-java +Description: Support for third-party components in Java look-and-feel libraries (doc) + The goal of this project is to provide a generic plugin framework for + look-and-feels and define the interface of a common kind of plugins - the + component plugins. + . + This package contains API documentation (Javadoc) for liblaf-plugin-java. + +Package: liblaf-widget-java +Architecture: all +Depends: ${misc:Depends} +Suggests: liblaf-widget-java-doc +Description: Java widget toolbox for other look-and-feel libraries + Laf-Widget project provide support for and base set of + additional behaviour and widgets in look-and-feels libraries. + . + The list of currently provided widgets (from v4) + * Auto-completion (model-based / free-text) on editable combo boxes. + * Hover preview of minimized internal frames on desktop icons. + * Menu search panel on menu bars. + * Hover preview of tab in tabbed panes. + * Overview dialog on tabbed panes with optional periodic refresh. + * Tab paging on tabbed panes. + * Password strength checker on password fields. + * Lock border on non-editable text components and model editable combobox. + * Select all text in text component on focus gain. + * Context menu on text components with edit actions (copy / paste / cut ...). + * Enhanced drag-and-drop support for trees. + * Scroll pane selector. + * Selecting / deselecting in text components on Escape key press. + . + Laf-Widget is used by substance look-and-feel since 3.0 + +Package: liblaf-widget-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: default-jdk-doc, + liblaf-widget-java +Description: Java widget toolbox for look-and-feel libraries - documentation + Laf-Widget project provide support for and base set of + additional behaviour and widgets in look-and-feels libraries. + . + The list of currently provided widgets (from v4) + * Auto-completion (model-based / free-text) on editable combo boxes. + * Hover preview of minimized internal frames on desktop icons. + * Menu search panel on menu bars. + * Hover preview of tab in tabbed panes. + * Overview dialog on tabbed panes with optional periodic refresh. + * Tab paging on tabbed panes. + * Password strength checker on password fields. + * Lock border on non-editable text components and model editable combobox. + * Select all text in text component on focus gain. + * Context menu on text components with edit actions (copy / paste / cut .... + * Enhanced drag-and-drop support for trees. + * Scroll pane selector. + * Selecting / deselecting in text components on Escape key press. + . + Laf-Widget is used by substance look-and-feel since 3.0 + . + This package contains API documentation (Javadoc) for liblaf-widget-java. + +Package: substance +Architecture: all +Depends: ${misc:Depends} +Suggests: substance-doc +Description: cross-platform look & feel for Swing applications + The goal of this project is to provide a configurable and + customizable production-quality Java look and feel library for Swing + applications. This Java look and feel is available for JDK 5.0+ only. + +Package: substance-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: default-jdk-doc, + substance +Description: cross-platform look & feel for Swing applications - documentation + The goal of this project is to provide a configurable and + customizable production-quality Java look and feel library for Swing + applications. This Java look and feel is available for JDK 5.0+ only. + . + This package contains API documentation (Javadoc) for substance. + +Package: substance-flamingo +Architecture: all +Depends: ${misc:Depends} +Recommends: libflamingo-java, substance +Suggests: substance-flamingo-doc +Description: Substance Flamingo plugin + The goal of this project is to provide a consistent apperance for + Flamingo components (see libflamingo-java) under the substance + Substance (see substance) look-and-feel. This requires a JDK version + 5.0+. + +Package: substance-flamingo-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: substance-flamingo, libflamingo-java-doc, substance-doc +Suggests: default-jdk-doc +Description: Substance Flamingo plugin (documentation) + The goal of this project is to provide a consistent apperance for + Flamingo components (see libflamingo-java) under the substance + Substance (see substance) look-and-feel. This requires a JDK version + 5.0+. + This package contains API documentation (Javadoc) for substance-flamingo. + +Package: substance-swingx +Architecture: all +Depends: ${misc:Depends} +Recommends: libswingx-java, substance +Suggests: substance-swingx-doc +Description: Swingx componennts for substance L&F + The goal of this project is to provide a consistent apperance + for SwingX components (see libswingx-java) under the substance + (see substance) look-and-feel. + +Package: substance-swingx-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Recommends: substance-swingx, libswingx-java-doc, substance-doc +Suggests: default-jdk-doc +Description: Swingx componennts for substance L&F (documentation) + The goal of this project is to provide a consistent apperance + for SwingX components (see libswingx-java) under the substance + (see substance) look-and-feel. + This package contains API documentation (Javadoc) for substance-swingx. + +Package: libtrident-java +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} +Suggests: libtrident-java-doc +Description: Animation library for Java applications + The main goal of Trident project is to provide a general + purpose animation library for Java applications. Animations + are a natural fit for modern client applications, and + Trident has special built-in support for Java based UI + toolkits such as Swing and SWT. + The classes for the Android are not included. + +Package: libtrident-java-doc +Section: doc +Architecture: all +Depends: ${java:Depends}, ${misc:Depends} +Recommends: ${java:Recommends} +Suggests: default-jdk-doc, + libtrident-java +Description: Animation library for Java applications (documentation) + The main goal of Trident project is to provide a general + purpose animation library for Java applications. Animations + are a natural fit for modern client applications, and + Trident has special built-in support for Java based UI + toolkits such as Swing and SWT. + . + This package contains API documentation (Javadoc) for libtrident-java. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..8d526b9 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.markdown diff --git a/debian/patches/asm5.patch b/debian/patches/asm5.patch new file mode 100644 index 0000000..40f2a09 --- /dev/null +++ b/debian/patches/asm5.patch @@ -0,0 +1,305 @@ +Description: move package from ASM2 to ASM5/libasm4-java (older versions + will be removed from Debian) +Author: Felix Natter <[email protected]> +Forwarded: no (upstream is currently not active) +Reviewed-by: Remi Forax <[email protected]> (http://mail.ow2.org/wws/arc/asm/2015-10/msg00004.html) +Last-Update: 2015-10-24 +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/ContainerGhostingAugmenter.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/ContainerGhostingAugmenter.java +@@ -54,7 +54,7 @@ + * + * @author Kirill Grouchnikov. + */ +- protected class AugmentClassAdapter extends ClassAdapter implements Opcodes { ++ protected class AugmentClassAdapter extends ClassVisitor implements Opcodes { + /** + * Contains all method names. + */ +@@ -99,7 +99,7 @@ + public AugmentClassAdapter(final ClassVisitor cv, + Set<String> existingMethods, Set<String> existingFields, + Method methodToAugment, boolean toInjectAfterOriginal) { +- super(cv); ++ super(Opcodes.ASM4, cv); + this.existingMethods = existingMethods; + this.existingFields = existingFields; + this.methodToAugment = methodToAugment; +@@ -374,7 +374,7 @@ + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); + InfoClassVisitor infoAdapter = new InfoClassVisitor(); +- cr.accept(infoAdapter, false); ++ cr.accept(infoAdapter, 0); + existingMethods = infoAdapter.getMethods(); + existingFields = infoAdapter.getFields(); + } catch (Exception e) { +@@ -401,10 +401,10 @@ + try { + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); +- ClassWriter cw = new ClassWriter(false); ++ ClassWriter cw = new ClassWriter(0); + ClassVisitor cv = new AugmentClassAdapter(cw, existingMethods, + existingFields, methodToAugment, toInjectAfterOriginal); +- cr.accept(cv, false); ++ cr.accept(cv, 0); + b = cw.toByteArray(); + } catch (Exception e) { + throw new AugmentException(name, e); +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/IconGhostingAugmenter.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/IconGhostingAugmenter.java +@@ -58,7 +58,7 @@ + * + * @author Kirill Grouchnikov. + */ +- protected class AugmentClassAdapter extends ClassAdapter implements Opcodes { ++ protected class AugmentClassAdapter extends ClassVisitor implements Opcodes { + /** + * Contains all method names. + */ +@@ -100,7 +100,7 @@ + Method methodToAugment// , + // Method methodInstallListeners, Method methodUninstallListeners + ) { +- super(cv); ++ super(Opcodes.ASM4, cv); + this.existingMethods = existingMethods; + this.existingFields = existingFields; + this.methodToAugment = methodToAugment; +@@ -595,7 +595,7 @@ + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); + InfoClassVisitor infoAdapter = new InfoClassVisitor(); +- cr.accept(infoAdapter, false); ++ cr.accept(infoAdapter, 0); + existingMethods = infoAdapter.getMethods(); + existingFields = infoAdapter.getFields(); + } catch (Exception e) { +@@ -621,12 +621,12 @@ + try { + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); +- ClassWriter cw = new ClassWriter(false); ++ ClassWriter cw = new ClassWriter(0); + ClassVisitor cv = new AugmentClassAdapter(cw, existingMethods, + existingFields, methodToAugment// , methodInstallListeners, + // methodUninstallListeners); + ); +- cr.accept(cv, false); ++ cr.accept(cv, 0); + b = cw.toByteArray(); + } catch (Exception e) { + throw new AugmentException(name, e); +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/LafMainClassAugmenter.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/LafMainClassAugmenter.java +@@ -67,7 +67,7 @@ + * + * @author Kirill Grouchnikov + */ +- protected class AugmentClassAdapter extends ClassAdapter implements Opcodes { ++ protected class AugmentClassAdapter extends ClassVisitor implements Opcodes { + /** + * Contains all method names. + */ +@@ -99,7 +99,7 @@ + */ + public AugmentClassAdapter(ClassVisitor cv, + Set<String> existingMethods, Method originalMethod) { +- super(cv); ++ super(Opcodes.ASM4, cv); + this.existingMethods = existingMethods; + // this.originalMethod = originalMethod; + } +@@ -304,7 +304,7 @@ + ClassReader cr = new ClassReader(is); + // ClassWriter cw = new ClassWriter(false); + InfoClassVisitor infoAdapter = new InfoClassVisitor(); +- cr.accept(infoAdapter, false); ++ cr.accept(infoAdapter, 0); + existingMethods = infoAdapter.getMethods(); + } catch (Exception e) { + e.printStackTrace(); +@@ -322,10 +322,10 @@ + try { + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); +- ClassWriter cw = new ClassWriter(false); ++ ClassWriter cw = new ClassWriter(0); + AugmentClassAdapter cv = new AugmentClassAdapter(cw, + existingMethods, origMethod); +- cr.accept(cv, false); ++ cr.accept(cv, 0); + b = cw.toByteArray(); + superClassName = cv.getSuperClassName(); + } catch (Exception e) { +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateAugmenter.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateAugmenter.java +@@ -49,7 +49,7 @@ + import javax.swing.JComponent; + import javax.swing.plaf.ComponentUI; + +-import org.objectweb.asm.ClassAdapter; ++//import org.objectweb.asm.ClassAdapter; + import org.objectweb.asm.ClassReader; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.ClassWriter; +@@ -80,7 +80,7 @@ + * + * @author Kirill Grouchnikov + */ +- protected class AugmentClassAdapter extends ClassAdapter implements Opcodes { ++ protected class AugmentClassAdapter extends ClassVisitor implements Opcodes { + /** + * Contains all method names. + */ +@@ -118,7 +118,7 @@ + public AugmentClassAdapter(final ClassVisitor cv, + Set<String> existingMethods, Set<String> existingFields, + Map<String, Method> methodsToAugment) { +- super(cv); ++ super(Opcodes.ASM4, cv); + this.existingMethods = existingMethods; + this.existingFields = existingFields; + this.methodsToAugment = methodsToAugment; +@@ -550,7 +550,7 @@ + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); + InfoClassVisitor infoAdapter = new InfoClassVisitor(); +- cr.accept(infoAdapter, false); ++ cr.accept(infoAdapter, 0); + existingMethods = infoAdapter.getMethods(); + existingFields = infoAdapter.getFields(); + } catch (Exception e) { +@@ -576,10 +576,10 @@ + try { + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); +- ClassWriter cw = new ClassWriter(false); ++ ClassWriter cw = new ClassWriter(0); + ClassVisitor cv = new AugmentClassAdapter(cw, existingMethods, + existingFields, methodsToAugment); +- cr.accept(cv, false); ++ cr.accept(cv, 0); + b = cw.toByteArray(); + } catch (Exception e) { + throw new AugmentException(name, e); +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateUpdateAugmenter.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateUpdateAugmenter.java +@@ -45,7 +45,7 @@ + import javax.swing.JComponent; + import javax.swing.plaf.ComponentUI; + +-import org.objectweb.asm.ClassAdapter; ++//import org.objectweb.asm.ClassAdapter; + import org.objectweb.asm.ClassReader; + import org.objectweb.asm.ClassVisitor; + import org.objectweb.asm.ClassWriter; +@@ -69,7 +69,7 @@ + * + * @author Kirill Grouchnikov + */ +- protected class AugmentClassAdapter extends ClassAdapter implements Opcodes { ++ protected class AugmentClassAdapter extends ClassVisitor implements Opcodes { + /** + * Contains all method names. + */ +@@ -97,7 +97,7 @@ + */ + public AugmentClassAdapter(final ClassVisitor cv, + Set<String> existingMethods, Method updateMethod) { +- super(cv); ++ super(Opcodes.ASM4, cv); + this.existingMethods = existingMethods; + this.updateMethod = updateMethod; + } +@@ -297,7 +297,7 @@ + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); + InfoClassVisitor infoAdapter = new InfoClassVisitor(); +- cr.accept(infoAdapter, false); ++ cr.accept(infoAdapter, 0); + existingMethods = infoAdapter.getMethods(); + } catch (Exception e) { + throw new AugmentException(name, e); +@@ -313,10 +313,10 @@ + try { + is = new FileInputStream(resource); + ClassReader cr = new ClassReader(is); +- ClassWriter cw = new ClassWriter(false); ++ ClassWriter cw = new ClassWriter(0); + ClassVisitor cv = new AugmentClassAdapter(cw, existingMethods, + updateMethod); +- cr.accept(cv, false); ++ cr.accept(cv, 0); + b = cw.toByteArray(); + } catch (Exception e) { + throw new AugmentException(name, e); +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/InfoClassVisitor.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/InfoClassVisitor.java +@@ -32,14 +32,14 @@ + import java.util.*; + + import org.objectweb.asm.*; +-import org.objectweb.asm.commons.EmptyVisitor; ++//import org.objectweb.asm.commons.EmptyVisitor; + + /** + * Gathers information on all methods and fields of some class. + * + * @author Kirill Grouchnikov + */ +-public class InfoClassVisitor extends EmptyVisitor implements Opcodes { ++public class InfoClassVisitor extends /*EmptyVisitor*/ClassVisitor implements Opcodes { + /** + * All method names. + */ +@@ -54,6 +54,7 @@ + * Creates a new visitor. + */ + public InfoClassVisitor() { ++ super(Opcodes.ASM4); + this.methods = new HashSet<String>(); + this.fields = new HashSet<String>(); + } +@@ -69,7 +70,8 @@ + public MethodVisitor visitMethod(final int access, final String name, + final String desc, final String signature, final String[] exceptions) { + this.methods.add(name); +- return this; ++ //return this; ++ return new MethodVisitor(Opcodes.ASM4) {}; + } + + /* +@@ -83,7 +85,8 @@ + public FieldVisitor visitField(int access, String name, String desc, + String signature, Object value) { + this.fields.add(name); +- return this; ++ //return this; ++ return new FieldVisitor(Opcodes.ASM4) {}; + } + + /** +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateWriterEmptyCtr.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateWriterEmptyCtr.java +@@ -42,7 +42,7 @@ + * Creates a new bytecode writer. + */ + public UiDelegateWriterEmptyCtr() { +- super(false); ++ super(0); + } + + /** +--- a/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateWriterOneParamCtr.java ++++ b/laf-widget/src/main/java/org/pushingpixels/lafwidget/ant/UiDelegateWriterOneParamCtr.java +@@ -42,7 +42,7 @@ + * Creates a new bytecode writer. + */ + public UiDelegateWriterOneParamCtr() { +- super(false); ++ super(0); + } + + /** diff --git a/debian/patches/build_usr_share_java.patch b/debian/patches/build_usr_share_java.patch new file mode 100644 index 0000000..05cbf13 --- /dev/null +++ b/debian/patches/build_usr_share_java.patch @@ -0,0 +1,149 @@ +Description: Replace external dependencies by Debian package artifacts, + disable build of tools, do not build tests as they can't be run + without fest-swing +Author: Felix Natter <[email protected]> +Forwarded: not-needed +Last-Update: 2015-06-01 +--- a/build.gradle ++++ b/build.gradle +@@ -36,6 +36,7 @@ + maven { url 'https://oss.sonatype.org/content/groups/staging' } + mavenCentral() + maven { url new File(System.getProperty('user.home'), '.m2/repository').toURI().toString() } ++ flatDir name: '/usr/share/java', dir: '/usr/share/java' + } + + task sourceJar(type: Jar) { +--- a/trident/build.gradle ++++ b/trident/build.gradle +@@ -1,7 +1,9 @@ + dependencies { + compile group: 'com.google.android', name: 'android', version: '2.3.1', transitive: false +- compile group: 'org.eclipse.swt.win32.win32', name: 'x86', version: '3.3.0-v3346', transitive: false +- compile group: 'net.jcip', name:'jcip-annotations', version: '1.0' ++ //compile group: 'org.eclipse.swt.win32.win32', name: 'x86', version: '3.3.0-v3346', transitive: false ++ compile ':swt' ++ //compile group: 'net.jcip', name:'jcip-annotations', version: '1.0' ++ compile ':jcip-annotations-1.0' + } + + jar { +--- a/laf-widget/build.gradle ++++ b/laf-widget/build.gradle +@@ -1,7 +1,10 @@ + dependencies { + compile project(":trident") +- compile group: 'asm', name: 'asm-all', version: '2.2.3' +- compile group: 'org.apache.ant', name: 'ant', version: '1.7.0' ++ //compile group: 'asm', name: 'asm-all', version: '2.2.3' ++ compile ':asm4' ++ compile ':asm4-commons' ++ //compile group: 'org.apache.ant', name: 'ant', version: '1.7.0' ++ compile ':ant' + } + + jar { +--- a/substance/build.gradle ++++ b/substance/build.gradle +@@ -20,10 +20,13 @@ + compile project(path: ":trident") + compile project(path: ":laf-widget", transitive: false) + compile project(path: ":laf-plugin", transitive: false) ++ // we cannot run tests so we don't compile them + testCompile group: 'com.jgoodies', name: 'forms', version: '1.2.0' + testCompile group: 'org.swinglabs.swingx', name: 'swingx-core', version: '1.6.3' +- toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' +- toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ //toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' ++ //toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ toolsCompile ':asm4' ++ toolsCompile ':asm4-commons' + } + + task augmentation(dependsOn: classes) { +@@ -105,6 +108,7 @@ + } + + task testJar(type: Jar) { ++ enabled = false + classifier = 'tst' + + from sourceSets.test.output +@@ -118,6 +122,8 @@ + } + + task testLiteJar(type: Jar) { ++ enabled = false ++ + classifier = 'tst-lite' + + from sourceSets.test.output +@@ -235,3 +241,6 @@ + debug = Boolean.valueOf(System.getProperty('debug', 'false')) + classpath = sourceSets.test.runtimeClasspath + } ++ ++compileTestJava.enabled = false ++compileToolsJava.enabled = false +\ No newline at end of file +--- a/substance-flamingo/build.gradle ++++ b/substance-flamingo/build.gradle +@@ -18,8 +18,10 @@ + testCompile project(":flamingo").sourceSets.test.output + testCompile group: 'com.jgoodies', name: 'forms', version: '1.2.0' + toolsCompile project(":substance") +- toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' +- toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ //toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' ++ //toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ toolsCompile ':asm4' ++ toolsCompile ':asm4-commons' + } + + task augmentation(dependsOn: classes) { +@@ -140,12 +142,14 @@ + } + + task testSubstanceRibbon(type: JavaExec) { ++ enabled = false + main = 'test.substance.ribbon.NewCheckRibbon' + debug = Boolean.valueOf(System.getProperty('debug', 'false')) + classpath = sourceSets.test.runtimeClasspath + } + + task testSubstanceRibbonRTL(type: JavaExec) { ++ enabled = false + main = 'test.substance.ribbon.NewCheckRibbon' + debug = Boolean.valueOf(System.getProperty('debug', 'false')) + classpath = sourceSets.test.runtimeClasspath +--- a/substance-swingx/build.gradle ++++ b/substance-swingx/build.gradle +@@ -19,8 +19,10 @@ + testCompile project(":substance").sourceSets.test.output + testCompile group: 'com.jgoodies', name: 'forms', version: '1.2.0' + toolsCompile project(":substance").sourceSets.tools.output +- toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' +- toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ //toolsCompile group: 'org.easytesting', name: 'fest-swing', version: '1.2.1' ++ //toolsCompile group: 'asm', name: 'asm-all', version: '2.2.3' ++ toolsCompile ':asm4' ++ toolsCompile ':asm4-commons' + } + + task augmentation(dependsOn: classes) { +@@ -69,6 +71,7 @@ + } + + task testJar(type: Jar) { ++ enabled = false + classifier = 'tst' + + from sourceSets.test.output +@@ -134,6 +137,7 @@ + } + + task testCheckX(type: JavaExec) { ++ enabled = false + main = 'test.Check' + debug = Boolean.valueOf(System.getProperty('debug', 'false')) + classpath = sourceSets.test.runtimeClasspath diff --git a/debian/patches/javadoc_encoding.patch b/debian/patches/javadoc_encoding.patch new file mode 100644 index 0000000..ae6a489 --- /dev/null +++ b/debian/patches/javadoc_encoding.patch @@ -0,0 +1,16 @@ +Description: Set javadoc encoding to UTF-8 +Author: Felix Natter <[email protected]> +Forwarded: not-needed +Last-Update: 2015-06-13 + +--- a/build.gradle ++++ b/build.gradle +@@ -14,6 +14,8 @@ + apply plugin: 'maven' + apply plugin: 'signing' + ++ javadoc.options.encoding = "UTF-8" ++ + group = 'com.github.insubstantial' + version = '7.3' + ext.versionKey = "7.3-destroyer" diff --git a/debian/patches/no_android.patch b/debian/patches/no_android.patch new file mode 100644 index 0000000..f161115 --- /dev/null +++ b/debian/patches/no_android.patch @@ -0,0 +1,124 @@ +Description: Do not build android parts of trident +Author: Andrew Ross <[email protected]> +Origin: other +Forwarded: not-needed +Last-Update: 2011-03-29 +--- a/trident/build.gradle ++++ b/trident/build.gradle +@@ -1,5 +1,5 @@ + dependencies { +- compile group: 'com.google.android', name: 'android', version: '2.3.1', transitive: false ++ //compile group: 'com.google.android', name: 'android', version: '2.3.1', transitive: false + //compile group: 'org.eclipse.swt.win32.win32', name: 'x86', version: '3.3.0-v3346', transitive: false + compile ':swt' + //compile group: 'net.jcip', name:'jcip-annotations', version: '1.0' +--- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintCallback.java ++++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintCallback.java +@@ -27,7 +27,7 @@ + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +-package org.pushingpixels.trident.android; ++/*package org.pushingpixels.trident.android; + + import org.pushingpixels.trident.Timeline.TimelineState; + import org.pushingpixels.trident.callback.RunOnUIThread; +@@ -74,3 +74,4 @@ + this.rect.right, this.rect.bottom); + } + } ++*/ +--- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintTimeline.java ++++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintTimeline.java +@@ -27,7 +27,7 @@ + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +-package org.pushingpixels.trident.android; ++/*package org.pushingpixels.trident.android; + + import org.pushingpixels.trident.Timeline; + +@@ -78,4 +78,4 @@ + } + super.playLoop(loopCount, repeatBehavior); + } +-} +\ No newline at end of file ++}*/ +--- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidToolkitHandler.java ++++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidToolkitHandler.java +@@ -27,7 +27,7 @@ + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +-package org.pushingpixels.trident.android; ++/*package org.pushingpixels.trident.android; + + import org.pushingpixels.trident.UIToolkitHandler; + +@@ -49,3 +49,4 @@ + ((View) mainTimelineObject).post(runnable); + } + } ++*/ +--- a/trident/src/main/java/org/pushingpixels/trident/android/TimelineAsyncTask.java ++++ b/trident/src/main/java/org/pushingpixels/trident/android/TimelineAsyncTask.java +@@ -27,7 +27,7 @@ + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +-package org.pushingpixels.trident.android; ++/*package org.pushingpixels.trident.android; + + import org.pushingpixels.trident.TimelineScenario; + +@@ -50,3 +50,4 @@ + throw new UnsupportedOperationException(); + } + } ++*/ +--- a/trident/src/main/resources/META-INF/trident-plugin.properties ++++ b/trident/src/main/resources/META-INF/trident-plugin.properties +@@ -4,7 +4,7 @@ + UIToolkitHandler=org.pushingpixels.trident.swt.SWTToolkitHandler + PropertyInterpolatorSource=org.pushingpixels.trident.swt.SWTPropertyInterpolators + +-UIToolkitHandler=org.pushingpixels.trident.android.AndroidToolkitHandler +-PropertyInterpolatorSource=org.pushingpixels.trident.android.AndroidPropertyInterpolators ++#UIToolkitHandler=org.pushingpixels.trident.android.AndroidToolkitHandler ++#PropertyInterpolatorSource=org.pushingpixels.trident.android.AndroidPropertyInterpolators + + PropertyInterpolatorSource=org.pushingpixels.trident.interpolator.CorePropertyInterpolators +\ No newline at end of file +--- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java ++++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java +@@ -27,7 +27,7 @@ + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +-package org.pushingpixels.trident.android; ++/*package org.pushingpixels.trident.android; + + import java.util.*; + +@@ -35,12 +35,13 @@ + import org.pushingpixels.trident.interpolator.PropertyInterpolatorSource; + + import android.graphics.*; +- ++*/ + /** + * Built-in interpolators for Android classes. + * + * @author Kirill Grouchnikov + */ ++/* + public class AndroidPropertyInterpolators implements PropertyInterpolatorSource { + private Set<PropertyInterpolator> interpolators; + +@@ -162,3 +163,4 @@ + } + } + } ++*/ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..acb3604 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +build_usr_share_java.patch +no_android.patch +version.patch +javadoc_encoding.patch +asm5.patch diff --git a/debian/patches/version.patch b/debian/patches/version.patch new file mode 100644 index 0000000..b6d1398 --- /dev/null +++ b/debian/patches/version.patch @@ -0,0 +1,23 @@ +Description: revert to last stable version / remove SNAPSHOT +Author: Felix Natter <[email protected]> +Origin: other +Forwarded: not-needed +Last-Update: 2015-06-01 +--- a/build.gradle ++++ b/build.gradle +@@ -1,5 +1,5 @@ + group = 'com.github.insubstantial' +-version = '7.3.1-SNAPSHOT' ++version = '7.3' + + if (JavaVersion.current().isJava8Compatible()) { + allprojects { +@@ -15,7 +15,7 @@ + apply plugin: 'signing' + + group = 'com.github.insubstantial' +- version = '7.3.1-SNAPSHOT' ++ version = '7.3' + ext.versionKey = "7.3-destroyer" + + sourceCompatibility = 1.6 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/insubstantial.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
