[jackson-annotations] 03/05: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Dec 15 14:10:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jackson-annotations.

commit dec2f3b84ddaf6fac904dad0b2bbd73672f650ba
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 15 15:05:46 2016 +0100

    Refreshed the patches
---
 debian/changelog                     |  8 ++++++++
 debian/patches/depend-on-junit.diff  | 18 ------------------
 debian/patches/fix-using-bundle.diff |  6 +++---
 debian/patches/series                |  1 -
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42e8130..13520aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jackson-annotations (2.8.5-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 15 Dec 2016 15:03:51 +0100
+
 jackson-annotations (2.7.3-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/depend-on-junit.diff b/debian/patches/depend-on-junit.diff
deleted file mode 100644
index a0bb8c5..0000000
--- a/debian/patches/depend-on-junit.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -32,6 +32,15 @@
-     <osgi.export>com.fasterxml.jackson.annotation.*;version=${project.version}</osgi.export>
-   </properties>
- 
-+  <dependencies>
-+    <dependency>
-+      <groupId>junit</groupId>
-+      <artifactId>junit</artifactId>
-+      <version>4.11</version>
-+      <scope>test</scope>
-+    </dependency>
-+  </dependencies>
-+
-   <build>
-     <plugins>
-       <plugin>
diff --git a/debian/patches/fix-using-bundle.diff b/debian/patches/fix-using-bundle.diff
index 4fc5312..6f67ba1 100644
--- a/debian/patches/fix-using-bundle.diff
+++ b/debian/patches/fix-using-bundle.diff
@@ -1,9 +1,9 @@
 --- a/pom.xml
 +++ b/pom.xml
-@@ -31,4 +31,15 @@
+@@ -44,4 +44,15 @@
+     </dependency>
+   </dependencies>
  
-     <osgi.export>com.fasterxml.jackson.annotation.*;version=${project.version}</osgi.export>
-   </properties>
 +
 +  <build>
 +    <plugins>
diff --git a/debian/patches/series b/debian/patches/series
index 6ef8bf9..c39825f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-using-bundle.diff
-depend-on-junit.diff

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



More information about the pkg-java-commits mailing list