Alexandre Detiste pushed to branch master at Debian Java Maintainers / nekohtml
Commits: 9f0f14d3 by Alexandre Detiste at 2025-09-04T16:06:01+02:00 drop CDBS from build - - - - - 4 changed files: - debian/changelog - − debian/compat - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +nekohtml (1.9.22.noko2-1) unstable; urgency=medium + + * Team upload. + * Drop CDBS from build + + -- Alexandre Detiste <[email protected]> Thu, 04 Sep 2025 15:48:42 +0200 + nekohtml (1.9.22.noko2-0.1) unstable; urgency=medium * Non-maintainer upload. @@ -98,13 +105,13 @@ nekohtml (1.9.12-1) experimental; urgency=low * Split the package into a pure binary and a documentation package, put the main docs in the binary package, and the api docs in the doc package - * Update the copyright to follow the new proposal format, and remove + * Update the copyright to follow the new proposal format, and remove full text of Apache license to remove Lintian warnings * Add the Maven POM to the package, * Add a Build-Depends-Indep dependency on maven-repo-helper * Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository - * Change Build-Depends from libxalan-java to libjaxp3-java and + * Change Build-Depends from libxalan-java to libjaxp3-java and add libjaxp3-java as it contains the xml-apis.jar needed for the build and runtime on Java < 6. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -9 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marcus Better <[email protected]> -Build-Depends: debhelper (>= 9), cdbs, default-jdk +Build-Depends: debhelper-compat (= 13), default-jdk Build-Depends-Indep: maven-repo-helper, ant, libxerces2-java (>= 2.9.1) Standards-Version: 3.9.6 Vcs-Git: https://salsa.debian.org/java-team/nekohtml.git ===================================== debian/rules ===================================== @@ -1,30 +1,18 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/dpkg/pkg-info.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := xercesImpl -DEB_ANT_BUILD_TARGET := jar jar-xni doc -DEB_ANT_BUILDFILE := build.xml -DEB_ANT_ARGS := -Dname=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := build/doc/api +export CLASSPATH=/usr/share/java/xercesImpl.jar -get-orig-source: - uscan --download-version $(VERSION) --force-download --rename +%: + dh $@ -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) pom.xml build/lib/$(PACKAGE).jar - mh_installjar -plib$(PACKAGE)-java -l --usj-version=$(VERSION) debian/nekohtml-xni.pom build/lib/$(PACKAGE)Xni.jar - -binary-post-install/lib$(PACKAGE)-java-doc:: - dh_install -plib$(PACKAGE)-java-doc doc usr/share/doc/lib$(PACKAGE)-java - dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java - -clean:: - mh_clean - -rm -rf debian/tmp +execute_after_dh_auto_build: + ant jar-xni +execute_after_dh_auto_install: + mh_installpoms -plibnekohtml-java + mh_installjar -plibnekohtml-java -l --usj-version=$(DEB_VERSION_UPSTREAM) pom.xml build/lib/nekohtml.jar + mh_installjar -plibnekohtml-java -l --usj-version=$(DEB_VERSION_UPSTREAM) debian/nekohtml-xni.pom build/lib/nekohtmlXni.jar + dh_install -plibnekohtml-java-doc doc usr/share/doc/libnekohtml-java + dh_install -plibnekohtml-java-doc build/doc/api usr/share/doc/libnekohtml-java View it on GitLab: https://salsa.debian.org/java-team/nekohtml/-/commit/9f0f14d3a121b2eec7dd98de3517eebe991d3b3a -- View it on GitLab: https://salsa.debian.org/java-team/nekohtml/-/commit/9f0f14d3a121b2eec7dd98de3517eebe991d3b3a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
