[Git][clojure-team/puppetlabs-i18n-clojure][debian/main] 4 commits: switch packaging to dh-clojure
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Fri Aug 28 22:37:27 BST 2026
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / puppetlabs-i18n-clojure
Commits:
a4663a00 by Jérôme Charaoui at 2026-08-09T23:34:36-04:00
switch packaging to dh-clojure
with workarounds, see
https://salsa.debian.org/clojure-team/dh-clojure/-/work_items/11
- - - - -
e7e7f572 by Jérôme Charaoui at 2026-08-09T23:34:37-04:00
d/control: bump dh compat level to 14
- - - - -
9f2585e9 by Jérôme Charaoui at 2026-08-09T23:34:37-04:00
d/rules: improve clean target
Closes: #1047675
- - - - -
bbe8411c by Jérôme Charaoui at 2026-08-09T23:37:19-04:00
Update changelog for 1.0.4-3 release
- - - - -
6 changed files:
- debian/changelog
- debian/control
- − debian/libpuppetlabs-i18n-clojure.classpath
- − debian/libpuppetlabs-i18n-clojure.poms
- debian/patches/0001-Lein-Local.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+puppetlabs-i18n-clojure (1.0.4-3) unstable; urgency=medium
+
+ * switch packaging to dh-clojure
+ * d/control: bump dh compat level to 14
+ * d/rules: improve clean target (Closes: #1047675)
+ * d/upstream: add metadata
+ * Remove redundant Priority: optional from source stanza.
+ * Update standards version to 4.7.4, no changes needed.
+ * Removed Rules-Requires-Root
+
+ -- Jérôme Charaoui <jerome at riseup.net> Sun, 09 Aug 2026 23:36:59 -0400
+
puppetlabs-i18n-clojure (1.0.4-2) unstable; urgency=medium
* d/control: drop unneeded deps
=====================================
debian/control
=====================================
@@ -5,15 +5,14 @@ Uploaders:
Apollon Oikonomopoulos <apoikos at debian.org>,
Jérôme Charaoui <jerome at riseup.net>,
Build-Depends:
- debhelper-compat (= 13),
+ debhelper-compat (= 14),
default-jdk-headless,
+ dh-clojure,
gettext-base (>= 0.21-3),
git <!nocheck>,
javahelper,
- leiningen,
libcpath-clojure (>= 0.1.2-2),
libkitchensink-clojure (>= 3.5.7) <!nocheck>,
- maven-repo-helper,
Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure
@@ -22,12 +21,7 @@ Homepage: https://github.com/OpenVoxProject/clj-i18n
Package: libpuppetlabs-i18n-clojure
Architecture: all
Depends:
- gettext-base (>= 0.21-3),
- libcpath-clojure (>= 0.1.2-2),
- ${java:Depends},
- ${misc:Depends},
-Recommends:
- ${java:Recommends},
+ ${maven:Depends},
Description: Clojure i18n library
puppetlabs-i18n provides convenience functions to access the JVM's
localization facilities and automates managing messages and resource bundles.
=====================================
debian/libpuppetlabs-i18n-clojure.classpath deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/puppetlabs-i18n.jar /usr/share/java/clojure.jar /usr/share/java/cpath-clj.jar /usr/share/java/libintl.jar
=====================================
debian/libpuppetlabs-i18n-clojure.poms deleted
=====================================
@@ -1 +0,0 @@
-debian/pom.xml --java-lib --artifact=target/puppetlabs-i18n.jar --usj-name=puppetlabs-i18n --has-package-version
=====================================
debian/patches/0001-Lein-Local.patch
=====================================
@@ -2,7 +2,8 @@ From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
Date: Sat, 21 Jan 2023 22:40:31 -0500
Subject: Lein Local
-Patch project.clj to build with local lein.
+Workaround for dh-clojure's issue with automatic project adjustments, see
+https://salsa.debian.org/clojure-team/dh-clojure/-/work_items/11
Forwarded: not-needed
---
@@ -13,7 +14,7 @@ Index: puppetlabs-i18n-clojure/project.clj
===================================================================
--- puppetlabs-i18n-clojure.orig/project.clj
+++ puppetlabs-i18n-clojure/project.clj
-@@ -10,21 +10,21 @@
+@@ -10,21 +10,16 @@
;; 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.
@@ -21,19 +22,18 @@ Index: puppetlabs-i18n-clojure/project.clj
- [cpath-clj "0.1.2"]
- [org.gnu.gettext/libintl "0.18.3"]
- [org.openvoxproject/kitchensink "3.5.7"]]
-+ :managed-dependencies [[org.clojure/clojure "1.x"]
-+ [cpath-clj "debian"]
-+ [org.gnu.gettext/libintl "debian"]
-+ [org.openvoxproject/kitchensink "debian"]]
-
- :dependencies [[org.clojure/clojure]
- [cpath-clj]
- [org.gnu.gettext/libintl]]
++ :dependencies [[org.clojure/clojure "1.x"]
++ [cpath-clj "debian"]
++ [org.gnu.gettext/libintl "debian"]]
+- :dependencies [[org.clojure/clojure]
+- [cpath-clj]
+- [org.gnu.gettext/libintl]]
+-
- :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink]]
- :plugins [[jonase/eastwood "1.4.3"
- :exclusions [org.clojure/clojure]]]}}
-+ :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink]]}}
++ :profiles {:dev {:dependencies [[org.openvoxproject/kitchensink "debian"]]}}
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
:username :env/CLOJARS_USERNAME
@@ -42,4 +42,4 @@ Index: puppetlabs-i18n-clojure/project.clj
- :eval-in-leiningen true)
+ :eval-in-leiningen true
+
-+ :local-repo "debian/maven-repo")
++ :local-repo "debian/dh-clojure/tmp/maven-repo")
=====================================
debian/rules
=====================================
@@ -1,33 +1,28 @@
#!/usr/bin/make -f
-include /usr/share/javahelper/java-vars.mk
include /usr/share/dpkg/pkg-info.mk
-export LEIN_HOME=$(CURDIR)/.lein
-export LEIN_OFFLINE=true
-NAME=puppetlabs-i18n
+CLASSPATH := /usr/share/java/clojure.jar /usr/share/java/cpath-clj.jar /usr/share/java/libintl.jar
+export DH_CLOJURE_USJ_NAME = puppetlabs-i18n
-%:
- dh $@ --with javahelper --with maven_repo_helper
+# line below is a workaround for clojure-team/dh-clojure#11
+# see also d/patches/0001-Lein-Local.patch
+export LEIN_OFFLINE = true
-override_dh_auto_configure:
- cd debian && ln -sf /usr/share/maven-repo .
+%:
+ # the 2 lines below is a workaround for clojure-team/dh-clojure#11
+ # see also d/patches/0001-Lein-Local.patch
+ mkdir -p $(CURDIR)/debian/dh-clojure/tmp
+ ln -sf /usr/share/maven-repo $(CURDIR)/debian/dh-clojure/tmp
+ dh $@ --buildsystem=leiningen
-override_dh_auto_build:
- lein pom debian/pom.xml
- lein jar
- # symlink so we don't need a version in debian/*.poms
- cd target && ln -sf i18n-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
+execute_after_dh_auto_build:
+ jh_manifest --classpath="$(CLASSPATH)" target/i18n-$(DEB_VERSION_UPSTREAM).jar
-override_dh_auto_test:
+execute_before_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
make i18n
- lein test
endif
-override_dh_clean:
- rm -f debian/maven-repo
- rm -Rf target
- rm -Rf ressources/*
- rm -f debian/pom.xml
- dh_clean
+execute_after_dh_auto_clean:
+ rm -rf resources/*
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure/-/compare/31c367c7d75099dec0a6acde7bfd387ddd407018...bbe8411caf43c96fe82a89a41573c19c1e2ae4c8
--
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure/-/compare/31c367c7d75099dec0a6acde7bfd387ddd407018...bbe8411caf43c96fe82a89a41573c19c1e2ae4c8
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/6fb8ff2a/attachment.htm>
More information about the pkg-java-commits
mailing list