[libspring-java] 02/04: Refreshed the patches

[Emmanuel Bourg]

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 c723c8a64ab3cd9a5cd8fe31c772621f3cf3c820
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 24 19:32:41 2017 +0200

    Refreshed the patches
---
 debian/changelog                                          | 8 ++++++++
 debian/patches/0003_no_ibm_websphere.diff                 | 4 ++--
 debian/patches/0022-ignore-docbook-reference-plugin.patch | 8 ++++----
 debian/patches/0028-disable-jdiff-report.patch            | 2 +-
 debian/patches/0035-ignore-asciidoctor-plugin.patch       | 2 +-
 debian/patches/0037-ignore-sonar-plugin.patch             | 4 ++--
 debian/patches/0042-ignore-money-api.patch                | 2 +-
 debian/patches/0044-ignore-httpunit.patch                 | 2 +-
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51caddb..bdfe567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libspring-java (4.3.10-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 24 Jul 2017 19:32:18 +0200
+
 libspring-java (4.3.9-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0003_no_ibm_websphere.diff b/debian/patches/0003_no_ibm_websphere.diff
index 289e55e..b3ef270 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
-@@ -555,6 +555,15 @@
+@@ -586,6 +586,15 @@
  		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
  		testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
  	}
@@ -19,4 +19,4 @@ Forwarded: not-needed
 +	}
  }
  
- project("spring-oxm") {
+ project("spring-jms") {
diff --git a/debian/patches/0022-ignore-docbook-reference-plugin.patch b/debian/patches/0022-ignore-docbook-reference-plugin.patch
index 69ac08a..471cf22 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 <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1154,7 +1154,6 @@
+@@ -1155,7 +1155,6 @@
  	description = "Spring Framework"
  
  	apply plugin: "org.asciidoctor.convert"
@@ -12,7 +12,7 @@ Forwarded: not-needed
  	apply plugin: "groovy"
  
  	// apply plugin: "detect-split-packages"
-@@ -1168,13 +1167,6 @@
+@@ -1169,13 +1168,6 @@
  		attributes 'spring-version': project.version, 'revnumber': project.version, 'docinfo': ""
  	}
  
@@ -26,7 +26,7 @@ Forwarded: not-needed
  	afterEvaluate {
  		tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
  	}
-@@ -1248,7 +1240,7 @@
+@@ -1249,7 +1241,7 @@
  		}
  	}
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  		group = "Distribution"
  		baseName = "spring-framework"
  		classifier = "docs"
-@@ -1262,10 +1254,6 @@
+@@ -1263,10 +1255,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 8fab655..42fcc8c 100644
--- a/debian/patches/0028-disable-jdiff-report.patch
+++ b/debian/patches/0028-disable-jdiff-report.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1157,7 +1157,7 @@
+@@ -1158,7 +1158,7 @@
  	apply plugin: "groovy"
  
  	// apply plugin: "detect-split-packages"
diff --git a/debian/patches/0035-ignore-asciidoctor-plugin.patch b/debian/patches/0035-ignore-asciidoctor-plugin.patch
index d6d8a74..56efa77 100644
--- a/debian/patches/0035-ignore-asciidoctor-plugin.patch
+++ b/debian/patches/0035-ignore-asciidoctor-plugin.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1153,24 +1153,11 @@
+@@ -1154,24 +1154,11 @@
  configure(rootProject) {
  	description = "Spring Framework"
  
diff --git a/debian/patches/0037-ignore-sonar-plugin.patch b/debian/patches/0037-ignore-sonar-plugin.patch
index 07f8d46..333d5d7 100644
--- a/debian/patches/0037-ignore-sonar-plugin.patch
+++ b/debian/patches/0037-ignore-sonar-plugin.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
  ext {
  	linkHomepage = 'https://projects.spring.io/spring-framework'
  	linkCi = 'https://build.spring.io/browse/SPR'
-@@ -1136,20 +1132,6 @@
+@@ -1137,20 +1133,6 @@
  	}
  }
  
@@ -35,7 +35,7 @@ Forwarded: not-needed
  configure(rootProject) {
  	description = "Spring Framework"
  
-@@ -1365,21 +1347,6 @@
+@@ -1366,21 +1348,6 @@
  
  }
  
diff --git a/debian/patches/0042-ignore-money-api.patch b/debian/patches/0042-ignore-money-api.patch
index c814167..2a2f82e 100644
--- a/debian/patches/0042-ignore-money-api.patch
+++ b/debian/patches/0042-ignore-money-api.patch
@@ -43,4 +43,4 @@ Forwarded: not-needed
 +	}
  }
  
- project("spring-messaging") {
+ project("spring-oxm") {
diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch
index d35d6c1..25a29f7 100644
--- a/debian/patches/0044-ignore-httpunit.patch
+++ b/debian/patches/0044-ignore-httpunit.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -1059,6 +1059,15 @@
+@@ -1060,6 +1060,15 @@
  		testRuntime("org.terracotta:management-model:2.3.0")
  	}
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git