[guice] 01/01: Removed the Maven 2 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 guice.

commit ca945df75f42155d19ae900967607a526b81e031
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 8 12:44:46 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index a0f32e0..f03a7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 guice (4.0-5) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders list. (Closes: #871859)
   * Update copyright info.
 
+  [ Emmanuel Bourg ]
+  * Removed the Maven 2 compatibility patch
+
  -- Miguel Landaeta <nomadium at debian.org>  Mon, 07 Aug 2017 10:40:09 +0100
 
 guice (4.0-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ccc9e21..8230e6f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 10),
                libmunge-maven-plugin-java,
                libservlet3.1-java,
                libspring-beans-java,
-               maven-debian-helper
+               maven-debian-helper (>= 2.2)
 Standards-Version: 4.0.0
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/guice.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/guice.git
diff --git a/debian/patches/03-maven2-compatibility.patch b/debian/patches/03-maven2-compatibility.patch
deleted file mode 100644
index 24e4065..0000000
--- a/debian/patches/03-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
-@@ -104,7 +104,7 @@
-   </modules>
- 
-   <prerequisites>
--    <maven>3.0</maven>
-+    <maven>2.2.1</maven>
-   </prerequisites>
- 
-   <properties>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8f2b93c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-03-maven2-compatibility.patch

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