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

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Sep 18 18:19:00 UTC 2017


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 881e5f16bbb5816e6aa3b9a194c43df2eae18599
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 18 19:28:39 2017 +0200

    Refreshed the patches
---
 debian/changelog                                | 8 +++++++-
 debian/patches/0039-openjpa-compatibility.patch | 2 +-
 debian/patches/0043-ignore-okhttp.patch         | 2 +-
 debian/patches/0044-ignore-httpunit.patch       | 2 +-
 debian/patches/0045-ignore-caffeine.patch       | 6 +++---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec8fd67..bc9dd4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-libspring-java (4.3.10-2) UNRELEASED; urgency=medium
+libspring-java (4.3.11-1) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders list. (Closes: #871875)
   * Wrap and sort dependencies lists.
   * Simplify d/rules.
   * Update copyright info.
 
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
+
  -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 20:09:51 +0100
 
 libspring-java (4.3.10-1) unstable; urgency=medium
diff --git a/debian/patches/0039-openjpa-compatibility.patch b/debian/patches/0039-openjpa-compatibility.patch
index cc7d031..a633252 100644
--- a/debian/patches/0039-openjpa-compatibility.patch
+++ b/debian/patches/0039-openjpa-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -763,6 +763,7 @@
+@@ -765,6 +765,7 @@
  			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
  			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
  		}
diff --git a/debian/patches/0043-ignore-okhttp.patch b/debian/patches/0043-ignore-okhttp.patch
index ef08e87..358e1a4 100644
--- a/debian/patches/0043-ignore-okhttp.patch
+++ b/debian/patches/0043-ignore-okhttp.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -740,6 +740,14 @@
+@@ -742,6 +742,14 @@
      testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
  		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
  	}
diff --git a/debian/patches/0044-ignore-httpunit.patch b/debian/patches/0044-ignore-httpunit.patch
index 25a29f7..8facd5c 100644
--- a/debian/patches/0044-ignore-httpunit.patch
+++ b/debian/patches/0044-ignore-httpunit.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
 @@ -1060,6 +1060,15 @@
- 		testRuntime("org.terracotta:management-model:2.3.0")
+ 		testRuntime("log4j:log4j:${log4jVersion}")
  	}
  
 +	sourceSets {
diff --git a/debian/patches/0045-ignore-caffeine.patch b/debian/patches/0045-ignore-caffeine.patch
index 795b31d..f4407a2 100644
--- a/debian/patches/0045-ignore-caffeine.patch
+++ b/debian/patches/0045-ignore-caffeine.patch
@@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.gradle
 +++ b/build.gradle
-@@ -672,6 +672,14 @@
- 		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
- 		testRuntime("org.ehcache:jcache:${ehcachejcacheVersion}")
+@@ -674,6 +674,14 @@
+ 		testRuntime("org.ehcache:ehcache:${ehcache3Version}")
+ 		testRuntime("org.terracotta:management-model:2.3.0")
  	}
 +
 +	sourceSets {

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



More information about the pkg-java-commits mailing list