[Git][java-team/orchid][master] 2 commits: Bump Standards-Version and debhelper compat; drop redundant fields

[Masayuki Hatta (@mhatta)]

Masayuki Hatta pushed to branch master at Debian Java Maintainers / orchid


Commits:
a0aec037 by Masayuki Hatta at 2026-11-03T22:26:25+09:00
Bump Standards-Version and debhelper compat; drop redundant fields

- - - - -
bb041473 by Masayuki Hatta at 2026-11-03T22:36:36+09:00
Salsa CI: skip the i386 build, the package is arch:all only

- - - - -


3 changed files:

- debian/control
- debian/rules
- debian/salsa-ci.yml


Changes:

=====================================
debian/control
=====================================
@@ -1,9 +1,8 @@
 Source: orchid
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Masayuki Hatta <mhatta at debian.org>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 14),
                default-jdk-headless,
                javahelper,
                maven-repo-helper
@@ -12,8 +11,7 @@ Build-Depends-Indep: junit4 <!nocheck>,
                      libeasymock-java <!nocheck>,
                      libhamcrest-java <!nocheck>,
                      libobjenesis-java <!nocheck>
-Standards-Version: 4.7.2
-Rules-Requires-Root: no
+Standards-Version: 4.7.4
 Homepage: https://github.com/mhatta/Orchid
 Vcs-Git: https://salsa.debian.org/java-team/orchid.git
 Vcs-Browser: https://salsa.debian.org/java-team/orchid


=====================================
debian/rules
=====================================
@@ -13,7 +13,7 @@ TEST_CP := /usr/share/java/junit4.jar:/usr/share/java/hamcrest.jar:/usr/share/ja
 # The upstream build uses Gradle 8, which Debian does not have; the library
 # has no dependencies, so it is compiled with javac directly.  The class
 # files target Java 8, as upstream's.
-override_dh_auto_build:
+override_dh_auto_build-indep:
 	mkdir -p build/classes build/res
 	cp -r src/main/resources/. build/res/
 	sed -i 's/^version=.*/version=$(VERSION)/' build/res/com/subgraph/orchid/version.properties
@@ -22,7 +22,7 @@ override_dh_auto_build:
 	printf 'Main-Class: com.subgraph.orchid.TorClient\nAutomatic-Module-Name: com.subgraph.orchid\n' > build/manifest
 	jar --create --file build/orchid.jar --manifest build/manifest -C build/classes . -C build/res .
 
-override_dh_auto_test:
+override_dh_auto_test-indep:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p build/test
 	find test -name '*.java' | LC_ALL=C sort > build/test-sources


=====================================
debian/salsa-ci.yml
=====================================
@@ -1,3 +1,6 @@
 ---
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1



View it on GitLab: https://salsa.debian.org/java-team/orchid/-/compare/ad957a9cd5900b274e3a76a7adf7b15351e96bd1...bb041473f5a947b07acc3e46b37ef8d11d571055

-- 
View it on GitLab: https://salsa.debian.org/java-team/orchid/-/compare/ad957a9cd5900b274e3a76a7adf7b15351e96bd1...bb041473f5a947b07acc3e46b37ef8d11d571055
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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261103/27849368/attachment.htm>