[joda-convert] 03/04: Removed 01-maven2-compatibility.patch

[Emmanuel Bourg]

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

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

commit cc3c93185e6c424a0d3e4cc39cce95d9ac3d3cec
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 4 11:18:44 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index c13b9d1..8135434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-joda-convert (1.8.1-3) UNRELEASED; urgency=medium
+joda-convert (1.8.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+  * Removed 01-maven2-compatibility.patch
   * Removed debian/orig-tar.sh
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Jul 2017 11:14:16 +0200
diff --git a/debian/control b/debian/control
index 6562a69..197702f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.5)
+Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.0)
 Build-Depends-Indep: libmaven-javadoc-plugin-java, libmaven-bundle-plugin-java, default-jdk-doc, junit4
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/joda-convert.git
diff --git a/debian/patches/01-maven2-compatibility.patch b/debian/patches/01-maven2-compatibility.patch
deleted file mode 100644
index 6eef89f..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
-@@ -398,7 +398,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/joda-convert.git