[uimaj] 04/09: 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 uimaj.

commit 81567c2923b62c92b7b536bc0daa0eda7e73bf0f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 18 09:31:41 2016 +0100

    Build with the DH sequencer instead of CDBS
---
 debian/changelog |  1 +
 debian/clean     |  1 +
 debian/control   |  3 +--
 debian/rules     | 40 ++++++++++++----------------------------
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afe57d5..d45166d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 uimaj (2.8.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
   * Use secure Vcs-* URLs
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f7e585b
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+*.1
diff --git a/debian/control b/debian/control
index 52e2b45..ac2abd4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Fabien Poulard <fabien.poulard at univ-nantes.fr>,
            Damien Raude-Morvan <drazzib at debian.org>,
            Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: cdbs,
-               debhelper (>= 10),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                libmaven3-core-java,
                maven-debian-helper (>= 2.0~),
diff --git a/debian/rules b/debian/rules
index 7f45ad9..9f14b5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+%:
+	dh $@
 
-VERSION              := $(DEB_UPSTREAM_VERSION)
+override_dh_auto_build:
+	dh_auto_build -- install javadoc:aggregate
 
-DEB_COMPRESS_EXCLUDE := .pdf
-JAVA_HOME            := /usr/lib/jvm/default-java
-# Enough memory to aggregate Javadoc
-JAVA_OPTS            += -Xmx512m
+	for PAGE in annotationViewer documentAnalyzer cpeGui jcasgen runAE runPearInstaller runPearInstaller runPearMerger runPearPackager validateDescriptor; do \
+	    xsltproc -''-nonet /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl debian/manpages/$$PAGE.xml; \
+	done
 
-# Use new javadoc:aggregate target to generate Javadoc
-DEB_MAVEN_BUILD_TARGET   := install
-DEB_MAVEN_DOC_TARGET     := javadoc:aggregate
+override_dh_install:
+	dh_install
 
-# Manpages generation
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP=xsltproc -''-nonet
-UIMA_MANPAGES := annotationViewer.1 documentAnalyzer.1 cpeGui.1 jcasgen.1 runAE.1 runPearInstaller.1 runPearInstaller.1 runPearMerger.1 runPearPackager.1 validateDescriptor.1
-
-build/uima-utils:: $(UIMA_MANPAGES)
-
-%.1: debian/manpages/%.xml
-	$(XP) $(DB2MAN) $<
-
-get-orig-source:
-	uscan --force-download --rename
-
-clean::
-	mh_clean
-	-rm -Rf $(UIMA_MANPAGES)
-
-binary-install/uima-utils::
 	# Remove suffixes on binaries
 	mv debian/uima-utils/usr/bin/annotationViewer.sh debian/uima-utils/usr/bin/annotationViewer
 	mv debian/uima-utils/usr/bin/cpeGui.sh           debian/uima-utils/usr/bin/cpeGui
@@ -43,6 +24,9 @@ binary-install/uima-utils::
 	mv debian/uima-utils/usr/bin/runPearMerger.sh    debian/uima-utils/usr/bin/runPearMerger
 	mv debian/uima-utils/usr/bin/runPearPackager.sh  debian/uima-utils/usr/bin/runPearPackager
 	mv debian/uima-utils/usr/bin/validateDescriptor.sh debian/uima-utils/usr/bin/validateDescriptor
+
 	# Set correct perms (on runUimaClass.sh and setUimaClassPath.sh)
 	chmod +x debian/uima-utils/usr/share/uima/bin/*.sh
 
+get-orig-source:
+	uscan --force-download --rename

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