[Git][clojure-team/ring-codec-clojure][debian/main] 9 commits: drop obsolete d/.gitignore
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Thu Jul 30 18:22:03 BST 2026
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / ring-codec-clojure
Commits:
9b7990b5 by Jérôme Charaoui at 2026-07-30T11:12:35-04:00
drop obsolete d/.gitignore
- - - - -
dacac61d by Jérôme Charaoui at 2026-07-30T11:15:14-04:00
wrap-and-sort -bastk
- - - - -
c17bb9d2 by Jérôme Charaoui at 2026-07-30T12:33:41-04:00
switch to dh-clojure packaging
- - - - -
027a38fb by Jérôme Charaoui at 2026-07-30T12:33:42-04:00
d/control: drop obsolete build-deps
- - - - -
03b5f7d3 by Jérôme Charaoui at 2026-07-30T12:33:42-04:00
d/control: bump dh compat to 14
- - - - -
a2ad84c6 by Jérôme Charaoui at 2026-07-30T12:33:43-04:00
d/control: bump Standards-Version, no changes needed
- - - - -
8841136b by Jérôme Charaoui at 2026-07-30T12:33:44-04:00
d/tests: switch autopkgtests to cognitect.test-runner
- - - - -
c5229bc3 by Jérôme Charaoui at 2026-07-30T12:33:44-04:00
d/watch: update to v5 format
- - - - -
fbdb87bb by Jérôme Charaoui at 2026-07-30T12:33:45-04:00
Update changelog for 1.3.0-2 release
- - - - -
13 changed files:
- − debian/.gitignore
- debian/changelog
- debian/control
- debian/copyright
- + debian/dh-clojure-lein.clj
- − debian/libring-codec-clojure.poms
- − debian/patches/0001-Lein-Local.patch
- − debian/patches/series
- debian/rules
- debian/tests/build
- debian/tests/control
- debian/tests/unittests
- debian/watch
Changes:
=====================================
debian/.gitignore deleted
=====================================
@@ -1 +0,0 @@
-!pom.xml
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+ring-codec-clojure (1.3.0-2) unstable; urgency=medium
+
+ * Team upload.
+ * switch to dh-clojure packaging
+ * d/control: drop obsolete build-deps
+ * d/control: bump dh compat to 14
+ * d/control: bump Standards-Version, no changes needed
+ * d/tests: switch autopkgtests to cognitect.test-runner
+ * d/watch: update to v5 format
+ * drop obsolete d/.gitignore
+ * wrap-and-sort -bastk
+
+ -- Jérôme Charaoui <jerome at riseup.net> Thu, 30 Jul 2026 12:29:40 -0400
+
ring-codec-clojure (1.3.0-1) experimental; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,18 +1,14 @@
Source: ring-codec-clojure
Section: java
-Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
-Build-Depends: debhelper-compat (= 13),
- default-jdk,
- javahelper,
- maven-repo-helper,
- libclojure-java,
- libcommons-codec-java,
- libnrepl-clojure <!nocheck>,
- libcomplete-clojure <!nocheck>,
- leiningen,
-Standards-Version: 4.6.2
+Uploaders:
+ Apollon Oikonomopoulos <apoikos at debian.org>,
+Build-Depends:
+ debhelper-compat (= 14),
+ default-jdk-headless,
+ dh-clojure,
+ javahelper,
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/clojure-team/ring-codec-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/ring-codec-clojure
Homepage: https://github.com/ring-clojure/ring-codec
@@ -20,11 +16,8 @@ Rules-Requires-Root: no
Package: libring-codec-clojure
Architecture: all
-Depends: ${java:Depends},
- ${misc:Depends},
- libclojure-java,
- libcommons-codec-java,
-Recommends: ${java:Recommends}
+Depends:
+ ${maven:Depends},
Description: Clojure library for encoding and decoding data
ring-codec provides functions for encoding and decoding data into formats
commonly used in web applications:
=====================================
debian/copyright
=====================================
@@ -4,13 +4,13 @@ Source: https://github.com/ring-clojure/ring-codec
Files: *
Copyright: © 2016 James Reeves
-License: MIT/X11
+License: MIT/X11
Files: debian/*
Copyright: 2017 Apollon Oikonomopoulos <apoikos at debian.org>
License: MIT/X11
-License: MIT/X11
+License: MIT/X11
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
@@ -19,7 +19,7 @@ License: MIT/X11
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
- .
+ .
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
.
=====================================
debian/dh-clojure-lein.clj
=====================================
@@ -0,0 +1,19 @@
+;; Debian adjustments for project.clj
+
+(require '[debian.dh-clojure-lein.client :as deb])
+
+(defn adjust-deps [deps proj]
+ "Drop dependency on criterium."
+ (cond-> deps
+ (deb/get-dep deps 'criterium) (deb/del-dep 'criterium)))
+
+(defn dh-clj-adjust-project [project when & _]
+ "Drop lein-codox plugin and process dependencies."
+ (case when
+ :before-plugins
+ (-> (project)
+ (update :plugins deb/del-dep 'lein-codox))
+ :after-middleware
+ (-> (project)
+ (update :dependencies adjust-deps project))
+ (project)))
=====================================
debian/libring-codec-clojure.poms deleted
=====================================
@@ -1 +0,0 @@
-debian/pom.xml --java-lib --artifact=target/ring-codec.jar --usj-name=ring-codec
=====================================
debian/patches/0001-Lein-Local.patch deleted
=====================================
@@ -1,32 +0,0 @@
-From: =?utf-8?b?SsOpcsO0bWUgQ2hhcmFvdWk=?= <jerome at riseup.net>
-Date: Sun, 22 Jan 2023 10:22:49 -0500
-Subject: Lein Local
-
-Patch project.clj to build locally with lein.
-
-Forwarded: not-needed
----
- project.clj | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-Index: ring-codec-clojure/project.clj
-===================================================================
---- ring-codec-clojure.orig/project.clj
-+++ ring-codec-clojure/project.clj
-@@ -3,14 +3,9 @@
- :url "https://github.com/ring-clojure/ring-codec"
- :license {:name "The MIT License"
- :url "http://opensource.org/licenses/MIT"}
-- :dependencies [[org.clojure/clojure "1.9.0"]]
-- :plugins [[lein-codox "0.10.8"]]
-+ :dependencies [[org.clojure/clojure "1.x"]]
- :codox
- {:output-path "codox"
- :source-uri "http://github.com/ring-clojure/ring-codec/blob/{version}/{filepath}#L{line}"}
- :aliases {"test-all" ["with-profile" "default:+1.10:+1.11:+1.12" "test"]}
-- :profiles
-- {:dev {:dependencies [[criterium "0.4.6"]]}
-- :1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}
-- :1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
-- :1.12 {:dependencies [[org.clojure/clojure "1.12.0"]]}})
-+ :local-repo "debian/maven-repo")
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-0001-Lein-Local.patch
=====================================
debian/rules
=====================================
@@ -1,31 +1,11 @@
#!/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=ring-codec
+CLASSPATH := /usr/share/java/clojure.jar
%:
- dh $@ --with javahelper --with maven_repo_helper
+ dh $@ --buildsystem=leiningen --without=single-binary
-override_dh_auto_configure:
- cd debian && ln -sf /usr/share/maven-repo .
-
-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 $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- lein test
-endif
-
-override_dh_clean:
- rm -f debian/maven-repo
- rm -Rf target
- rm -f debian/pom.xml
- dh_clean
+execute_after_dh_auto_build:
+ jh_manifest --classpath="$(CLASSPATH)" target/ring-codec-$(DEB_VERSION_UPSTREAM).jar
=====================================
debian/tests/build
=====================================
@@ -1,5 +1,3 @@
#!/bin/sh
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/commons-codec.jar:/usr/share/java/ring-codec.jar
-
-clojure -cp $CLASSPATH -e '(use '"'"'ring.util.codec)'
+java -jar /usr/share/java/ring-codec.jar -e '(use '"'"'ring.util.codec)'
=====================================
debian/tests/control
=====================================
@@ -1,6 +1,11 @@
Tests: build
-Depends: @, clojure
+Depends:
+ default-jre-headless,
+ @,
Restrictions: superficial
Tests: unittests
-Depends: @, clojure
+Depends:
+ default-jre-headless,
+ libcognitect-test-runner-clojure,
+ @,
=====================================
debian/tests/unittests
=====================================
@@ -1,9 +1,9 @@
#!/bin/sh
set -efu
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/commons-codec.jar:/usr/share/java/ring-codec.jar
+export CLASSPATH=/usr/share/java/ring-codec.jar:/usr/share/java/test-runner.jar:test
cp -a test "$AUTOPKGTEST_TMP"
cd "$AUTOPKGTEST_TMP"
-find . -name "*.clj" | xargs clojure -cp $CLASSPATH
+java clojure.main -m cognitect.test-runner cognitect.test-runner.api/test -r '.*\.test\.codec$'
=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
-opts="mode=git" \
-https://github.com/ring-clojure/ring-codec.git \
-refs/tags/([\d\.]+)
+Version: 5
+Template: GitHub
+Owner: ring-clojure
+Project: ring-codec
+Version-Type: SEMANTIC_VERSION
View it on GitLab: https://salsa.debian.org/clojure-team/ring-codec-clojure/-/compare/678a17fbc265dc1e239516948d0ae6466d8dc054...fbdb87bbee621f6e0f9baa94134b9c18b72f5b92
--
View it on GitLab: https://salsa.debian.org/clojure-team/ring-codec-clojure/-/compare/678a17fbc265dc1e239516948d0ae6466d8dc054...fbdb87bbee621f6e0f9baa94134b9c18b72f5b92
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/20260730/33967188/attachment.htm>
More information about the pkg-java-commits
mailing list