[uima-addons] 02/06: 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 uima-addons.

commit 65c4cd8df30ae088cc7dc43ccd7306f8b27d2449
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 11 23:18:42 2015 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog                       |  1 +
 debian/control                         | 41 +++++++++++++++++++++++++---------
 debian/libuima-addons-java-doc.install |  1 -
 debian/rules                           |  9 ++++----
 4 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f983fe7..ebb6919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ uima-addons (2.3.1-4) UNRELEASED; urgency=medium
 
   * Team upload.
   * Fixed the build failure with Maven 3 (Closes: #807706)
+  * Build with the DH sequencer instead of CDBS
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 11 Dec 2015 23:11:15 +0100
 
diff --git a/debian/control b/debian/control
index 7d01296..3f99dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,34 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4.5)
-Build-Depends-Indep: libmaven-antrun-plugin-java, libmaven-bundle-plugin-java, libmaven-dependency-plugin-java,  
- ant, bsh, libcommons-io-java, libcommons-logging-java,
- libhttpclient-java, libjetty-java, liblog4j1.2-java, librhino-java, libservlet2.5-java,  
- libslf4j-java, libuima-core-java, libxmlbeans-java, ant-doc, default-jdk-doc,  
- libcommons-logging-java-doc, libjetty-java-doc, liblog4j1.2-java-doc, libservlet2.5-java-doc,  
- libmaven-javadoc-plugin-java, libxmlbeans-maven-plugin-java (>= 2.3.3-3), libmaven-install-plugin-java,
- libjavacc-maven-plugin-java, libuima-tools-java,
- libbuild-helper-maven-plugin-java
+Build-Depends: debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4.5)
+Build-Depends-Indep: ant,
+                     ant-doc,
+                     bsh,
+                     default-jdk-doc,
+                     libbuild-helper-maven-plugin-java,
+                     libcommons-io-java,
+                     libcommons-logging-java,
+                     libcommons-logging-java-doc,
+                     libhttpclient-java,
+                     libjavacc-maven-plugin-java,
+                     libjetty-java,
+                     libjetty-java-doc,
+                     liblog4j1.2-java,
+                     liblog4j1.2-java-doc,
+                     libmaven-antrun-plugin-java,
+                     libmaven-bundle-plugin-java,
+                     libmaven-dependency-plugin-java,
+                     libmaven-install-plugin-java,
+                     libmaven-javadoc-plugin-java,
+                     librhino-java,
+                     libservlet2.5-java,
+                     libservlet2.5-java-doc,
+                     libslf4j-java,
+                     libuima-core-java,
+                     libuima-tools-java,
+                     libxmlbeans-java,
+                     libxmlbeans-maven-plugin-java (>= 2.3.3-3)
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-java/uima-addons.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/uima-addons.git
@@ -19,7 +38,7 @@ Homepage: http://uima.apache.org/sandbox.html
 
 Package: libuima-addons-java
 Architecture: all
-Depends: ${misc:Depends}, ${maven:Depends}
+Depends: ${maven:Depends}, ${misc:Depends}
 Recommends: ${maven:OptionalDepends}
 Suggests: libuima-addons-java-doc
 Description: Apache UIMA Addons
@@ -41,7 +60,7 @@ Description: Apache UIMA Addons
 Package: libuima-addons-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${maven:DocDepends}
+Depends: ${maven:DocDepends}, ${misc:Depends}
 Recommends: ${maven:DocOptionalDepends}
 Suggests: libuima-addons-java
 Description: Documentation for Apache UIMA Addons
diff --git a/debian/libuima-addons-java-doc.install b/debian/libuima-addons-java-doc.install
index c7bb188..6403369 100644
--- a/debian/libuima-addons-java-doc.install
+++ b/debian/libuima-addons-java-doc.install
@@ -1,2 +1 @@
 target/site/apidocs/* usr/share/doc/libuima-addons-java/api
-
diff --git a/debian/rules b/debian/rules
index ba49f3e..8dea969 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+export JAVA_HOME = /usr/lib/jvm/default-java
 
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_MAVEN_DOC_TARGET := javadoc:aggregate
+%:
+	dh $@ --buildsystem=maven
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --rename

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