[sisu-plexus] 01/07: Build with the DH sequencer instead of CDBS

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository sisu-plexus.

commit 8b847d344a27a2bedb7407e7ec01f1ce7143bcb1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 18 17:52:35 2017 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                           |  6 ++++++
 debian/control                             |  5 ++---
 debian/patches/01-drop-maven3-prereq.patch | 16 ----------------
 debian/patches/series                      |  1 -
 debian/rules                               |  7 ++-----
 5 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1cf1110..5c230b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sisu-plexus (0.3.2-2) UNRELEASED; urgency=medium
+
+  * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 18 May 2017 17:52:16 +0200
+
 sisu-plexus (0.3.2-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d11f18e..82fc5aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +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: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                junit4,
                libbuild-helper-maven-plugin-java,
@@ -16,7 +15,7 @@ Build-Depends: cdbs,
                libplexus-utils2-java (>= 2.0.5),
                libsisu-guice-java,
                libsisu-inject-java (>= 0.3.0),
-               maven-debian-helper (>= 1.5)
+               maven-debian-helper (>= 2.1)
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/sisu-plexus.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/sisu-plexus.git
diff --git a/debian/patches/01-drop-maven3-prereq.patch b/debian/patches/01-drop-maven3-prereq.patch
deleted file mode 100644
index eda6aac..0000000
--- a/debian/patches/01-drop-maven3-prereq.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove the prerequisite on Maven 3 to be able to build with Maven 2
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/pom.xml
-+++ b/pom.xml
-@@ -58,10 +58,6 @@
-     </mailingList>
-   </mailingLists>
- 
--  <prerequisites>
--    <maven>3.0.4</maven>
--  </prerequisites>
--
-   <modules>
-     <module>org.eclipse.sisu.plexus</module>
-     <module>org.eclipse.sisu.plexus.extender</module>
diff --git a/debian/patches/series b/debian/patches/series
index 46e0570..c880116 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-drop-maven3-prereq.patch
 02-change-packaging-type.patch
 04-add-missing-dependencies.patch
 05-include-resources.patch
diff --git a/debian/rules b/debian/rules
index 75f0ce7..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate
+%:
+	dh $@
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename

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