[junit4] 07/08: Removed 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 junit4.

commit 0ab8da6b10efad624c722e214380e9a5a4aadb6c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 26 00:21:57 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a81dca5..9613720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 junit4 (4.12-5) UNRELEASED; urgency=medium
 
   * Removed the build dependency on libmaven-enforcer-plugin-java
+  * Removed maven2-compatibility.patch
   * Simplified debian/rules
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
diff --git a/debian/control b/debian/control
index 3c797e9..4a31b6e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libhamcrest-java (>= 1.3),
                      libhamcrest-java-doc,
                      libmaven-javadoc-plugin-java,
-                     maven-debian-helper
+                     maven-debian-helper (>= 2.2)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/junit4.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/junit4.git
diff --git a/debian/patches/maven2-compatibility.patch b/debian/patches/maven2-compatibility.patch
deleted file mode 100644
index fe46cfa..0000000
--- a/debian/patches/maven2-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Remove the prerequisite on Maven 3
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -65,7 +65,7 @@
-     </mailingLists>
- 
-     <prerequisites>
--        <maven>3.0.4</maven>
-+        <maven>2.2.1</maven>
-     </prerequisites>
- 
-     <scm>
diff --git a/debian/patches/series b/debian/patches/series
index 8d05f9a..f4a23f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-maven2-compatibility.patch
 exclude-dependency-sources.patch
 Version.java.patch
 privacy-breach-logo.patch

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