Build with the DH sequencer instead of CDBS

debian/ant.properties

+jdic-jar-present=true
+jdic-zip-present=true
+dist.javadoc.dir=dist/lib/api
+servlet-jar-present=true
+tomcat-zip-present=true

debian/changelog

 javahelp2 (2.0.05.ds1-10) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with the DH sequencer instead of CDBS
   * Depend on lib{servlet,jsp}-api-java instead of libservlet3.1-java
   * Standards-Version updated to 4.6.1
   * Switch to debhelper level 13

debian/clean

+JSearchClient_nbproject/build/
+JSearchClient_nbproject/dist/
+JSearchIndexer_nbproject/build/
+JSearchIndexer_nbproject/dist/
+javahelp_nbproject/build/
+javahelp_nbproject/dist/
+javahelp_nbproject/lib/
+jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/

debian/control

@@ -7,10 +7,10 @@ Uploaders:
  Varun Hiremath <varun@debian.org>
 Build-Depends:
  ant-optional,
- cdbs,
  debhelper-compat (= 13),
  default-jdk,
  imagemagick,
+ javahelper,
  libjsp-api-java,
  libservlet-api-java,
  maven-repo-helper

debian/javahelp2-doc.dirs

-usr/share/doc
-usr/share/doc/javahelp2-doc

debian/javahelp2-doc.install

+javahelp_nbproject/dist/lib/api /usr/share/doc/javahelp2-doc/
+

debian/javahelp2.dirs

-usr/bin
-usr/share/java

debian/javahelp2.install

+javahelp_nbproject/dist/bin/jhindexer           /usr/bin/
+javahelp_nbproject/dist/bin/jhsearch            /usr/bin/

debian/javahelp2.jlibs

+javahelp_nbproject/dist/lib/jhbasic.jar
+javahelp_nbproject/dist/lib/jh-client.jar
+javahelp_nbproject/dist/lib/jh.jar
+javahelp_nbproject/dist/lib/jsearch-client.jar
+javahelp_nbproject/dist/lib/jsearch-indexer.jar
+javahelp_nbproject/dist/lib/jsearch.jar
+javahelp_nbproject/dist/lib/jsearch-misc.jar

debian/javahelp2.poms

+debian/pom.xml --java-lib -e2.0.05 --usj-name=jhall --artifact=javahelp_nbproject/dist/lib/jhall.jar

debian/rules

 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
+%:
+	dh $@ --buildsystem=ant --with maven-repo-helper --with javahelper
 
-include /usr/share/cdbs/1/rules/debhelper.mk
+override_dh_auto_configure:
+	# Create symlink to required jars
+	mkdir -p javahelp_nbproject/lib
+	ln -s -f /usr/share/java/servlet-api.jar javahelp_nbproject/lib/servlet-api.jar
+	ln -s -f /usr/share/java/jsp-api.jar     javahelp_nbproject/lib/jsp-api.jar
 
-# package name
-p_jh                    := javahelp2
-p_doc                   := $(p_jh)-doc
-# debian dir for package
-d_jh                    := debian/$(p_jh)
+	# Remove class uncompilable without JDIC
+	rm -f jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
 
-makebuilddir/$(p_jh)::
-	mkdir -p $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/
-	cd $(DEB_SRCDIR)/debian/icons/; \
+override_dh_auto_build:
+	mkdir -p jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/
+	cd debian/icons/; \
 	for file in *.xpm; do \
 		fileTarget=`echo $$file|sed -e 's|.xpm|.png|g'`; \
-		convert $(DEB_SRCDIR)/$$file +set date:create +set date:modify -define png:exclude-chunk=time $(CURDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/$$fileTarget; \
+		convert $$file +set date:create +set date:modify -define png:exclude-chunk=time $(CURDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/$$fileTarget; \
 	done
 
-build/$(p_jh):: stamp-build-$(p_jh)
+	dh_auto_build -- -f javahelp_nbproject/build.xml release javadoc
 
-# This target is here to avoid multiple invocation of build target.
-# build/$(p_jh) is invoked 2 times when building binary packages.
-stamp-build-$(p_jh):
-	#Create symlink to required jars
-	mkdir -p $(DEB_SRCDIR)/javahelp_nbproject/lib
-	ln -s -f /usr/share/java/servlet-api.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
-	ln -s -f /usr/share/java/jsp-api.jar     $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
-	#Remove class uncompilable without JDIC
-	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
-	#Build javahelp target 'release' is for jars, target 'javadoc' is for javadoc
-	ant -f $(DEB_SRCDIR)/javahelp_nbproject/build.xml -Djdic-jar-present=true -Djdic-zip-present=true \
-	-Ddist.javadoc.dir=dist/lib/api \
-	-Dservlet-jar-present=true -Dtomcat-zip-present=true release javadoc
-	touch $@
-
-install/$(p_jh)::
-	# maven
-	mh_installpom -p$(p_jh) debian/pom.xml
-	mh_installjar -p$(p_jh) -i$(DEB_UPSTREAM_VERSION) -l -njhall debian/pom.xml \
-		$(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jhall.jar
-	# other jars under /usr/share/java
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jhbasic.jar         $(d_jh)/usr/share/java/jhbasic-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jh-client.jar       $(d_jh)/usr/share/java/jh-client-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jh.jar              $(d_jh)/usr/share/java/jh-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jsearch-client.jar  $(d_jh)/usr/share/java/jsearch-client-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jsearch-indexer.jar $(d_jh)/usr/share/java/jsearch-indexer-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jsearch.jar         $(d_jh)/usr/share/java/jsearch-$(DEB_UPSTREAM_VERSION).jar
-	install -m 644 $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/jsearch-misc.jar    $(d_jh)/usr/share/java/jsearch-misc-$(DEB_UPSTREAM_VERSION).jar
-	dh_link -p$(p_jh) usr/share/java/jhall-$(DEB_UPSTREAM_VERSION).jar           usr/share/java/jhall.jar
-	dh_link -p$(p_jh) usr/share/java/jhbasic-$(DEB_UPSTREAM_VERSION).jar         usr/share/java/jhbasic.jar
-	dh_link -p$(p_jh) usr/share/java/jh-client-$(DEB_UPSTREAM_VERSION).jar       usr/share/java/jh-client.jar
-	dh_link -p$(p_jh) usr/share/java/jh-$(DEB_UPSTREAM_VERSION).jar              usr/share/java/jh.jar
-	dh_link -p$(p_jh) usr/share/java/jsearch-client-$(DEB_UPSTREAM_VERSION).jar  usr/share/java/jsearch-client.jar
-	dh_link -p$(p_jh) usr/share/java/jsearch-indexer-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jsearch-indexer.jar
-	dh_link -p$(p_jh) usr/share/java/jsearch-$(DEB_UPSTREAM_VERSION).jar         usr/share/java/jsearch.jar
-	dh_link -p$(p_jh) usr/share/java/jsearch-misc-$(DEB_UPSTREAM_VERSION).jar    usr/share/java/jsearch-misc.jar
-	# copy the shell scripts
-	install -m 755 $(DEB_SRCDIR)/javahelp_nbproject/dist/bin/jhindexer $(d_jh)/usr/bin/
-	install -m 755 $(DEB_SRCDIR)/javahelp_nbproject/dist/bin/jhsearch $(d_jh)/usr/bin/
-
-install/$(p_doc)::
-	dh_installdocs -p$(p_doc) $(DEB_SRCDIR)/javahelp_nbproject/dist/lib/api
-
-clean::
-	# these files are left by cdbs (a bug?)
-	-rm -f *.cdbs-config_list
-	-rm -f stamp-build-$(p_jh)
-
-	rm -rf $(DEB_SRCDIR)/javahelp_nbproject/build
-	rm -rf $(DEB_SRCDIR)/javahelp_nbproject/dist
-	rm -rf $(DEB_SRCDIR)/javahelp_nbproject/lib
-	rm -rf $(DEB_SRCDIR)/JSearchClient_nbproject/build
-	rm -rf $(DEB_SRCDIR)/JSearchClient_nbproject/dist
-	rm -rf $(DEB_SRCDIR)/JSearchIndexer_nbproject/build
-	rm -rf $(DEB_SRCDIR)/JSearchIndexer_nbproject/dist
-	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/images/*.png
-	
-	mh_clean
+override_dh_auto_clean: