[Git][java-team/dita-ot][master] Rough attempt to replace cdbs by dh

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Java Maintainers / dita-ot


Commits:
7e81bc2a by Andreas Tille at 2025-08-14T22:18:45+02:00
Rough attempt to replace cdbs by dh

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 8~), cdbs, ant, javahelper,
+Build-Depends: debhelper (>= 8~), ant, javahelper,
 Build-Depends-Indep: default-jdk, libcommons-codec-java, libxerces2-java,
  libsaxon-java, libicu4j-4.4-java, libxml-commons-resolver1.1-java
 Standards-Version: 3.9.3


=====================================
debian/rules
=====================================
@@ -1,30 +1,29 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
 JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := xml-resolver commons-codec xercesImpl xalan2 commons-logging icu4j saxon
 
+export CLASSPATH=/usr/share/java/xml-resolver.jar:/usr/share/java/commons-codec.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xalan2.jar:/usr/share/java/commons-logging.jar:/usr/share/java/icu4j.jar:/usr/share/java/saxon.jar
+
+# you need to replace or remove this
 DEB_ANT_BUILDFILE := buildPackage.xml
 DEB_ANT_BUILD_TARGET := package-java update-doc package-binary-minimum
 DEB_ANT_CLEAN_TARGET := clean-package clean-java cleanup
 
+%:
+	dh $@ --with javahelper
+
 # Minimal version does not install fo.jar
-build:
+override_dh_auto_build:
 	cd demo/fo && CLASSPATH=$(DEB_CLASSPATH) ant -f buildPackage.xml package-java
 
 DITA_OT_DIR=debian/dita-ot/usr/share/dita-ot
-install/dita-ot::
+override_dh_auto_install:
 	mkdir -p $(DITA_OT_DIR)
 	tar xf build/dita-minimal.tar.gz --directory=$(DITA_OT_DIR) --strip-components=1
 	rm -rf $(DITA_OT_DIR)/demo/fo/src
 	cp -r demo/fo/lib $(DITA_OT_DIR)/demo/fo
 
-clean::
+override_dh_auto_clean:
 	rm -rf build.xml demo/fo/build.xml demo/fo/bin demo/fo/lib lib/dost.jar out \
 		xsl/preprocess/maplink.xsl xsl/preprocess/mappull.xsl \
 		xsl/preprocess/mapref.xsl xsl/map2plugin.xsl catalog-dita.xml
-
-get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --verbose --force-download



View it on GitLab: https://salsa.debian.org/java-team/dita-ot/-/commit/7e81bc2ab689728d2b2db166940e808d78fd5e45

-- 
View it on GitLab: https://salsa.debian.org/java-team/dita-ot/-/commit/7e81bc2ab689728d2b2db166940e808d78fd5e45
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250814/b686b206/attachment.htm>