[Git][clojure-team/trapperkeeper-clojure][debian/main] 5 commits: drop obsolete .gitignore file
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Fri Aug 28 22:57:07 BST 2026
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-clojure
Commits:
3a85ca00 by Jérôme Charaoui at 2026-08-09T13:10:57-04:00
drop obsolete .gitignore file
Gbp-Dch: ignore
- - - - -
486e3111 by Jérôme Charaoui at 2026-08-28T15:19:27-04:00
switch packaging to dh-clojure
- - - - -
99600365 by Jérôme Charaoui at 2026-08-28T19:35:15+00:00
Removed Rules-Requires-Root
Changes-By: lintian-brush
Fixes: lintian: source: redundant-rules-requires-root-no-field [debian/control]
See-also: https://lintian.debian.org/tags/redundant-rules-requires-root-no-field.html
- - - - -
fc997c8c by Jérôme Charaoui at 2026-08-28T17:20:48-04:00
d/tests: allow stderr in nrepl test
- - - - -
cdfeac27 by Jérôme Charaoui at 2026-08-28T17:21:11-04:00
Update changelog for 5.0.4-3 release
- - - - -
11 changed files:
- − debian/.gitignore
- debian/changelog
- debian/control
- + debian/dh-clojure-lein.clj
- − debian/libtrapperkeeper-clojure.classpath
- − debian/libtrapperkeeper-clojure.links
- − debian/libtrapperkeeper-clojure.poms
- − debian/patches/0001_Lein_Local.patch
- − debian/patches/series
- debian/rules
- debian/tests/control
Changes:
=====================================
debian/.gitignore deleted
=====================================
@@ -1 +0,0 @@
-!pom.xml
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+trapperkeeper-clojure (5.0.4-3) unstable; urgency=medium
+
+ * switch packaging to dh-clojure (Closes: #1105550, #1145649)
+ * d/tests: allow stderr in nrepl test
+ * Removed Rules-Requires-Root
+
+ -- Jérôme Charaoui <jerome at riseup.net> Fri, 28 Aug 2026 15:35:29 -0400
+
trapperkeeper-clojure (5.0.4-2) unstable; urgency=medium
* Upload to unstable.
=====================================
debian/control
=====================================
@@ -7,11 +7,10 @@ Uploaders:
Build-Depends:
debhelper-compat (= 14),
default-jdk-headless,
+ dh-clojure (>= 0.4.4),
javahelper,
- leiningen,
libbeckon-clojure,
libclj-time-clojure,
- libclojure-java,
libcomplete-clojure <!nocheck>,
libcore-async-clojure,
libjanino-java,
@@ -28,34 +27,15 @@ Build-Depends:
libtools-logging-clojure,
libtools-macro-clojure,
libtypesafe-config-clojure (>= 1.0.4),
- maven-repo-helper,
Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/trapperkeeper-clojure
Homepage: https://github.com/OpenVoxProject/trapperkeeper
-Rules-Requires-Root: no
Package: libtrapperkeeper-clojure
Architecture: all
Depends:
- libbeckon-clojure,
- libclj-time-clojure,
- libclojure-java,
- libcore-async-clojure,
- libjanino-java,
- libkitchensink-clojure (>= 3.5.7),
- liblogback-java,
- libprismatic-plumbing-clojure,
- libprismatic-schema-clojure,
- libpuppetlabs-i18n-clojure (>= 1.0.4),
- libraynes-fs-clojure (>= 1.6.312),
- libslf4j-java,
- libtools-logging-clojure,
- libtools-macro-clojure,
- libtypesafe-config-clojure,
- ${java:Depends},
-Recommends:
- ${java:Recommends},
+ ${maven:Depends},
Suggests:
libnrepl-clojure,
Breaks:
=====================================
debian/dh-clojure-lein.clj
=====================================
@@ -0,0 +1,17 @@
+;; Debian adjustments for project.clj
+
+(require '[debian.dh-clojure-lein.client :as deb])
+
+(defn dh-clj-adjust-project [project when & _]
+ "Drop eastwood plugin and logback-access-common, adjust slingshot coordinates"
+ (case when
+ :before-plugins
+ (-> (project)
+ (assoc :local-repo "debian/dh-clojure/tmp/maven-repo")
+ (update :plugins deb/del-dep 'jonase/eastwood))
+ :after-middleware
+ (-> (project)
+ (update :dependencies deb/add-dep '[slingshot/slingshot "debian"])
+ (update :dependencies deb/del-dep 'io.github.clj-kondo/config-slingshot-slingshot)
+ (update :dependencies deb/del-dep 'ch.qos.logback.access/logback-access-common))
+ (project)))
=====================================
debian/libtrapperkeeper-clojure.classpath deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/trapperkeeper.jar /usr/share/java/clojure.jar /usr/share/java/tools.logging.jar /usr/share/java/tools.macro.jar /usr/share/java/core.async.jar /usr/share/java/slf4j-api.jar /usr/share/java/log4j-over-slf4j.jar /usr/share/java/logback-classic.jar /usr/share/java/logback-core.jar /usr/share/java/logback-access.jar /usr/share/java/janino.jar /usr/share/java/clj-time.jar /usr/share/java/fs.jar /usr/share/java/clj-yaml.jar /usr/share/java/plumbing.jar /usr/share/java/schema.jar /usr/share/java/beckon.jar /usr/share/java/clj-typesafe-config.jar /usr/share/java/kitchensink.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/junixsocket-common.jar
=====================================
debian/libtrapperkeeper-clojure.links deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/trapperkeeper-test.jar usr/share/maven-repo/puppetlabs/trapperkeeper/debian/trapperkeeper-debian-test.jar
=====================================
debian/libtrapperkeeper-clojure.poms deleted
=====================================
@@ -1,2 +0,0 @@
-debian/pom.xml --java-lib --artifact=target/trapperkeeper.jar --usj-name=trapperkeeper
-debian/pom.xml --java-lib --artifact=target/test/trapperkeeper-test.jar --usj-name=trapperkeeper-test --classifier=test
=====================================
debian/patches/0001_Lein_Local.patch deleted
=====================================
@@ -1,127 +0,0 @@
-Author: Jérôme Charaoui <jerome at riseup.net>
-Date: Thu, 20 Oct 2022 20:20:26 -0400
-Subject: Patch project.clj to build locally with lein.
-Forwarded: not-needed
-Last-Update: 2026-07-01
-
-Index: trapperkeeper-clojure/project.clj
-===================================================================
---- trapperkeeper-clojure.orig/project.clj
-+++ trapperkeeper-clojure/project.clj
-@@ -1,6 +1,6 @@
--(def slf4j-version "2.0.18")
--(def logback-version "1.5.38")
--(def i18n-version "1.0.4")
-+(def slf4j-version "debian")
-+(def logback-version "debian")
-+(def i18n-version "debian")
-
- (defproject org.openvoxproject/trapperkeeper "5.0.4"
- :description "A framework for configuring, composing, and running Clojure services."
-@@ -19,29 +19,26 @@
- ;; this project actually uses in :dependencies, inheriting the version from
- ;; :managed-dependencies. This prevents endless version conflicts due to deps of deps.
- ;; Renovate should keep the versions largely in sync between projects.
-- :managed-dependencies [[org.clojure/clojure "1.12.5"]
-- [org.clojure/core.async "1.9.865"]
-- [org.clojure/tools.logging "1.3.1"]
-- [org.clojure/tools.macro "0.2.2"]
-+ :managed-dependencies [[org.clojure/clojure "1.x"]
-+ [org.clojure/core.async "debian"]
-+ [org.clojure/tools.logging "debian"]
-+ [org.clojure/tools.macro "debian"]
-
- [org.slf4j/slf4j-api ~slf4j-version]
- [org.slf4j/log4j-over-slf4j ~slf4j-version]
- [ch.qos.logback/logback-classic ~logback-version]
- [ch.qos.logback/logback-core ~logback-version]
-- [ch.qos.logback.access/logback-access-common "2.0.13"]
-
-- [beckon "0.1.1"]
-- [clj-commons/fs "1.6.312"]
-- [com.kohlschutter.junixsocket/junixsocket-core "2.10.1" :extension "pom"]
-- [commons-io "2.22.0"]
-- [io.github.clj-kondo/config-slingshot-slingshot "1.0.0"]
-- [nrepl/nrepl "0.9.0"]
-- [org.openvoxproject/i18n ~i18n-version]
-- [org.openvoxproject/kitchensink "3.5.7"]
-- [org.openvoxproject/kitchensink "3.5.7" :classifier "test"]
-- [org.openvoxproject/typesafe-config "1.0.4"]
-- [prismatic/plumbing "0.6.0"]
-- [prismatic/schema "1.4.1"]]
-+ [beckon "debian"]
-+ [clj-commons/fs "debian"]
-+ [com.kohlschutter.junixsocket/junixsocket-core "debian" :extension "pom"]
-+ [commons-io "debian"]
-+ [org.openvoxproject/i18n "debian"]
-+ [org.openvoxproject/kitchensink "debian"]
-+ [org.openvoxproject/kitchensink "debian" :classifier "test"]
-+ [puppetlabs/typesafe-config "debian"]
-+ [prismatic/plumbing "debian"]
-+ [prismatic/schema "debian"]]
-
- :dependencies [[org.clojure/clojure]
- [org.clojure/core.async]
-@@ -54,25 +51,17 @@
- ;; logback artifacts, specifying the dependency version here ensures
- ;; that downstream projects don't pick up different versions that would
- ;; conflict with our version of logback-classic
-- [ch.qos.logback.access/logback-access-common]
- [ch.qos.logback/logback-core]
- [clj-commons/fs]
- [com.kohlschutter.junixsocket/junixsocket-core :extension "pom"]
-- [io.github.clj-kondo/config-slingshot-slingshot]
-- [nrepl/nrepl]
- [org.openvoxproject/i18n ~i18n-version]
- [org.openvoxproject/kitchensink :exclusions [cheshire]]
-- [org.openvoxproject/typesafe-config]
-+ [puppetlabs/typesafe-config]
- [org.slf4j/log4j-over-slf4j]
- [org.slf4j/slf4j-api]
- [prismatic/plumbing]
- [prismatic/schema]]
-
-- :deploy-repositories [["releases" {:url "https://clojars.org/repo"
-- :username :env/CLOJARS_USERNAME
-- :password :env/CLOJARS_PASSWORD
-- :sign-releases false}]]
--
- ;; Convenience for manually testing application shutdown support - run `lein test-external-shutdown`
- :aliases {"test-external-shutdown" ["trampoline" "run" "-m" "examples.shutdown-app.test-external-shutdown"]}
-
-@@ -85,30 +74,15 @@
- :profiles {:dev {:source-paths ["examples/shutdown_app/src"
- "examples/java_service/src/clj"]
- :java-source-paths ["examples/java_service/src/java"]
-- :dependencies [[org.openvoxproject/kitchensink :exclusions [cheshire] :classifier "test"]]}
-+ :jar-exclusions [#".*/locales\.clj"]
-+ :dependencies [[org.openvoxproject/kitchensink "debian" :exclusions [cheshire] :classifier "test"]]}
-
- :testutils {:source-paths ^:replace ["test"]}
- :uberjar {:aot [puppetlabs.trapperkeeper.main]
- :classifiers ^:replace []}}
-
-- :plugins [[jonase/eastwood "1.4.3" :exclusions [org.clojure/clojure]]
-- [org.openvoxproject/i18n ~i18n-version]]
--
-- :eastwood {:ignored-faults {:reflection {puppetlabs.trapperkeeper.logging [{:line 92}]
-- puppetlabs.trapperkeeper.internal [{:line 230}]
-- puppetlabs.trapperkeeper.testutils.logging true
-- puppetlabs.trapperkeeper.testutils.logging-test true
-- puppetlabs.trapperkeeper.services.nrepl.nrepl-service-test true
-- puppetlabs.trapperkeeper.plugins-test true}
-- :local-shadows-var {puppetlabs.trapperkeeper.config-test true
-- puppetlabs.trapperkeeper.services-test true
-- java-service-example.java-service true
-- puppetlabs.trapperkeeper.optional-deps-test true}
-- :deprecations {puppetlabs.trapperkeeper.testutils.logging true
-- puppetlabs.trapperkeeper.testutils.logging-test true
-- puppetlabs.trapperkeeper.logging-test true}
-- :def-in-def {puppetlabs.trapperkeeper.optional-deps-test true}}
-+ :plugins [[org.openvoxproject/i18n "debian" :exclusions [org.clojure/clojure]]]
-
-- :continue-on-exception true}
-+ :main puppetlabs.trapperkeeper.main
-
-- :main puppetlabs.trapperkeeper.main)
-+ :local-repo "debian/maven-repo")
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-0001_Lein_Local.patch
=====================================
debian/rules
=====================================
@@ -1,36 +1,13 @@
#!/usr/bin/make -f
include /usr/share/dpkg/pkg-info.mk
-include /usr/share/javahelper/java-vars.mk
-export LEIN_HOME=$(CURDIR)/.lein
-export LEIN_OFFLINE=true
-NAME=trapperkeeper
+CLASSPATH := /usr/share/java/clojure.jar /usr/share/java/tools.logging.jar /usr/share/java/tools.macro.jar /usr/share/java/core.async.jar /usr/share/java/slf4j-api.jar /usr/share/java/log4j-over-slf4j.jar /usr/share/java/logback-classic.jar /usr/share/java/logback-core.jar /usr/share/java/logback-access.jar /usr/share/java/janino.jar /usr/share/java/clj-time.jar /usr/share/java/fs.jar /usr/share/java/clj-yaml.jar /usr/share/java/plumbing.jar /usr/share/java/schema.jar /usr/share/java/beckon.jar /usr/share/java/clj-typesafe-config.jar /usr/share/java/kitchensink.jar /usr/share/java/puppetlabs-i18n.jar /usr/share/java/junixsocket-common.jar
-%:
- dh $@ --with javahelper --with maven_repo_helper --without=single-binary
-
-override_dh_auto_configure:
- cd debian && ln -sf /usr/share/maven-repo .
+export DH_CLOJURE_INSTALL_TEST_JAR = true
-override_dh_auto_build:
- lein pom debian/pom.xml
- lein i18n make
- lein jar
- # symlinks so we don't need a version in debian/*.poms
- cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
- cd target/test && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM)-test.jar $(NAME)-test.jar
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- if ! lein test ; then \
- cat /tmp/clojure-*.edn ; \
- exit 1 ; \
- fi
-endif
+%:
+ dh $@ --buildsystem=leiningen
-override_dh_clean:
- rm -Rf target resources
- rm -f debian/maven-repo
- rm -f debian/pom.xml
- dh_clean
+execute_after_dh_auto_build:
+ jh_manifest --classpath="$(CLASSPATH)" target/trapperkeeper-$(DEB_VERSION_UPSTREAM).jar
=====================================
debian/tests/control
=====================================
@@ -24,3 +24,5 @@ Depends:
libbultitude-clojure,
libnrepl-clojure,
@,
+Restrictions:
+ allow-stderr,
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/480f7f8f31219986ba70f3a7b68ab58564683a4c...cdfeac27a40f2dfb9ccfe4359375758b4b5d348e
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/480f7f8f31219986ba70f3a7b68ab58564683a4c...cdfeac27a40f2dfb9ccfe4359375758b4b5d348e
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/20260828/c9eec77b/attachment.htm>
More information about the pkg-java-commits
mailing list