[jackson-dataformat-yaml] 04/07: 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 jackson-dataformat-yaml.

commit 582fc007a5bbe3280b43a6bee141f239558edd6c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Dec 19 18:25:29 2016 +0100

    Refreshed the patches
---
 debian/changelog                                   |  4 +++-
 debian/patches/0001-Fix-bundle-build.patch         | 23 ----------------------
 debian/patches/0002-depend-on-junit.patch          |  2 +-
 debian/patches/0003-ignore-integration-tests.patch |  8 ++++----
 debian/patches/series                              |  1 -
 5 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00636e5..fee8aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-jackson-dataformat-yaml (2.7.3-2) UNRELEASED; urgency=medium
+jackson-dataformat-yaml (2.8.5-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Merged the Build-Depends-Indep field into Build-Depends
   * Switch to debhelper level 10
 
diff --git a/debian/patches/0001-Fix-bundle-build.patch b/debian/patches/0001-Fix-bundle-build.patch
deleted file mode 100644
index 6bc3e65..0000000
--- a/debian/patches/0001-Fix-bundle-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 12 Oct 2014 14:55:28 +0200
-Subject: Fix bundle build
-
----
- pom.xml | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/pom.xml
-+++ b/pom.xml
-@@ -193,6 +193,12 @@
-           </execution>
-         </executions>
-       </plugin>
-+      <plugin>
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <version>2.3.5</version>
-+        <extensions>true</extensions>
-+      </plugin>
-     </plugins>
-   </build>
- 
diff --git a/debian/patches/0002-depend-on-junit.patch b/debian/patches/0002-depend-on-junit.patch
index 4f5039e..4a98e33 100644
--- a/debian/patches/0002-depend-on-junit.patch
+++ b/debian/patches/0002-depend-on-junit.patch
@@ -8,7 +8,7 @@ Subject: depend on junit
 
 --- a/pom.xml
 +++ b/pom.xml
-@@ -102,6 +102,12 @@
+@@ -97,6 +97,12 @@
          <version>1.6.6</version>
          <scope>test</scope>
      </dependency>
diff --git a/debian/patches/0003-ignore-integration-tests.patch b/debian/patches/0003-ignore-integration-tests.patch
index 926b30a..70bdf78 100644
--- a/debian/patches/0003-ignore-integration-tests.patch
+++ b/debian/patches/0003-ignore-integration-tests.patch
@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -205,6 +205,15 @@
-         <version>2.3.5</version>
-         <extensions>true</extensions>
-       </plugin>
+@@ -175,6 +175,15 @@
+             </includes>
+           </configuration>
+         </plugin>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-compiler-plugin</artifactId>
diff --git a/debian/patches/series b/debian/patches/series
index 363f6b3..3770075 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Fix-bundle-build.patch
 0002-depend-on-junit.patch
 0003-ignore-integration-tests.patch

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