[Git][java-team/dynalang][master] Attempt to replace cdbs by dh (but failed)

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Java Maintainers / dynalang


Commits:
de910c36 by Andreas Tille at 2025-01-20T14:33:34+01:00
Attempt to replace cdbs by dh (but failed)

- - - - -


3 changed files:

- − debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 9), cdbs, javahelper
+Build-Depends: debhelper-compat (= 13), javahelper
 Build-Depends-Indep: ant-optional, default-jdk, junit
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/dynalang.git


=====================================
debian/rules
=====================================
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export JAVA_HOME := /usr/lib/jvm/default-java
 
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_BUILDDIR         := mop
-DEB_ANT_BUILD_TARGET := jar test doc
-DEB_JARS             := ant-junit junit ant-trax
+include /usr/share/javahelper/java-vars.mk
+DEB_JARS  := ant-junit junit ant-trax
 
-install/libdynalang-java::
-	jh_installlibs -plibdynalang-java
-	jh_installjavadoc -plibdynalang-java
+CLASSPATH = $(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \
+    echo -n $${jar}:; done; \
+    echo -n $(JAVA_HOME)/lib/tools.jar)
+
+%:
+	dh $@ --sourcedir=mop --buildsystem=ant --with javahelper
+
+override_dh_auto_build:
+	cd mop && ant -f build.xml



View it on GitLab: https://salsa.debian.org/java-team/dynalang/-/commit/de910c36a5fe8b76212faf52b18440cb9d34b366

-- 
View it on GitLab: https://salsa.debian.org/java-team/dynalang/-/commit/de910c36a5fe8b76212faf52b18440cb9d34b366
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/20250120/88fd08ff/attachment.htm>