[Git][java-team/libjgraphx-java][master] drop CDBS

[Alexandre Detiste (@detiste-guest)]

Alexandre Detiste pushed to branch master at Debian Java Maintainers / libjgraphx-java


Commits:
d70d0594 by Alexandre Detiste at 2025-09-03T23:54:49+02:00
drop CDBS

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+libjgraphx-java (2.1.0.7-6) unstable; urgency=medium
+
+  * QA upload.
+  * Redo build without CDBS (Closes: #1099964)
+
+ -- Alexandre Detiste <tchet at debian.org>  Wed, 03 Sep 2025 23:40:13 +0200
+
 libjgraphx-java (2.1.0.7-5) unstable; urgency=medium
 
   * QA upload.


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


=====================================
debian/control
=====================================
@@ -3,12 +3,11 @@ Section: java
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
 Build-Depends: ant,
-               cdbs,
-               debhelper (>= 10~),
+               debhelper-compat (= 13),
                default-jdk,
+               javahelper,
                fop,
-               quilt,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Vcs-Git: https://salsa.debian.org/java-team/libjgraphx-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libjgraphx-java
 
@@ -34,6 +33,7 @@ Description: Java Swing Diagramming Library
 
 Package: libjgraphx-java-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
 Suggests: libjgraphx-java,


=====================================
debian/rules
=====================================
@@ -1,13 +1,10 @@
 #!/usr/bin/make -f
-# debian/rules for libjgraphx-java (uses CDBS)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/pkg-info.mk
 
-DEB_ANT_BUILD_TARGET := build doc example
-BUILDDIR := lib
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+	dh $@ --with javahelper
 
-install/libjgraphx-java::
-	install -m 644 -D $(BUILDDIR)/jgraphx.jar debian/libjgraphx-java/usr/share/java/jgraphx-$(DEB_UPSTREAM_VERSION).jar
-	ln -s jgraphx-$(DEB_UPSTREAM_VERSION).jar debian/libjgraphx-java/usr/share/java/jgraphx.jar
+execute_after_dh_auto_install:
+	install -m 644 -D lib/jgraphx.jar debian/libjgraphx-java/usr/share/java/jgraphx-$(DEB_VERSION_UPSTREAM).jar
+	ln -s jgraphx-$(DEB_VERSION_UPSTREAM).jar debian/libjgraphx-java/usr/share/java/jgraphx.jar



View it on GitLab: https://salsa.debian.org/java-team/libjgraphx-java/-/commit/d70d0594ccf0465bf1dc0841221156ee93217103

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjgraphx-java/-/commit/d70d0594ccf0465bf1dc0841221156ee93217103
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/20250903/8b73da15/attachment.htm>