[libgpars-groovy-java] 02/02: Prepare 1.1.0-1 release
Miguel Landaeta
nomadium-guest at alioth.debian.org
Fri Sep 6 19:47:37 UTC 2013
This is an automated email from the git hooks/post-receive script.
nomadium-guest pushed a commit to branch master
in repository libgpars-groovy-java.
commit 84968bd4f387b8bfed349407f558dc4005938fe1
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Fri Sep 6 19:27:05 2013 -0300
Prepare 1.1.0-1 release
---
debian/build.properties | 6 --
debian/build.xml | 53 -------------
debian/changelog | 12 +--
debian/classpath-debian | 5 --
debian/control | 11 +--
debian/copyright | 8 +-
debian/libgpars-groovy-java-doc.install | 1 +
debian/libgpars-groovy-java-doc.javadoc | 2 +-
debian/libgpars-groovy-java.jlibs | 1 -
debian/patches/fix_gradle_build.diff | 124 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 11 ++-
debian/watch | 6 +-
13 files changed, 154 insertions(+), 87 deletions(-)
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index cdd8f60..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-dir.build=../target
-dir.src=../groovyx
-
-target=1.5
-source=1.5
-debug=on
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 5d854d2..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="build-gpars" default="package">
- <property file="build.properties"/>
-
- <path id="classpath">
- <fileset dir="/" includesfile="classpath-debian"/>
- </path>
-
- <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"
- classpathref="classpath"/>
-
- <taskdef name="groovydoc" classname="org.codehaus.groovy.ant.Groovydoc"
- classpathref="classpath"/>
-
- <target name="init">
- <mkdir dir="${dir.build}/classes"/>
- </target>
-
- <target name="clean">
- <delete dir="${dir.build}"/>
- </target>
-
- <target name="compile" depends="init">
- <groovyc
- srcdir="${dir.src}"
- destdir="${dir.build}/classes"
- classpathref="classpath"
- sourcepath="">
- <javac source="${source}" target="${target}" debug="${debug}"/>
- </groovyc>
- </target>
-
- <target name="jar" depends="compile">
- <jar
- destfile="${dir.build}/gpars.jar"
- basedir="${dir.build}/classes"
- includes="**"/>
- </target>
-
- <target name="groovydoc" depends="init">
- <groovydoc
- destdir="${dir.build}/groovydoc"
- sourcepath="${dir.src}"
- packagenames="**.*"
- use="true">
- <link packages="java.,org.xml.,javax.,org.xml."
- href="/usr/share/doc/default-jdk-doc/api/"/>
- </groovydoc>
- </target>
-
- <target name="package" depends="jar,groovydoc"/>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 7f3fa29..cf18fb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
-libgpars-groovy-java (0.12-1) UNRELEASED; urgency=low
-
- NOTE: Work in progress, this release Build-Depends on multiverse
- and it has not been packaged yet.
+libgpars-groovy-java (1.1.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Switch build system from ant to gradle.
* Update watch file.
- * Bump Standards-Version to 3.9.2. No changes were required.
+ * Bump Standards-Version to 3.9.4. No changes were required.
* Update dates in copyright file and make it DEP-5 compliant.
+ * Add Build-Depends on gradle, libmultiverse-core-java and
+ libosgi-core-java.
- -- Miguel Landaeta <miguel at miguel.cc> Thu, 20 Oct 2011 20:55:08 -0430
+ -- Miguel Landaeta <miguel at miguel.cc> Fri, 06 Sep 2013 19:05:02 -0300
libgpars-groovy-java (0.10-1) unstable; urgency=low
diff --git a/debian/classpath-debian b/debian/classpath-debian
deleted file mode 100644
index dcc7a54..0000000
--- a/debian/classpath-debian
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/java/groovy-all.jar
-usr/share/java/netty.jar
-usr/share/java/jsr166y.jar
-usr/share/java/extra166y.jar
-usr/share/java/jcsp.jar
diff --git a/debian/control b/debian/control
index 2f7aeb7..8c2961d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Miguel Landaeta <miguel at miguel.cc>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper, ant, groovy,
- libnetty-java, libjsr166y-java (>= 1.7.0~), libjcsp-java
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50), default-jdk, javahelper,
+ groovy (>= 2.0.8~), libnetty-java, libjsr166y-java (>= 1.7.0~), libjcsp-java,
+ gradle, libmultiverse-core-java, libosgi-core-java
+Standards-Version: 3.9.4
Homepage: http://gpars.codehaus.org/
-Vcs-Git: git://git.debian.org/git/pkg-java/libgpars-groovy-java.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/libgpars-groovy-java.git
+Vcs-Git: git://anonscm.debian.org/git/pkg-java/libgpars-groovy-java.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/libgpars-groovy-java.git
Package: libgpars-groovy-java
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 2c14eea..928335a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,15 +1,15 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: GPars
Upstream-Contact: Vaclav Pech <vaclav.pech at seznam.cz>
Source: http://gpars.codehaus.org/
Files: *
-Copyright: © 2008-2011, Vaclav Pech <vaclav.pech at seznam.cz>,
- © 2008-2011, The original author or authors.
+Copyright: © 2008-2013, Vaclav Pech <vaclav.pech at seznam.cz>,
+ © 2008-2013, The original author or authors.
License: Apache-2.0
Files: debian/*
-Copyright: © 2010-2011, Miguel Landaeta <miguel at miguel.cc>
+Copyright: © 2010-2011,2013 Miguel Landaeta <miguel at miguel.cc>
License: Apache-2.0
License: Apache-2.0
diff --git a/debian/libgpars-groovy-java-doc.install b/debian/libgpars-groovy-java-doc.install
new file mode 100644
index 0000000..d5eade8
--- /dev/null
+++ b/debian/libgpars-groovy-java-doc.install
@@ -0,0 +1 @@
+build/docs/groovydoc usr/share/doc/libgpars-groovy-java
diff --git a/debian/libgpars-groovy-java-doc.javadoc b/debian/libgpars-groovy-java-doc.javadoc
index 79aac37..2afeb39 100644
--- a/debian/libgpars-groovy-java-doc.javadoc
+++ b/debian/libgpars-groovy-java-doc.javadoc
@@ -1 +1 @@
-target/groovydoc usr/share/doc/libgpars-groovy-java/api
+build/docs/javadoc usr/share/doc/libgpars-groovy-java/api
diff --git a/debian/libgpars-groovy-java.jlibs b/debian/libgpars-groovy-java.jlibs
deleted file mode 100644
index 7065fce..0000000
--- a/debian/libgpars-groovy-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-target/gpars.jar
diff --git a/debian/patches/fix_gradle_build.diff b/debian/patches/fix_gradle_build.diff
new file mode 100644
index 0000000..3c89a20
--- /dev/null
+++ b/debian/patches/fix_gradle_build.diff
@@ -0,0 +1,124 @@
+Description: Use artifacts versions available in Debian and disable unavailable ones
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2013-09-06
+
+--- libgpars-groovy-java-1.1.0.orig/build.gradle
++++ libgpars-groovy-java-1.1.0/build.gradle
+@@ -49,10 +49,13 @@ targetCompatibility = 6
+ def theVendor = 'gpars.org'
+ def theTitle = 'GPars: Groovy Parallel Systems'
+
++// We are not building the pdf guides at this moment due to missing dependencies
++/*
+ apply {
+ from 'gradle/docs.gradle'
+ from 'gradle/docsDependencies.gradle'
+ }
++*/
+
+ task copyDSLDefinitions(type: Copy) {
+ into "$buildDir/classes/main"
+@@ -90,11 +93,15 @@ repositories {
+ if (project.hasProperty('gpars_useMavenLocal') && gpars_useMavenLocal) {
+ mavenLocal()
+ }
+- mavenCentral()
+- maven {
+- url 'http://download.java.net/maven/2'
++ //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/'
+ }
++//, "file:///home/miguel/libgpars-groovy-java/maven-repo/"]
+ }
+
+ configurations {
+@@ -115,8 +122,8 @@ dependencies {
+ groovy group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.0.8'
+ 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: 'org.jboss.netty', name: 'netty', version: project.hasProperty('gpars_nettyVersion') ? gpars_nettyVersion : '3.2.6.Final'
++ 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'
+@@ -127,10 +134,12 @@ dependencies {
+ docs group: 'org.codehaus.groovy', name: 'groovy-all', version: project.hasProperty('gpars_groovyVersion') ? gpars_groovyVersion : '2.0.8'
+ docs 'org.yaml:snakeyaml:1.12'
+ docs 'commons-lang:commons-lang:2.6'
++ /* Disabling the build of pdf guides due to missing dependencies
+ docs ext.grailsDocs
+ docs ext.radeox
+ docs ext.lowagieItext
+ docs ext.xhtmlRenderer
++ */
+ docs 'commons-logging:commons-logging:1.1.1'
+ deployerJars "org.apache.maven.wagon:wagon-http-lightweight:2.4"
+ cover 'net.sourceforge.cobertura:cobertura:1.9.4.1'
+@@ -275,7 +284,9 @@ groovydoc {
+ overview = new File('overview.html')
+ }
+
+-task documentation(dependsOn: ['javadoc', 'groovydoc', 'buildGuide', 'pdfGuide'], description: 'Create the API documentation.')
++// Only build javadocs as documentation
++//task documentation(dependsOn: ['javadoc', 'groovydoc', 'buildGuide', 'pdfGuide'], description: 'Create the API documentation.')
++task documentation(dependsOn: ['javadoc', 'groovydoc'], description: 'Create the API documentation.')
+
+ task zipDoc(type: Jar, dependsOn: 'documentation') {
+ classifier = 'javadoc'
+--- libgpars-groovy-java-1.1.0.orig/buildSrc/build.gradle
++++ libgpars-groovy-java-1.1.0/buildSrc/build.gradle
+@@ -22,7 +22,8 @@
+
+ apply plugin: 'groovy'
+
+-apply from: '../gradle/docsDependencies.gradle'
++// Don't build pdf guides due to missing dependencies
++//apply from: '../gradle/docsDependencies.gradle'
+
+ repositories {
+ mavenCentral()
+@@ -33,8 +34,10 @@ repositories {
+ dependencies {
+ groovy localGroovy()
+ compile gradleApi()
++ /* Disabling the building of pdf guides due to missing dependencies
+ compile(ext.grailsDocs) { transitive = false }
+ compile(ext.xhtmlRenderer) { transitive = false }
+ compile(ext.lowagieItext) { transitive = false }
+ compile(ext.radeox) { transitive = false }
++ */
+ }
+--- libgpars-groovy-java-1.1.0.orig/buildSrc/src/main/groovy/PdfGuide.groovy
++++ libgpars-groovy-java-1.1.0/buildSrc/src/main/groovy/PdfGuide.groovy
+@@ -24,7 +24,8 @@ import org.gradle.api.DefaultTask
+ import org.gradle.api.tasks.Input
+ import org.gradle.api.tasks.OutputDirectory
+ import org.gradle.api.tasks.TaskAction
+-import grails.doc.PdfBuilder
++// Grails isn't available in Debian yet
++//import grails.doc.PdfBuilder
+
+ class PdfGuide extends DefaultTask {
+
+@@ -39,11 +40,13 @@ class PdfGuide extends DefaultTask {
+ @TaskAction
+ def publish() {
+ try {
++ /* Grails isn't available in Debian yet
+ PdfBuilder.build(
+ basedir: outputDirectory.absolutePath,
+ home: project.file('grails-doc').absolutePath,
+ tool: 'pdf/gpars'
+ )
++ */
+ } catch (ignore) {
+ // it's very likely that the stream is closed before
+ // the renderer 'finishes' but it actually does
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..10474f9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_gradle_build.diff
diff --git a/debian/rules b/debian/rules
index 1609791..63b60d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,21 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n '/^Version:/s/^[^:]*: \(.*\)-.*$$/\1/p')
%:
dh $@ --with javahelper
-override_jh_build:
- ant -f debian/build.xml
+override_dh_auto_build:
+ gradle --project-prop finalRelease=true --stacktrace --offline assemble
+
+override_dh_auto_install:
+ jh_installlibs build/libs/gpars-${UPSTREAM_VERSION}.jar
override_dh_clean:
+ -gradle --project-prop finalRelease=true --stacktrace --offline clean
+ -rm -rf .gradle buildSrc/.gradle buildSrc/build
dh_clean
- ant -f debian/build.xml clean
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
diff --git a/debian/watch b/debian/watch
index a2edb0c..c58494c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-opts="uversionmangle=s/-(beta)-/~$1/" \
-http://repo1.maven.org/maven2/org/codehaus/gpars/gpars/ (\d[0-9\w\.\-]+)/ \
- debian debian/orig-tar.sh
+opts="uversionmangle=s/-rc/~rc/" \
+https://github.com/GPars/GPars/tags \
+.*/archive/\w+-?(\d\S*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgpars-groovy-java.git
More information about the pkg-java-commits
mailing list