[libgpars-groovy-java] 02/02: Refreshed the patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Feb 18 23:43:37 UTC 2015
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 f32f1957b2c02a262a5c94b7d19a038960a0765a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Feb 19 00:38:00 2015 +0100
Refreshed the patch
---
debian/changelog | 6 +++-
debian/patches/fix_gradle_build.diff | 69 +++++++++++++++++-------------------
2 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 265005e..7abe185 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
libgpars-groovy-java (1.2.1-1) UNRELEASED; urgency=low
+ * Team upload.
+
[ Miguel Landaeta ]
* New upstream release.
* Switch build system from ant to gradle.
@@ -10,13 +12,15 @@ libgpars-groovy-java (1.2.1-1) UNRELEASED; urgency=low
libosgi-core-java.
[ Andreas Tille ]
- * Team upload
* Upstream release version 1.2.1
* cme fix dpkg-control
* debhelper 9
* drop unneeded d/orig-tar.sh
* Build-Depends: s/groovy/groovy2/
+ [ Emmanuel Bourg ]
+ * Refreshed the patch
+
-- Andreas Tille <tille at debian.org> Wed, 18 Feb 2015 13:20:30 +0100
libgpars-groovy-java (0.10-1) unstable; urgency=low
diff --git a/debian/patches/fix_gradle_build.diff b/debian/patches/fix_gradle_build.diff
index 3c89a20..0157d3e 100644
--- a/debian/patches/fix_gradle_build.diff
+++ b/debian/patches/fix_gradle_build.diff
@@ -3,9 +3,9 @@ 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
+--- a/build.gradle
++++ b/build.gradle
+@@ -51,10 +51,13 @@
def theVendor = 'gpars.org'
def theTitle = 'GPars: Groovy Parallel Systems'
@@ -19,27 +19,24 @@ Last-Update: 2013-09-06
task copyDSLDefinitions(type: Copy) {
into "$buildDir/classes/main"
-@@ -90,11 +93,15 @@ repositories {
+@@ -92,11 +95,14 @@
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 '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'
+@@ -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'
@@ -49,20 +46,20 @@ Last-Update: 2013-09-06
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 {
+@@ -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'
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 project.ext.grailsDocs
+ docs project.ext.radeox
+ docs project.ext.lowagieItext
+ docs project.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 {
+@@ -288,7 +296,9 @@
overview = new File('overview.html')
}
@@ -73,8 +70,8 @@ Last-Update: 2013-09-06
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
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
@@ -22,7 +22,8 @@
apply plugin: 'groovy'
@@ -84,21 +81,21 @@ Last-Update: 2013-09-06
+//apply from: '../gradle/docsDependencies.gradle'
repositories {
- mavenCentral()
-@@ -33,8 +34,10 @@ repositories {
+ mavenCentral()
+@@ -33,8 +34,10 @@
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 }
-+ */
+ compile localGroovy()
+ compile gradleApi()
++ /* Disabling the building of pdf guides due to missing dependencies
+ compile(project.ext.grailsDocs) { transitive = false }
+ compile(project.ext.xhtmlRenderer) { transitive = false }
+ compile(project.ext.lowagieItext) { transitive = false }
+ compile(project.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
+--- a/buildSrc/src/main/groovy/PdfGuide.groovy
++++ b/buildSrc/src/main/groovy/PdfGuide.groovy
+@@ -24,7 +24,8 @@
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.TaskAction
@@ -108,7 +105,7 @@ Last-Update: 2013-09-06
class PdfGuide extends DefaultTask {
-@@ -39,11 +40,13 @@ class PdfGuide extends DefaultTask {
+@@ -39,11 +40,13 @@
@TaskAction
def publish() {
try {
--
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