This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository insubstantial.
commit d73946fd31c2509875b0487cc20102f7915ef932 Author: Emmanuel Bourg <[email protected]> Date: Thu Aug 4 10:13:52 2016 +0200 Use substitution rules instead of a patch for building with the system jars Transition to libswt-gtk-4-java --- debian/changelog | 8 ++ debian/control | 2 +- debian/maven.ignoreRules | 4 + debian/maven.rules | 4 + debian/patches/build_usr_share_java.patch | 149 ------------------------------ debian/patches/no_android.patch | 9 -- debian/patches/series | 1 - debian/rules | 2 +- 8 files changed, 18 insertions(+), 161 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2b45753..023d621 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +insubstantial (7.3+dfsg3-2) UNRELEASED; urgency=medium + + * Team upload. + * Transition to libswt-gtk-4-java + * Use substitution rules instead of a patch for building with the system jars + + -- Emmanuel Bourg <[email protected]> Thu, 04 Aug 2016 09:59:55 +0200 + insubstantial (7.3+dfsg3-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 914835d..3bbfdc6 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), libasm4-java, libjcip-annotations-java, libswingx-java, - libswt-gtk-3-java, + libswt-gtk-4-java, maven-repo-helper Standards-Version: 3.9.8 Homepage: https://github.com/Insubstantial/insubstantial diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..eb2ccca --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,4 @@ + +com.google.android android * * * * +org.easytesting fest-swing * * * * +com.jgoodies forms * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..46cdc6d --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,4 @@ + +s/asm/org.ow2.asm/ asm-all * s/.*/debian/ * * +s/org.eclipse.swt.win32.win32/org.eclipse.swt/ s/x86/org.eclipse.swt/ * s/.*/debian/ * * +s/org.swinglabs.swingx/org.swinglabs/ swingx-core * s/.*/1.x/ * * diff --git a/debian/patches/build_usr_share_java.patch b/debian/patches/build_usr_share_java.patch deleted file mode 100644 index 05cbf13..0000000 --- a/debian/patches/build_usr_share_java.patch +++ /dev/null @@ -1,149 +0,0 @@ -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/no_android.patch b/debian/patches/no_android.patch index f161115..770f80a 100644 --- a/debian/patches/no_android.patch +++ b/debian/patches/no_android.patch @@ -3,15 +3,6 @@ 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 @@ diff --git a/debian/patches/series b/debian/patches/series index acb3604..a6344ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -build_usr_share_java.patch no_android.patch version.patch javadoc_encoding.patch diff --git a/debian/rules b/debian/rules index 7528c69..f8578ca 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ dh $@ --with maven_repo_helper --buildsystem=gradle override_dh_auto_build: - dh_auto_build -- -x test check assemble + dh_auto_build -- -x test check assemble -x :substance:compileToolsJava # Get original sources directly using uscan get-orig-source: -- 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
