[Git][clojure-team/trapperkeeper-clojure][debian/main] 8 commits: d/patches: fix lein local patch
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Tue Jul 28 00:39:26 BST 2026
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-clojure
Commits:
37326b04 by Jérôme Charaoui at 2026-07-27T12:00:53-04:00
d/patches: fix lein local patch
the patch was not rebased correctly and dropped the junixsocket
dependency, which this change restores
- - - - -
3d69a5ad by Jérôme Charaoui at 2026-07-27T12:02:24-04:00
d/rules: re-enable build tests
- - - - -
0776211a by Jérôme Charaoui at 2026-07-27T12:02:41-04:00
add junixsocket to classpath
- - - - -
d8523df2 by Jérôme Charaoui at 2026-07-27T12:26:13-04:00
d/control: update Standards-Version, no changes needed
- - - - -
870d1053 by Jérôme Charaoui at 2026-07-27T16:12:05-04:00
d/control: bump dh compat level to 14
- - - - -
c322e35f by Jérôme Charaoui at 2026-07-27T16:12:05-04:00
d/control: drop unnecessary Priority: optional
- - - - -
e6beaa09 by Jérôme Charaoui at 2026-07-27T16:22:05-04:00
d/watch: update to format version 5
- - - - -
480f7f8f by Jérôme Charaoui at 2026-07-27T16:22:48-04:00
Update changelog for 5.0.4-2 release
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/libtrapperkeeper-clojure.classpath
- debian/patches/0001_Lein_Local.patch
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+trapperkeeper-clojure (5.0.4-2) unstable; urgency=medium
+
+ * Upload to unstable.
+ * d/control: update Standards-Version, no changes needed
+ * d/control: bump dh compat level to 14
+ * d/control: drop unnecessary Priority: optional
+ * d/patches: fix lein local patch
+ * d/rules: re-enable build tests
+ * d/watch: update to format version 5
+ * add junixsocket to classpath
+
+ -- Jérôme Charaoui <jerome at riseup.net> Mon, 27 Jul 2026 12:36:52 -0400
+
trapperkeeper-clojure (5.0.4-1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,12 +1,11 @@
Source: trapperkeeper-clojure
Section: java
-Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
Uploaders:
Jérôme Charaoui <jerome at riseup.net>,
Louis-Philippe Véronneau <pollo at debian.org>,
Build-Depends:
- debhelper-compat (= 13),
+ debhelper-compat (= 14),
default-jdk-headless,
javahelper,
leiningen,
@@ -30,7 +29,7 @@ Build-Depends:
libtools-macro-clojure,
libtypesafe-config-clojure (>= 1.0.4),
maven-repo-helper,
-Standards-Version: 4.7.2
+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
@@ -55,7 +54,6 @@ Depends:
libtools-macro-clojure,
libtypesafe-config-clojure,
${java:Depends},
- ${misc:Depends},
Recommends:
${java:Recommends},
Suggests:
=====================================
debian/libtrapperkeeper-clojure.classpath
=====================================
@@ -1 +1 @@
-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/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/patches/0001_Lein_Local.patch
=====================================
@@ -18,7 +18,7 @@ Index: trapperkeeper-clojure/project.clj
(defproject org.openvoxproject/trapperkeeper "5.0.4"
:description "A framework for configuring, composing, and running Clojure services."
-@@ -19,29 +19,25 @@
+@@ -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.
@@ -51,6 +51,7 @@ Index: trapperkeeper-clojure/project.clj
- [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"]
@@ -61,18 +62,17 @@ Index: trapperkeeper-clojure/project.clj
:dependencies [[org.clojure/clojure]
[org.clojure/core.async]
-@@ -54,25 +50,16 @@
+@@ -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"]
+ [com.kohlschutter.junixsocket/junixsocket-core :extension "pom"]
- [io.github.clj-kondo/config-slingshot-slingshot]
- [nrepl/nrepl]
-- [org.openvoxproject/i18n ~i18n-version]
-+ [org.openvoxproject/i18n "debian"]
+ [org.openvoxproject/i18n ~i18n-version]
[org.openvoxproject/kitchensink :exclusions [cheshire]]
- [org.openvoxproject/typesafe-config]
+ [puppetlabs/typesafe-config]
@@ -89,7 +89,7 @@ Index: trapperkeeper-clojure/project.clj
;; 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 +72,15 @@
+@@ -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"]
=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export LEIN_OFFLINE=true
NAME=trapperkeeper
%:
- dh $@ --with javahelper --with maven_repo_helper
+ dh $@ --with javahelper --with maven_repo_helper --without=single-binary
override_dh_auto_configure:
cd debian && ln -sf /usr/share/maven-repo .
@@ -23,12 +23,10 @@ override_dh_auto_build:
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- # Needs libjunixsocket-java 2.10.1, not yet upgraded
- echo "Disabled tests until libjunixsocket-java 2.10.1 is uploaded."
-# if ! lein test ; then \
-# cat /tmp/clojure-*.edn ; \
-# exit 1 ; \
-# fi
+ if ! lein test ; then \
+ cat /tmp/clojure-*.edn ; \
+ exit 1 ; \
+ fi
endif
override_dh_clean:
=====================================
debian/watch
=====================================
@@ -1,7 +1,5 @@
-version=4
-opts=\
- filenamemangle=s%.*/@ANY_VERSION@%@PACKAGE at -$1.tar.gz%,\
- downloadurlmangle=s%(api.github.com/repos/[^/]+/[^/]+)/git/refs/%$1/tarball/refs/%g,\
- searchmode=plain \
- https://api.github.com/repos/OpenVoxProject/trapperkeeper/git/matching-refs/tags/ \
- https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@
+Version: 5
+Template: GitHub
+Owner: OpenVoxProject
+Project: trapperkeeper
+Version-Type: SEMANTIC_VERSION
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/fdc08ac251b5f13a10a6a17b79e2481a7974b80a...480f7f8f31219986ba70f3a7b68ab58564683a4c
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/fdc08ac251b5f13a10a6a17b79e2481a7974b80a...480f7f8f31219986ba70f3a7b68ab58564683a4c
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/20260727/704ef07c/attachment.htm>
More information about the pkg-java-commits
mailing list