This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libspring-java.
commit 0c794513cec41a6d38f4eb62721901174c70d1c4 Author: Emmanuel Bourg <[email protected]> Date: Tue May 24 10:27:42 2016 +0200 Refreshed the patches --- debian/changelog | 8 ++++++++ debian/patches/0003_no_ibm_websphere.diff | 2 +- debian/patches/0022-ignore-docbook-reference-plugin.patch | 9 +++++---- debian/patches/0028-disable-jdiff-report.patch | 2 +- debian/patches/0030-tomcat7-compatibility.patch | 2 +- debian/patches/0031-gradle2-compatibility.patch | 13 ------------- debian/patches/0035-ignore-asciidoctor-plugin.patch | 2 +- debian/patches/0036-ignore-compilation-warnings.patch | 2 +- debian/patches/series | 1 - 9 files changed, 18 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8953194..8414145 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libspring-java (4.1.9-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Sun, 03 Apr 2016 01:12:35 +0200 + libspring-java (4.0.9-4) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff index 4f34cb6..5a12c5d 100644 --- a/debian/patches/0003_no_ibm_websphere.diff +++ b/debian/patches/0003_no_ibm_websphere.diff @@ -4,7 +4,7 @@ Last-Update: 2010-06-20 Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -450,6 +450,15 @@ +@@ -524,6 +524,15 @@ testCompile("org.aspectj:aspectjweaver:${aspectjVersion}") testCompile("org.eclipse.persistence:javax.persistence:2.0.0") } diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch index 97c1197..37d4354 100644 --- a/debian/patches/0022-ignore-docbook-reference-plugin.patch +++ b/debian/patches/0022-ignore-docbook-reference-plugin.patch @@ -4,7 +4,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -981,7 +981,6 @@ +@@ -1112,7 +1112,6 @@ description = "Spring Framework" apply plugin: "asciidoctor" @@ -12,20 +12,21 @@ Forwarded: not-needed apply plugin: "groovy" // apply plugin: "detect-split-packages" -@@ -1001,12 +1000,6 @@ +@@ -1132,13 +1131,6 @@ ] } - reference { - sourceDir = asciidoctor.outputDir - pdfFilename = "spring-framework-reference.pdf" +- epubFilename = "spring-framework-reference.epub" - expandPlaceholders = "" - } - afterEvaluate { tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") } } -@@ -1080,7 +1073,7 @@ +@@ -1212,7 +1204,7 @@ } } @@ -34,7 +35,7 @@ Forwarded: not-needed group = "Distribution" baseName = "spring-framework" classifier = "docs" -@@ -1094,10 +1087,6 @@ +@@ -1226,10 +1218,6 @@ from (api) { into "javadoc-api" } diff --git a/debian/patches/0028-disable-jdiff-report.patch b/debian/patches/0028-disable-jdiff-report.patch index caa5c9e..79295f7 100644 --- a/debian/patches/0028-disable-jdiff-report.patch +++ b/debian/patches/0028-disable-jdiff-report.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -984,7 +984,7 @@ +@@ -1124,7 +1124,7 @@ apply plugin: "groovy" // apply plugin: "detect-split-packages" diff --git a/debian/patches/0030-tomcat7-compatibility.patch b/debian/patches/0030-tomcat7-compatibility.patch index 040995b..40581cf 100644 --- a/debian/patches/0030-tomcat7-compatibility.patch +++ b/debian/patches/0030-tomcat7-compatibility.patch @@ -111,7 +111,7 @@ Last-Update: 2015-08-16 --- a/build.gradle +++ b/build.gradle -@@ -360,6 +360,10 @@ +@@ -436,6 +436,10 @@ dependencies { provided("org.apache.tomcat:catalina:6.0.16") } diff --git a/debian/patches/0031-gradle2-compatibility.patch b/debian/patches/0031-gradle2-compatibility.patch deleted file mode 100644 index 9cb8bb0..0000000 --- a/debian/patches/0031-gradle2-compatibility.patch +++ /dev/null @@ -1,13 +0,0 @@ -Description: Fixes the compatibility with Gradle 2 -Origin: backport, https://github.com/spring-projects/spring-framework/commit/7497391 ---- a/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy -+++ b/buildSrc/src/main/groovy/org/springframework/build/gradle/MergePlugin.groovy -@@ -69,7 +69,7 @@ - - // Ensure the IDE can reference merged projects - project.eclipse.classpath.plusConfigurations += [runtimeMerge] -- project.idea.module.scopes.PROVIDED.plus += runtimeMerge -+ project.idea.module.scopes.PROVIDED.plus += [runtimeMerge] - - // Hook to perform the actual merge logic - project.afterEvaluate{ diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch index 2910aee..167c332 100644 --- a/debian/patches/0035-ignore-asciidoctor-plugin.patch +++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/build.gradle +++ b/build.gradle -@@ -984,26 +984,11 @@ +@@ -1124,26 +1124,11 @@ configure(rootProject) { description = "Spring Framework" diff --git a/debian/patches/0036-ignore-compilation-warnings.patch b/debian/patches/0036-ignore-compilation-warnings.patch index 24c2906..f4781ae 100644 --- a/debian/patches/0036-ignore-compilation-warnings.patch +++ b/debian/patches/0036-ignore-compilation-warnings.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/build.gradle +++ b/build.gradle -@@ -51,7 +51,7 @@ +@@ -75,7 +75,7 @@ "-Xlint:dep-ann", "-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides", "-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:fallthrough", "-Xlint:rawtypes", "-Xlint:deprecation", diff --git a/debian/patches/series b/debian/patches/series index 3388288..26071a0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ 0022-ignore-docbook-reference-plugin.patch 0028-disable-jdiff-report.patch 0030-tomcat7-compatibility.patch -0031-gradle2-compatibility.patch 0034-velocity-tools-compatibility.patch 0035-ignore-asciidoctor-plugin.patch 0036-ignore-compilation-warnings.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
