Andreas Tille pushed to branch master at Debian Java Maintainers / olap4j
Commits: 49774771 by Andreas Tille at 2025-01-27T17:13:00+01:00 Switch from cdbs to dh - - - - - 3 changed files: - debian/changelog - debian/control - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -6,6 +6,7 @@ olap4j (1.2.0-3) UNRELEASED; urgency=medium * d/copyright: review (thanks to lrc) * Install NOTICE file * Fix Vcs fields + * Switch from cdbs to dh -- Andreas Tille <[email protected]> Mon, 27 Jan 2025 16:37:02 +0100 ===================================== debian/control ===================================== @@ -3,7 +3,11 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Damien Raude-Morvan <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 10), default-jdk, maven-repo-helper +Build-Depends: debhelper (>= 10), + javahelper, + ant, + default-jdk-headless, + maven-repo-helper Build-Depends-Indep: ant-contrib, ant-optional, default-jdk-doc, ===================================== debian/rules ===================================== @@ -1,7 +1,6 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/dpkg/default.mk JAVA_HOME := /usr/lib/jvm/default-java @@ -13,18 +12,23 @@ DEB_ANT_BUILD_TARGET := version-properties jar xmla-jar tck-jar javadoc #DEB_ANT_CHECK_TARGET := test DEB_ANT_CLEAN_TARGET := clean -install/libolap4j-java:: +%: + dh $@ --with javahelper + +override_dh_auto_clean: + mh_clean + +override_dh_auto_build: + #dh_auto_build -- -f $(DEB_ANT_BUILDFILE) + ant -propertyfile debian/ant.properties $(DEB_ANT_BUILD_TARGET) + +override_dh_install: + dh_install mh_installpom -plibolap4j-java debian/pom-olap4j.xml - mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j.xml dist/olap4j-$(DEB_UPSTREAM_VERSION).jar + mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j.xml dist/olap4j-$(DEB_VERSION_UPSTREAM).jar mh_installpom -plibolap4j-java debian/pom-olap4j-xmla.xml - mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-xmla.xml dist/olap4j-xmla-$(DEB_UPSTREAM_VERSION).jar + mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-xmla.xml dist/olap4j-xmla-$(DEB_VERSION_UPSTREAM).jar mh_installpom -plibolap4j-java debian/pom-olap4j-tck.xml - mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-tck.xml dist/olap4j-tck-$(DEB_UPSTREAM_VERSION).jar - -clean:: - mh_clean - -get-orig-source: - uscan --force-download + mh_installjar -plibolap4j-java --has-package-version --java-lib debian/pom-olap4j-tck.xml dist/olap4j-tck-$(DEB_VERSION_UPSTREAM).jar View it on GitLab: https://salsa.debian.org/java-team/olap4j/-/commit/49774771afdfa320b632afaa535f2ed96cc68be2 -- View it on GitLab: https://salsa.debian.org/java-team/olap4j/-/commit/49774771afdfa320b632afaa535f2ed96cc68be2 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
