[libjoda-time-java] 03/05: Removed the Maven 2 compatibility patch

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Jun 20 21:12:51 UTC 2016


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

ebourg-guest pushed a commit to branch master
in repository libjoda-time-java.

commit cd6ff1ab2bca6f657b3adc34adee8b9a6ee4d4bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 20 23:05:48 2016 +0200

    Removed the Maven 2 compatibility patch
---
 debian/changelog                             |  1 +
 debian/control                               |  2 +-
 debian/patches/01-maven2-compatibility.patch | 14 --------------
 debian/patches/series                        |  1 -
 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fde86ee..aa6767e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libjoda-time-java (2.9.3-2) UNRELEASED; urgency=medium
 
   * Standards-Version updated to 3.9.8 (no changes)
+  * Removed the Maven 2 compatibility patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 20 Jun 2016 23:01:27 +0200
 
diff --git a/debian/control b/debian/control
index f875a2b..7e0174c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                libmaven-antrun-plugin-java,
                libmaven-exec-plugin-java,
                libmaven-javadoc-plugin-java,
-               maven-debian-helper (>= 1.4)
+               maven-debian-helper (>= 2.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjoda-time-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjoda-time-java.git
diff --git a/debian/patches/01-maven2-compatibility.patch b/debian/patches/01-maven2-compatibility.patch
deleted file mode 100644
index d6b9fbc..0000000
--- a/debian/patches/01-maven2-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Removes the prerequisite on Maven 3 since the project builds fine with Maven 2
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
-@@ -655,7 +655,7 @@
- 
-   <!-- ==================================================================== -->
-   <prerequisites>
--    <maven>3.0.4</maven>
-+    <maven>2.2.1</maven>
-   </prerequisites>
-   <dependencies>
-     <dependency>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 72613f3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-maven2-compatibility.patch

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



More information about the pkg-java-commits mailing list