[Git][clojure-team/ring-clojure][debian/main] 3 commits: d/rules: fix double build issue (Closes: #1046176, #1049524)

[Jérôme Charaoui (@lavamind)]

Jérôme Charaoui pushed to branch debian/main at Debian Clojure Maintainers / ring-clojure


Commits:
702aa24c by Jérôme Charaoui at 2024-02-16T08:37:16-05:00
d/rules: fix double build issue (Closes: #1046176, #1049524)

- - - - -
c0f778d7 by Jérôme Charaoui at 2024-02-16T08:37:17-05:00
d/patches: mark lein local patches not-needed upstream

- - - - -
41145354 by Jérôme Charaoui at 2024-02-16T08:37:18-05:00
Update changelog for 1.8.2-3 release

- - - - -


5 changed files:

- debian/changelog
- debian/patches/0001_Lein_Local_Core.patch
- debian/patches/0002_Lein_Local_Servlet.patch
- debian/patches/0003_Lein_Local_Jetty.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+ring-clojure (1.8.2-3) unstable; urgency=medium
+
+  * d/rules: fix double build issue (Closes: #1046176, #1049524)
+  * d/patches: mark lein local patches not-needed upstream
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Thu, 15 Feb 2024 21:22:48 -0500
+
 ring-clojure (1.8.2-2) unstable; urgency=medium
 
   * prevent publishing bogus jetty version in pom deps


=====================================
debian/patches/0001_Lein_Local_Core.patch
=====================================
@@ -3,6 +3,8 @@ Date: Mon, 30 Jan 2023 09:24:54 -0500
 Subject: Lein Local Core
 
 Patch ring-core project.clj to build locally using lein.
+
+Forwarded: not-needed
 ---
  ring-core/project.clj | 21 +++++++++++----------
  1 file changed, 11 insertions(+), 10 deletions(-)


=====================================
debian/patches/0002_Lein_Local_Servlet.patch
=====================================
@@ -3,6 +3,8 @@ Date: Mon, 30 Jan 2023 09:24:54 -0500
 Subject: Lein Local Servlet
 
 Patch ring-servlet project.clj to build locally using lein.
+
+Forwarded: not-needed
 ---
  ring-servlet/project.clj | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)


=====================================
debian/patches/0003_Lein_Local_Jetty.patch
=====================================
@@ -3,6 +3,8 @@ Date: Mon, 30 Jan 2023 09:24:54 -0500
 Subject: Lein Local Jetty
 
 Patch jetty-adapter project.clj to build locally using lein.
+
+Forwarded: not-needed
 ---
  ring-jetty-adapter/project.clj | 13 +++++++------
  1 file changed, 7 insertions(+), 6 deletions(-)


=====================================
debian/rules
=====================================
@@ -38,9 +38,11 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 endif
 
 override_dh_clean:
-	rm -f debian/maven-repo
+	rm -f .lein-failures
+	rm -Rf .lein debian/maven-repo
 	for sub in $(SUB_PROJECTS) ; do \
-		rm -Rf $$sub/target; \
+		rm -f .lein-failures; \
 		rm -f debian/$$sub.pom.xml; \
+		rm -Rf $$sub/target; \
 	done
 	dh_clean



View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/cec1fb22469e8dc6a274eacc1682c41380cfdab8...41145354634e70f82d9f9014fa7ef53093f4f6de

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/ring-clojure/-/compare/cec1fb22469e8dc6a274eacc1682c41380cfdab8...41145354634e70f82d9f9014fa7ef53093f4f6de
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/20240216/4958c0ab/attachment.htm>