[Git][clojure-team/trapperkeeper-webserver-jetty9-clojure][debian/main] 13 commits: d/rules: fix FTBFS when package is used as Build-Dep
Jérôme Charaoui (@lavamind)
gitlab at salsa.debian.org
Tue Feb 7 03:27:17 GMT 2023
Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / trapperkeeper-webserver-jetty9-clojure
Commits:
bf55a16f by Jérôme Charaoui at 2023-02-04T15:02:44-05:00
d/rules: fix FTBFS when package is used as Build-Dep
- - - - -
b253b96b by Jérôme Charaoui at 2023-02-04T17:58:51-05:00
Update d/changelog
- - - - -
23c25fe5 by Jérôme Charaoui at 2023-02-04T18:13:24-05:00
d/rules: get rid of override_jh_installlibs
- - - - -
b1742d9e by Jérôme Charaoui at 2023-02-06T21:42:13-05:00
d/patches: drop jackson and snakeyaml version overrides
Avoid leaking bogus dependency versions in maven-repo. Requires updated
build-deps where the issue is fixed and makes the project.clj overrides
obsolete.
- - - - -
7457f0c5 by Jérôme Charaoui at 2023-02-06T21:43:19-05:00
d/control: bump Standards-Version, no changes needed
- - - - -
080acfde by Jérôme Charaoui at 2023-02-06T21:44:49-05:00
d/control: rework test-only build-deps
- - - - -
8bfc84e7 by Jérôme Charaoui at 2023-02-06T21:45:16-05:00
d/control: use headless jdk in build-deps
- - - - -
95bad905 by Jérôme Charaoui at 2023-02-06T21:45:56-05:00
d/control: add myself to Uploaders
- - - - -
384b6368 by Jérôme Charaoui at 2023-02-06T21:46:48-05:00
add --has-package-version to maven poms
- - - - -
dd7bdd51 by Jérôme Charaoui at 2023-02-06T21:47:37-05:00
d/rules: don't delete upstream resources dir in dh_clean
- - - - -
23b8a7a3 by Jérôme Charaoui at 2023-02-06T22:19:33-05:00
d/patches: flag lein local patch as not-needed upstream
- - - - -
0be732b5 by Jérôme Charaoui at 2023-02-06T22:19:34-05:00
d/patches: require clojure 1.x in lein local patch
- - - - -
f1b4e7d1 by Jérôme Charaoui at 2023-02-06T22:20:10-05:00
Update changelog for 4.4.1-3 release
- - - - -
7 changed files:
- debian/changelog
- debian/control
- − debian/libtrapperkeeper-webserver-jetty9-clojure.links
- debian/libtrapperkeeper-webserver-jetty9-clojure.poms
- debian/patches/0006_Lein_Local.patch
- debian/patches/0007_No_Gniazdo.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+trapperkeeper-webserver-jetty9-clojure (4.4.1-3) unstable; urgency=medium
+
+ * d/patches:
+ - drop jackson and snakeyaml version overrides
+ + d/patches: flag lein local patch as not-needed upstream
+ + d/patches: require clojure 1.x in lein local patch
+ * d/control:
+ + bump Standards-Version, no changes needed
+ + rework test-only build-deps
+ + use headless jdk in build-deps
+ + add myself to Uploaders
+ * d/rules:
+ + don't delete upstream resources dir in dh_clean
+ + fix FTBFS when package is used as Build-Dep
+ - get rid of override_jh_installlibs
+ * add --has-package-version to maven poms
+
+ -- Jérôme Charaoui <jerome at riseup.net> Mon, 06 Feb 2023 21:58:10 -0500
+
trapperkeeper-webserver-jetty9-clojure (4.4.1-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,10 +2,12 @@ Source: trapperkeeper-webserver-jetty9-clojure
Section: java
Priority: optional
Maintainer: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
-Uploaders: Apollon Oikonomopoulos <apoikos at debian.org>
+Uploaders:
+ Apollon Oikonomopoulos <apoikos at debian.org>,
+ Jérôme Charaoui <jerome at riseup.net>,
Build-Depends:
debhelper-compat (= 13),
- default-jdk,
+ default-jdk-headless,
javahelper,
maven-repo-helper,
libclojure-java,
@@ -19,20 +21,19 @@ Build-Depends:
libprismatic-schema-clojure (>= 1.1.12),
libring-servlet-clojure,
libring-codec-clojure (>= 1.1.2),
- libssl-utils-clojure (>= 3.1.0),
- libkitchensink-clojure (>= 3.1.1-2),
- libtrapperkeeper-clojure (>= 3.1.0),
- libpuppetlabs-i18n-clojure (>= 0.9.0-2),
- libtrapperkeeper-filesystem-watcher-clojure (>= 1.2.2-2),
+ libssl-utils-clojure (>= 3.5.0-2),
+ libkitchensink-clojure (>= 3.2.1),
+ libtrapperkeeper-clojure (>= 3.2.0-2),
+ libpuppetlabs-i18n-clojure (>= 0.9.2-2),
+ libtrapperkeeper-filesystem-watcher-clojure (>= 1.2.2-3),
libslf4j-java,
- libpuppetlabs-http-client-clojure,
- libtools-namespace-clojure,
- libcompojure-clojure,
+ libpuppetlabs-http-client-clojure (>= 2.1.0-4) <!nocheck>,
+ libtools-namespace-clojure <!nocheck>,
+ libcompojure-clojure <!nocheck>,
libring-core-clojure (>= 1.6.2-4),
libbcpkix-java,
- libcomplete-clojure <!nocheck>,
leiningen,
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure.git
Vcs-Browser: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure
Homepage: https://github.com/puppetlabs/trapperkeeper-webserver-jetty9
=====================================
debian/libtrapperkeeper-webserver-jetty9-clojure.links deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/trapperkeeper-webserver-jetty9-test.jar usr/share/maven-repo/puppetlabs/trapperkeeper-webserver-jetty9/debian/trapperkeeper-webserver-jetty9-debian-test.jar
=====================================
debian/libtrapperkeeper-webserver-jetty9-clojure.poms
=====================================
@@ -1 +1,2 @@
-debian/pom.xml --artifact=target/trapperkeeper-webserver-jetty9.jar --usj-name=trapperkeeper-webserver-jetty9
+debian/pom.xml --java-lib --artifact=target/trapperkeeper-webserver-jetty9.jar --usj-name=trapperkeeper-webserver-jetty9 --has-package-version
+debian/pom.xml --java-lib --artifact=target/test/trapperkeeper-webserver-jetty9-test.jar --usj-name=trapperkeeper-webserver-jetty9-test --classifier=test --has-package-version
=====================================
debian/patches/0006_Lein_Local.patch
=====================================
@@ -3,21 +3,23 @@ Date: Tue, 18 Oct 2022 23:22:41 -0400
Subject: Lein_Local
Patch project.clj to build locally using lein.
+
+Forwarded: not-needed
---
- project.clj | 90 ++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 44 insertions(+), 46 deletions(-)
+ project.clj | 92 +++++++++++++++++++++++--------------------------------------
+ 1 file changed, 34 insertions(+), 58 deletions(-)
-Index: trapperkeeper-webserver-jetty9-clojure/project.clj
-===================================================================
---- trapperkeeper-webserver-jetty9-clojure.orig/project.clj
-+++ trapperkeeper-webserver-jetty9-clojure/project.clj
-@@ -8,48 +8,48 @@
+diff --git a/project.clj b/project.clj
+index c9e5b7a..a02f11e 100644
+--- a/project.clj
++++ b/project.clj
+@@ -8,48 +8,40 @@
:min-lein-version "2.9.1"
- :parent-project {:coords [puppetlabs/clj-parent "5.2.9"]
- :inherit [:managed-dependencies]}
-+ :dependencies [[org.clojure/clojure "1.10.x"]
++ :dependencies [[org.clojure/clojure "1.x"]
+ [org.clojure/java.jmx "debian"]
+ [org.clojure/tools.logging "debian"]
@@ -46,55 +48,44 @@ Index: trapperkeeper-webserver-jetty9-clojure/project.clj
- [org.eclipse.jetty/jetty-proxy ~jetty-version]
- [org.eclipse.jetty/jetty-jmx ~jetty-version]
- [org.eclipse.jetty.websocket/websocket-server ~jetty-version]
--
-- [prismatic/schema]
-- [ring/ring-servlet]
-- [ring/ring-codec]
--
-- [puppetlabs/ssl-utils]
-- [puppetlabs/kitchensink]
-- [puppetlabs/trapperkeeper]
-- [puppetlabs/i18n]
-- [puppetlabs/trapperkeeper-filesystem-watcher]
--
-- [org.slf4j/jul-to-slf4j]]
+ [org.eclipse.jetty/jetty-servlet "9.x"]
+ [org.eclipse.jetty/jetty-servlets "9.x"]
+ [org.eclipse.jetty/jetty-webapp "9.x"]
+ [org.eclipse.jetty/jetty-proxy "9.x"]
+ [org.eclipse.jetty/jetty-jmx "9.x"]
+ [org.eclipse.jetty.websocket/websocket-server "debian"]
-+
+
+- [prismatic/schema]
+- [ring/ring-servlet]
+- [ring/ring-codec]
+ [prismatic/schema "debian"]
+ [ring/ring-servlet "debian"]
+ [ring/ring-codec "debian"]
-+
+
+- [puppetlabs/ssl-utils]
+- [puppetlabs/kitchensink]
+- [puppetlabs/trapperkeeper]
+- [puppetlabs/i18n]
+- [puppetlabs/trapperkeeper-filesystem-watcher]
+ [puppetlabs/ssl-utils "debian"]
+ [puppetlabs/kitchensink "debian"]
+ [puppetlabs/trapperkeeper "debian"]
+ [puppetlabs/i18n "debian"]
+ [puppetlabs/trapperkeeper-filesystem-watcher "debian"]
-+
-+ [org.slf4j/jul-to-slf4j "debian"]
-+
-+ [org.yaml/snakeyaml "1.x"]
-+ [com.fasterxml.jackson.core/jackson-core "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.x"]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.x"]]
+
+- [org.slf4j/jul-to-slf4j]]
++ [org.slf4j/jul-to-slf4j "debian"]]
:source-paths ["src"]
:java-source-paths ["java"]
- :plugins [[lein-parent "0.3.7"]
- [puppetlabs/i18n "0.8.0"]]
-+ :plugins [[puppetlabs/i18n "debian" :exclusions [[org.clojure/clojure]
-+ [com.fasterxml.jackson.core/jackson-core]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-smile]
-+ [com.fasterxml.jackson.dataformat/jackson-dataformat-cbor]]]]
++ :plugins [[puppetlabs/i18n "debian" :exclusions [org.clojure/clojure]]]
:deploy-repositories [["releases" {:url "https://clojars.org/repo"
:username :env/clojars_jenkins_username
-@@ -71,51 +71,35 @@
+@@ -71,51 +63,35 @@
"examples/webrouting_app/src"]
:java-source-paths ["examples/servlet_app/src/java"
"test/java"]
=====================================
debian/patches/0007_No_Gniazdo.patch
=====================================
@@ -12,10 +12,10 @@ WebSocket features of this library, we're patching it out.
3 files changed, 4 insertions(+), 46 deletions(-)
diff --git a/project.clj b/project.clj
-index 655f84f..f56a61d 100644
+index a02f11e..a497bd5 100644
--- a/project.clj
+++ b/project.clj
-@@ -76,9 +76,6 @@
+@@ -68,9 +68,6 @@
[puppetlabs/trapperkeeper "debian" :classifier "test"]
[org.clojure/tools.namespace "debian"]
[compojure "debian"]
=====================================
debian/rules
=====================================
@@ -14,7 +14,10 @@ override_dh_auto_configure:
cd debian && ln -sf /usr/share/maven-repo .
override_dh_auto_build:
- lein pom debian/pom.xml
+ # "with-profile -dev" below is a workaround for
+ # https://codeberg.org/leiningen/leiningen/issues/14
+ # upstream needs to fix their project.clj
+ lein with-profile -dev pom debian/pom.xml
lein i18n make
lein jar
# symlinks so we don't need a version in debian/*.poms
@@ -26,12 +29,8 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
lein test
endif
-override_jh_installlibs:
- jh_installlibs target/$(NAME).jar
- jh_installlibs target/test/$(NAME)-test.jar
-
override_dh_clean:
rm -f debian/maven-repo
- rm -Rf target ressources
rm -f debian/pom.xml
+ rm -Rf target
dh_clean
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/compare/3e57951ed461d5b0baa11a66052d2e7e57d8d638...f1b4e7d137d22cb3eb266a4dbcedbe3025739e2e
--
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-webserver-jetty9-clojure/-/compare/3e57951ed461d5b0baa11a66052d2e7e57d8d638...f1b4e7d137d22cb3eb266a4dbcedbe3025739e2e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230207/ebd32f2e/attachment.htm>
More information about the pkg-java-commits
mailing list