[jakarta-jmeter] 03/05: Build with the DH sequencer instead of CDBS

Fri Oct 28 22:33:57 UTC 2016

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

ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.

commit 8a16533c806a8094fa1519a2bcade2ab484305db
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 28 23:18:24 2016 +0200

    Build with the DH sequencer instead of CDBS
---
 debian/changelog       |  1 +
 debian/clean           |  3 +++
 debian/control         |  2 +-
 debian/jmeter.install  |  1 +
 debian/rules           | 71 ++++++++++++++++++++++++++++++++++++--------------
 debian/wrappers/jmeter |  0
 6 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b692e8..ada2a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ jakarta-jmeter (2.13-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Added bsh to the jmeter-core classpath (Closes: #842390)
+  * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..92fbbda
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
+docs/
+lib/junit/test.jar
+velocity.log
diff --git a/debian/control b/debian/control
index a1e04f0..1231fdb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>= 10), javahelper
+Build-Depends: ant, ant-optional, debhelper (>= 10), javahelper
 Build-Depends-Indep: default-jdk,
                      default-jdk-doc,
                      junit4,
diff --git a/debian/jmeter.install b/debian/jmeter.install
index 09d5430..95d08d7 100644
--- a/debian/jmeter.install
+++ b/debian/jmeter.install
@@ -1,6 +1,7 @@
 bin/*.properties usr/share/jmeter/bin/
 bin/ApacheJMeter.jar usr/share/jmeter/bin/
 bin/templates        usr/share/jmeter/bin/
+debian/wrappers/jmeter usr/share/jmeter/bin/
 lib/*.jar usr/share/jmeter/lib/
 lib/ext/ApacheJMeter_components.jar usr/share/jmeter/lib/ext/
 lib/ext/ApacheJMeter_core.jar usr/share/jmeter/lib/ext/
diff --git a/debian/rules b/debian/rules
index 01e8e4a..e209924 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,58 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//')
 
-JAVA_HOME_DIRS		:= /usr/lib/jvm/default-java
-DEB_JARS		:= ant-nodeps avalon-framework bcmail bcpkix bcprov bsf commons-collections3 commons-httpclient \
-                           commons-io commons-jexl commons-jexl2 commons-lang commons-lang3 commons-net geronimo-jms-1.1-spec \
-                           commons-math3 commons-pool2 \
-                           javax.mail geronimo-jms_1.1_spec httpclient httpcore httpmime jcharts jdom1 js \
-                           jtidy junit4 libhtmlparser excalibur-logger excalibur-logkit oro xalan2 xmlgraphics-commons \
-                           xstream velocity tika-core tika-parsers rsyntaxtextarea jsoup mongo-java-driver dnsjava
-DEB_ANT_BUILD_TARGET	:= install docs-printable docs-api
-ANT_ARGS		:= -Dlib.api=lib/opt -DincludeAntRuntime=true -Djmeter.version=$(DEB_UPSTREAM_VERSION)
+JARS = /usr/share/java/avalon-framework.jar \
+       /usr/share/java/bsf.jar \
+       /usr/share/java/libhtmlparser.jar \
+       /usr/share/java/xstream.jar \
+       /usr/share/java/bcmail.jar \
+       /usr/share/java/bcpkix.jar \
+       /usr/share/java/bcprov.jar \
+       /usr/share/java/commons-collections3.jar \
+       /usr/share/java/commons-httpclient.jar \
+       /usr/share/java/commons-io.jar \
+       /usr/share/java/commons-jexl.jar \
+       /usr/share/java/commons-jexl2.jar \
+       /usr/share/java/commons-lang.jar \
+       /usr/share/java/commons-lang3.jar \
+       /usr/share/java/commons-math3.jar \
+       /usr/share/java/commons-net.jar \
+       /usr/share/java/commons-pool2.jar \
+       /usr/share/java/dnsjava.jar \
+       /usr/share/java/excalibur-logger.jar \
+       /usr/share/java/excalibur-logkit.jar \
+       /usr/share/java/geronimo-jms_1.1_spec.jar \
+       /usr/share/java/httpclient.jar \
+       /usr/share/java/httpcore.jar \
+       /usr/share/java/httpmime.jar \
+       /usr/share/java/javax.mail.jar \
+       /usr/share/java/jcharts.jar \
+       /usr/share/java/jdom1.jar \
+       /usr/share/java/js.jar \
+       /usr/share/java/jsoup.jar \
+       /usr/share/java/jtidy.jar \
+       /usr/share/java/junit4.jar \
+       /usr/share/java/oro.jar \
+       /usr/share/java/velocity.jar \
+       /usr/share/java/tika-core.jar \
+       /usr/share/java/tika-parsers.jar \
+       /usr/share/java/rsyntaxtextarea.jar \
+       /usr/share/java/mongo-java-driver.jar \
+       /usr/share/java/xalan2.jar \
+       /usr/share/java/xmlgraphics-commons.jar
 
-install/jmeter::
-	mkdir -p debian/jmeter/usr/share/jmeter/bin
-	install -m 755 debian/wrappers/jmeter debian/jmeter/usr/share/jmeter/bin
-	install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
+export CLASSPATH=$(shell echo "$(JARS)" | tr -s ' ' ':')
+
+%:
+	dh $@ --with javahelper
 
-clean::
-	rm -Rf docs
-	rm -f lib/junit/test.jar
+override_dh_auto_build:
+	dh_auto_build -- -Djmeter.version=$(VERSION) -Dlib.api=lib/opt -DincludeAntRuntime=true install docs-printable docs-api
+
+override_dh_install:
+	dh_install
+	install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --force-download --download-current-version --rename
diff --git a/debian/wrappers/jmeter b/debian/wrappers/jmeter
old mode 100644
new mode 100755

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

