[jblas] 11/30: Migrate from CDBS to DH sequencer.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository jblas.

commit 2bb603fdf8c312f72d79ceab607d68c90e7ef9a6
Author: Markus Koschany <apo at debian.org>
Date:   Mon Oct 23 00:13:40 2017 +0200

    Migrate from CDBS to DH sequencer.
---
 debian/control |  2 +-
 debian/rules   | 70 +++++++++++++++++++++++++++-------------------------------
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 5e78f50..d1ab420 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Soeren Sonnenburg <sonne at debian.org>,
  Torsten Werner <twerner at debian.org>,
  tony mancill <tmancill at debian.org>
-Build-Depends: cdbs,
+Build-Depends:
  debhelper (>= 10),
  default-jdk,
  ant-optional,
diff --git a/debian/rules b/debian/rules
index 6bcc3e1..8378908 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,30 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE    := build.xml
-DEB_ANT_BUILD_TARGET := minimal-jar javadoc
-DEB_ANT_CLEAN_TARGET := clean clean-jars
-DEB_ANT_CHECK_TARGET := test
-DEB_JARS := ant-nodeps.jar junit4.jar ant-junit4.jar ant-junit.jar
-
-# tell CDBS to be more verbose
-DEB_VERBOSE_ALL := true
-
-# override DEB_ANT_INVOKE
-#DEB_ANT_INVOKE := export LOCPATH=$(CURDIR)/debian/tmp/locale/ && export LC_ALL=en_US.UTF-8 && $(DEB_ANT_INVOKE)
-
-clean::
-	make clean || true
-	rm -rf target
-
-debian/stamp-ant-build: debian/stamp-jblas-build
-debian/stamp-jblas-build:
-	mkdir -p debian/tmp/locale/
-	localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-		export LC_ALL=en_US.UTF-8 && \
-		./configure --libpath=/usr/lib:/usr/lib/atlas
-	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
-		export LC_ALL=en_US.UTF-8 && \
-		make
-	touch $@
-
-debian/stamp-ant-check:
+export JAVA_HOME := /usr/lib/jvm/default-java
+export CLASSPATH := /usr/share/java/ant-nodeps.jar:/usr/share/java/junit4.jar:/usr/share/java/ant-junit4.jar:/usr/share/java/ant-junit.jar
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- minimal-jar javadoc
+
+override_dh_auto_clean:
+	dh_auto_clean -- clean clean-jars
+
+#debian/stamp-ant-build: debian/stamp-jblas-build
+#debian/stamp-jblas-build:
+#	mkdir -p debian/tmp/locale/
+#	localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
+#	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
+#		export LC_ALL=en_US.UTF-8 && \
+#		./configure --libpath=/usr/lib:/usr/lib/atlas
+#	export LOCPATH=$(CURDIR)/debian/tmp/locale/ && \
+#		export LC_ALL=en_US.UTF-8 && \
+#		make
+#	touch $@
+
+override_dh_auto_test:
 	# the tests need to be able to find the JNI libs
 ifeq ($(DEB_BUILD_ARCH_CPU),powerpc)
 	export LD_LIBRARY_PATH=$(CURDIR)/src/main/resources/lib/dynamic/Linux/ppc \
@@ -48,19 +40,23 @@ else
 		&& $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET)
 endif
 	touch $@
+	dh_auto_test
 
-install/jblas::
+override_dh_install:
+	dh_install
 	install -m755 -d debian/jblas/usr/lib/jni
 	install -m644 $(shell find ./src/main/resources/lib/dynamic -name '*.so') debian/jblas/usr/lib/jni
 	install -m644 -D jblas-minimal-$(DEB_UPSTREAM_VERSION)-SNAPSHOT.jar debian/jblas/usr/share/java/jblas-$(DEB_UPSTREAM_VERSION)-SNAPSHOT.jar
+
+override_dh_link:
+	dh_link
 	dh_link -pjblas /usr/share/java/jblas-$(DEB_UPSTREAM_VERSION)-SNAPSHOT.jar /usr/share/java/jblas.jar
 
-install/jblas-doc:: debian/stamp-install-jblas-doc
-debian/stamp-install-jblas-doc:
+override_dh_installdocs:
+	dh_installdocs
 	#install javadoc javadoc
 	install -m755 -d debian/jblas-doc/usr/share/doc/jblas-doc
 	cp -r javadoc debian/jblas-doc/usr/share/doc/jblas-doc/
-	touch $@
 
 get-orig-source:
 	-uscan --force-download --download-current-version

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