[jackson-datatype-joda] 03/03: Modified the description of the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Nov 6 21:49:19 UTC 2014


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

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

commit ee900fab94f86b943019ff26d5d879966b96012c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 6 22:48:56 2014 +0100

    Modified the description of the patches
---
 debian/patches/add-junit-dependency.patch | 17 ++++++-----------
 debian/patches/dont-osgi-bundle.patch     | 11 +++--------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/debian/patches/add-junit-dependency.patch b/debian/patches/add-junit-dependency.patch
index 0348e90..afd8d9a 100644
--- a/debian/patches/add-junit-dependency.patch
+++ b/debian/patches/add-junit-dependency.patch
@@ -1,15 +1,10 @@
-Description: Add junit as a test dependency
- Add junit as a test dependency to the project's pom.xml file.
+Description: Add junit as a test dependency. This dependency is inherited
+ from the parent pom (jackson-parent) which is ignored in the Debian package.
 Author: Tim Potter <tpot at hp.com>
-Forwarded: No
-Last-Update: 2014-11-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: jackson-datatype-joda-2.4.3/pom.xml
-===================================================================
---- jackson-datatype-joda-2.4.3.orig/pom.xml
-+++ jackson-datatype-joda-2.4.3/pom.xml
-@@ -69,6 +69,13 @@ Joda (http://joda-time.sourceforge.net/)
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -69,6 +69,13 @@
      </dependency>
  -->
  
diff --git a/debian/patches/dont-osgi-bundle.patch b/debian/patches/dont-osgi-bundle.patch
index f12f709..e31d663 100644
--- a/debian/patches/dont-osgi-bundle.patch
+++ b/debian/patches/dont-osgi-bundle.patch
@@ -1,14 +1,9 @@
 Description: Disable OSGI bundling
  OSGI bundling is not supported or required for Debian.
 Author: Tim Potter <tpot at hp.com>
-Forwarded: No
-Last-Update: 2014-11-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: jackson-datatype-joda-2.4.3/pom.xml
-===================================================================
---- jackson-datatype-joda-2.4.3.orig/pom.xml
-+++ jackson-datatype-joda-2.4.3/pom.xml
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
 @@ -10,7 +10,6 @@
    <artifactId>jackson-datatype-joda</artifactId>
    <name>Jackson-datatype-Joda</name>

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



More information about the pkg-java-commits mailing list