This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libgpars-groovy-java.
commit 0272610f5c6106b9ab62fc52422eaec18e448beb Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 15 23:52:03 2015 +0200 Build with gradle-debian-helper --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/maven.ignoreRules | 12 ++++++++++++ debian/maven.rules | 1 + debian/patches/fix_gradle_build.diff | 27 --------------------------- debian/rules | 10 ++++------ 6 files changed, 25 insertions(+), 34 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f1ec64..a48c80f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgpars-groovy-java (1.2.1-4) UNRELEASED; urgency=medium + + * Team upload. + * Build with gradle-debian-helper + + -- Emmanuel Bourg <[email protected]> Thu, 15 Oct 2015 22:20:07 +0200 + libgpars-groovy-java (1.2.1-3) unstable; urgency=medium * Fix FTBFS error with Gradle 2.5. (Closes: #795738). diff --git a/debian/control b/debian/control index 64dc7db..15002ca 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), libnetty-3.9-java, libjsr166y-java (>= 1.7.0~), libjcsp-java, - gradle, + gradle-debian-helper, libmultiverse-core-java, libosgi-core-java Standards-Version: 3.9.6 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..929f0ad --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,12 @@ +com.google.code.gson gson * * * * +com.google.guava guava * * * * +commons-lang commons-lang * * * * +commons-logging commons-logging * * * * +junit junit * * * * +net.sourceforge.cobertura cobertura * * * * +org.apache.maven.wagon wagon-http-lightweight * * * * +org.grails grails-docs * * * * +org.spockframework spock-core * * * * +org.xhtmlrenderer core-renderer * * * * +org.yaml snakeyaml * * * * +radeox radeox * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..b961384 --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1 @@ +s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * * diff --git a/debian/patches/fix_gradle_build.diff b/debian/patches/fix_gradle_build.diff index 21afa22..561d244 100644 --- a/debian/patches/fix_gradle_build.diff +++ b/debian/patches/fix_gradle_build.diff @@ -19,33 +19,6 @@ Last-Update: 2013-09-06 task copyDSLDefinitions(type: Copy) { into "$buildDir/classes/main" -@@ -92,11 +95,14 @@ - if (project.hasProperty('gpars_useMavenLocal') && gpars_useMavenLocal) { - mavenLocal() - } -- mavenCentral() -+ //mavenCentral() - //maven { - //url 'http://download.java.net/maven/2' - //url 'http://oss.sonatype.org/content/repositories/snapshots' // For Spock SNAPSHOT artefacts. - //} -+ maven { -+ url 'file:///usr/share/maven-repo/' -+ } - } - - configurations { -@@ -117,8 +123,8 @@ - compile group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.1.9' - compile 'org.codehaus.jsr166-mirror:jsr166y:1.7.0' - compile('org.multiverse:multiverse-core:0.7.0') { transitive = false } -- compile group: 'org.jboss.netty', name: 'netty', version: project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : '3.2.9.Final' -- compile 'org.codehaus.jcsp:jcsp:1.1-rc5' -+ compile group: 'io.netty', name: 'netty', version: project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : 'debian' -+ compile 'org.codehaus.jcsp:jcsp:1.1-rc4' - testCompile group: 'junit', name: 'junit', version: project.hasProperty('gpars_junitVersion') ? gpars_junitVersion : '4.11' - testCompile group: 'org.spockframework', name: 'spock-core', version: project.hasProperty('gpars_spockVersion') ? gpars_spockVersion : '0.7-groovy-2.0' - testCompile 'com.google.code.gson:gson:2.2.2' @@ -129,10 +135,12 @@ docs group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.0.8' docs 'org.yaml:snakeyaml:1.12' diff --git a/debian/rules b/debian/rules index 38f726f..d32ee6c 100755 --- a/debian/rules +++ b/debian/rules @@ -4,18 +4,16 @@ export JAVA_HOME=/usr/lib/jvm/default-java UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n '/^Version:/s/^[^:]*: \(.*\)-.*$$/\1/p') %: - dh $@ --with javahelper + dh $@ --with javahelper --buildsystem=gradle override_dh_auto_build: - gradle --project-prop finalRelease=true --stacktrace --offline assemble --gradle-user-home .gradle -Pgpars_groovyVersion=2.x + dh_auto_build -- --project-prop finalRelease=true -Pgpars_groovyVersion=2.x assemble override_dh_auto_install: jh_installlibs build/libs/gpars-${UPSTREAM_VERSION}.jar -override_dh_clean: - -gradle --project-prop finalRelease=true --stacktrace --offline clean --gradle-user-home .gradle - -rm -rf .gradle buildSrc/.gradle buildSrc/build ./build/ - dh_clean +override_dh_auto_clean: + -rm -rf .gradle build buildSrc/.gradle buildSrc/build get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgpars-groovy-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
