[Git][clojure-team/compojure-clojure][master] 3 commits: * Add leiningen as build-depends.

[Thomas Goirand (@zigo)]

Thomas Goirand pushed to branch master at Debian Clojure Maintainers / compojure-clojure


Commits:
e2c4fd5f by Thomas Goirand at 2026-07-20T04:48:17+02:00
  * Add leiningen as build-depends.
  * Run wrap-and-sort -bastk.

- - - - -
1e8d746a by Thomas Goirand at 2026-07-20T04:50:25+02:00
Use lein to build debian/pom.xml.

- - - - -
2b39d960 by Thomas Goirand at 2026-07-20T04:54:29+02:00
Add 0001_Lien_Local.patch.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001_Lien_Local.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,10 @@ compojure-clojure (1.7.2-1) experimental; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Add leiningen as build-depends.
+  * Run wrap-and-sort -bastk.
+  * Use lein to build debian/pom.xml.
+  * Add 0001_Lien_Local.patch.
 
  -- Thomas Goirand <zigo at debian.org>  Mon, 20 Jul 2026 04:38:34 +0200
 


=====================================
debian/control
=====================================
@@ -1,21 +1,24 @@
 Source: compojure-clojure
 Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
+Uploaders:
+ Apollon Oikonomopoulos <apoikos at debian.org>,
 Section: java
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
-               javahelper,
-               maven-repo-helper,
-               clojure,
-               libtext-markdown-perl | markdown,
-               libtools-macro-clojure,
-               libclout-clojure,
-               libmedley-clojure,
-               libring-core-clojure,
-               libring-codec-clojure,
-               libring-mock-clojure,
-               libservlet3.1-java,
-               default-jdk-headless
+Build-Depends:
+ debhelper-compat (= 13),
+ clojure,
+ default-jdk-headless,
+ javahelper,
+ leiningen,
+ libclout-clojure,
+ libmedley-clojure,
+ libring-codec-clojure,
+ libring-core-clojure,
+ libring-mock-clojure,
+ libservlet3.1-java,
+ libtext-markdown-perl | markdown,
+ libtools-macro-clojure,
+ maven-repo-helper,
 Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/clojure-team/compojure-clojure
 Vcs-Git: https://salsa.debian.org/clojure-team/compojure-clojure.git
@@ -23,9 +26,11 @@ Homepage: https://github.com/weavejester/compojure
 
 Package: libcompojure-clojure
 Architecture: all
-Depends: ${java:Depends},
-         ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends:
+ ${java:Depends},
+ ${misc:Depends},
+Recommends:
+ ${java:Recommends},
 Description: consice routing library for Ring
  Compojure is a small routing library for Ring that allows web
  applications to be composed of small, independent parts.


=====================================
debian/patches/0001_Lien_Local.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Lein Local
+Author: Thomas Goirand <zigo at debian.org>
+Forwarded: not-needed
+Last-Update: 2026-07-20
+
+--- compojure-clojure-1.7.2.orig/project.clj
++++ compojure-clojure-1.7.2/project.clj
+@@ -3,12 +3,12 @@
+   :url "https://github.com/weavejester/compojure"
+   :license {:name "Eclipse Public License"
+             :url "http://www.eclipse.org/legal/epl-v10.html"}
+-  :dependencies [[org.clojure/clojure "1.9.0"]
+-                 [org.clojure/tools.macro "0.2.1"]
+-                 [clout "2.2.1"]
+-                 [dev.weavejester/medley "1.9.0"]
+-                 [ring/ring-core "1.15.1"]
+-                 [ring/ring-codec "1.3.0"]]
++  :dependencies [[org.clojure/clojure "1.x"]
++                 [org.clojure/tools.macro "debian"]
++                 [clout "debian"]
++                 [dev.weavejester/medley "debian"]
++                 [ring/ring-core "debian"]
++                 [ring/ring-codec "debian"]]
+   :plugins [[lein-codox "0.10.8"]]
+   :codox
+   {:output-path "codox"
+@@ -23,4 +23,6 @@
+                         [javax.servlet/servlet-api "2.5"]]}
+    :1.10 {:dependencies [[org.clojure/clojure "1.10.0"]]}
+    :1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
+-   :1.12 {:dependencies [[org.clojure/clojure "1.12.2"]]}})
++   :1.12 {:dependencies [[org.clojure/clojure "1.12.2"]]}}
++
++  :local-repo "debian/maven-repo")


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001_Lien_Local.patch


=====================================
debian/rules
=====================================
@@ -1,6 +1,12 @@
 #!/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=compojure
+
 
 MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md))
 
@@ -11,6 +17,12 @@ TEST_CLASSPATH=/usr/share/java/ring-mock.jar:/usr/share/java/servlet-api-3.1.jar
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
+override_dh_auto_configure:
+	cd debian && ln -sf /usr/share/maven-repo .
+
+override_dh_auto_build:
+	lein pom debian/pom.xml
+
 override_jh_build: $(MDWN_DOCS)
 	jar cf $(PRODUCED_JAR) -C src .
 	mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html



View it on GitLab: https://salsa.debian.org/clojure-team/compojure-clojure/-/compare/9695a083069bae5e8987ee9afe02e12cbc633cbd...2b39d9605fca8851ef0f44f4f6ba8259527e1940

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/compojure-clojure/-/compare/9695a083069bae5e8987ee9afe02e12cbc633cbd...2b39d9605fca8851ef0f44f4f6ba8259527e1940
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/20260728/1142f1e0/attachment.htm>