bastif pushed to branch master at Debian Java Maintainers / vnu
Commits:
d2b0607f by Fab Stz at 2026-05-14T11:38:03+02:00
Fix build of arch "any"
Gbp-Dch: Ignore
- - - - -
1 changed file:
- debian/rules
Changes:
=====================================
debian/rules
=====================================
@@ -81,7 +81,7 @@ execute_after_dh_clean:
override_dh_auto_clean:
python3 checker.py $(BUILD_ARGS) clean
-override_dh_auto_build:
+override_dh_auto_build-indep:
mkdir -p dependencies # Required by build.py
python3 checker.py $(BUILD_ARGS) build
python3 checker.py $(BUILD_ARGS) war
@@ -91,23 +91,23 @@ override_dh_auto_build:
-M date:"$$(date -d'@$(SOURCE_DATE_EPOCH)' +%Y-%m-%d)"
docs/$${page}.1.md > docs/$${page}.1 ; \
done
-override_dh_auto_test:
+override_dh_auto_test-indep:
python3 ./checker.py --verbose $(BUILD_ARGS) test
python3 ./checker.py $(BUILD_ARGS) check
-execute_after_dh_auto_install:
+execute_after_dh_auto_install-indep:
# Unpack content of war file to debian/tmp
mkdir -p debian/tmp/usr/share/vnu/webapp
cd debian/tmp/usr/share/vnu/webapp && jar -xvf
$(CURDIR)/build/dist-war/vnu.war
-execute_before_dh_install:
+execute_before_dh_install-indep:
sed "s#@jars@#$(VNU_MODULES_CLASSPATH) $(VNU_BUILDDEPS_CLASSPATH)#"
debian/java-wrappers/vnu.in > debian/java-wrappers/vnu; \
sed "s#@jars@#$(VNU_MODULES_CLASSPATH) $(VNU_BUILDDEPS_CLASSPATH)
$(VNU_SERVER_BUILDDEPS_CLASSPATH)#" debian/java-wrappers/vnu-server.in >
debian/java-wrappers/vnu-server; \
for wrapper in vnu vnu-server; do \
chmod +x debian/java-wrappers/$${wrapper} ;\
done
-execute_after_dh_install:
+execute_after_dh_install-arch:
ifneq ($(filter $(ARCH_REQUIRING_CUSTOM_XSS),$(DEB_HOST_ARCH)),)
mkdir -p debian/vnu-jetty9/etc/jetty9/start.d/
mkdir -p debian/vnu-jetty12/etc/jetty12/start.d/
@@ -118,14 +118,14 @@ endif
override_dh_installchangelogs:
dh_installchangelogs --no-trim CHANGELOG.md
-execute_before_dh_link:
+execute_before_dh_link-indep:
touch debian/vnu-common.links.in
cp -a debian/vnu-common.links.in debian/vnu-common.links
for jar in $(cp); do \
echo "$${jar} usr/share/vnu/webapp/WEB-INF/lib/$$(basename
"$${jar}")" >> debian/vnu-common.links ;\
done
-execute_after_jh_manifest:
+execute_after_jh_manifest-indep:
# Set the Class-Path on some jars in a copy in a temporary location for
use by jh_depends
# This is to set the java:Depends automatically on the vnu, vnu-client
and vnu-server packages
# and leave the libvnu-java package clean.
@@ -144,7 +144,9 @@ execute_after_jh_manifest:
# Otherwise we may encounter https://github.com/qos-ch/slf4j/issues/470
#jh_manifest -plibvnu-java -c "$(VNU_BUILDDEPS_CLASSPATH)"
-override_jh_depends:
+override_jh_depends-arch:
+
+override_jh_depends-indep:
# jh_depends reads the Class-Path of the manifest to fill the
java:Depends
# So we have to fill the manifest correctly which is done in
execute_after_jh_manifest
View it on GitLab:
https://salsa.debian.org/java-team/vnu/-/commit/d2b0607fe514011655cfab4c38463804208bbb13
--
View it on GitLab:
https://salsa.debian.org/java-team/vnu/-/commit/d2b0607fe514011655cfab4c38463804208bbb13
You're receiving this email because of your account on salsa.debian.org. Manage
all notifications: https://salsa.debian.org/-/profile/notifications | Help:
https://salsa.debian.org/help
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
