[bsh] 47/50: 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 bsh.

commit 392d02aa93c75e9377f8f09b1e06d5501efdc0ed
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Nov 30 00:16:21 2017 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 564497b..211c2ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 bsh (2.0b4-19) UNRELEASED; urgency=medium
 
+  * Build with the DH sequencer instead of CDBS
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f3e4aea
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,6 @@
+# remove tests which also fail with SUN JDK 1.4
+tests/test-scripts/accessibility.bsh
+tests/test-scripts/class13.bsh
+tests/test-scripts/class3.bsh
+tests/test-scripts/classinterf1.bsh
+tests/test-scripts/strings.bsh
diff --git a/debian/control b/debian/control
index f5b50b6..762e88c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 10),
  default-jdk,
  default-jdk-doc,
diff --git a/debian/rules b/debian/rules
index bd19360..d61c426 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,30 @@
 #!/usr/bin/make -f
-# debian/rules file for bsh (uses cdbs)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := servlet-api-3.1 bsf javacc
-DEB_ANT_BUILD_TARGET := javadoc jarall test
-ANT_OPTS              = -Dcompile.debug=true
-
-clean::
-	# remove tests which also fail with SUN JDK 1.4
-	rm -f tests/test-scripts/accessibility.bsh \
-				tests/test-scripts/class13.bsh \
-				tests/test-scripts/class3.bsh \
-				tests/test-scripts/classinterf1.bsh \
-				tests/test-scripts/strings.bsh
-	mh_clean
-
-install/$(PACKAGE)::
+
+include /usr/share/dpkg/pkg-info.mk
+
+export CLASSPATH=/usr/share/java/bsf.jar:/usr/share/java/servlet-api-3.1.jar:/usr/share/java/javacc.jar
+
+%:
+	dh $@ --with maven-repo-helper
+
+override_dh_auto_build:
+	dh_auto_build -- javadoc jarall -Dcompile.debug=true
+
+override_dh_auto_test:
+	dh_auto_build -- test
+
+override_dh_auto_install:
 	mh_installpoms -plibbsh-java
-	mh_installjar -plibbsh-java -l debian/pom.xml dist/$(PACKAGE)-$(VERSION).jar
+	mh_installjar -plibbsh-java -l debian/pom.xml dist/bsh-$(DEB_VERSION_UPSTREAM).jar
 	install -m 755 debian/_bsh debian/bsh/usr/bin/bsh
 	install -m 755 debian/xbsh debian/bsh/usr/bin/
 
-install/bsh-src:: binary-install/bsh-doc
 	mkdir -p debian/bsh-src/usr/src/bsh-src
 	tar --exclude debian --exclude classes --exclude dist --exclude api \
 		-zcf debian/bsh-src/usr/src/bsh-src/bsh.tar.gz *
 
-binary-fixup/bsh-doc::
-	jh_depends -pbsh-doc
-
 get-orig-source:
-	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename --repack
+	-uscan --download-current-version --force-download --rename --repack
 
 get-orig-pom:
-	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(VERSION)/bsh-$(VERSION).pom
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/beanshell/bsh/$(DEB_VERSION_UPSTREAM)/bsh-$(DEB_VERSION_UPSTREAM).pom

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