[Git][clojure-team/trapperkeeper-scheduler-clojure][debian/main] 11 commits: d/patches: remove gettext from :exclusions

Jérôme Charaoui (@lavamind) gitlab at salsa.debian.org
Sat Feb 4 22:09:16 GMT 2023 


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


Commits:
34adc0f0 by Jérôme Charaoui at 2023-02-04T15:24:57-05:00
d/patches: remove gettext from :exclusions

Closes: #1030428

- - - - -
3fd795bf by Jérôme Charaoui at 2023-02-04T15:34:00-05:00
d/patches: make DEP-3 compliant

- - - - -
f6c29583 by Jérôme Charaoui at 2023-02-04T15:35:34-05:00
d/control: remove redundant unversioned binary deps

There get added via jh_classpath anyway.

- - - - -
fc2ecc83 by Jérôme Charaoui at 2023-02-04T15:36:36-05:00
d/control: bump Standards-Version, no changes needed

- - - - -
8ec0c044 by Jérôme Charaoui at 2023-02-04T15:48:51-05:00
d/rules: get rid of override_jh_installlibs

- - - - -
a6f79289 by Jérôme Charaoui at 2023-02-04T15:48:52-05:00
d/rules: honor nocheck flag in build options

- - - - -
3819ee9a by Jérôme Charaoui at 2023-02-04T15:48:53-05:00
d/rules: exclude :dev dependencies from pom.xml

- - - - -
b5902ff7 by Jérôme Charaoui at 2023-02-04T16:55:55-05:00
d/tests: add autopkgtests

- - - - -
81fd11a1 by Jérôme Charaoui at 2023-02-04T16:55:57-05:00
d/rules: stop running flaky testuite during build

The test often hangs, see #981441

This was commited to the repository as part of 1.1.3-4 but mysteriously
this commit was not merged in debian/main, so it was lost in 1.1.3-5 ...

- - - - -
f0a03e2e by Jérôme Charaoui at 2023-02-04T16:59:31-05:00
d/changelog: fixup 1.1.3-4 entry

- - - - -
8d10711b by Jérôme Charaoui at 2023-02-04T17:00:15-05:00
Update changelog for 1.1.3-6 release

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/libtrapperkeeper-scheduler-clojure.poms
- debian/patches/0001_Lein_Local.patch
- debian/patches/0002_Test_Null_Handler.patch
- debian/rules
- + debian/tests/build
- + debian/tests/control
- + debian/tests/upstream


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,20 @@
+trapperkeeper-scheduler-clojure (1.1.3-6) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches: remove gettext from :exclusions (Closes: #1030428)
+  * d/patches: make DEP-3 compliant
+  * d/control: remove redundant unversioned binary deps
+  * d/control: bump Standards-Version, no changes needed
+  * d/rules:
+    + honor nocheck flag in build options
+    + exclude :dev dependencies from pom.xml
+    - get rid of override_jh_installlibs
+    - stop running flaky testuite during build
+  * d/tests: add autopkgtests
+  * d/changelog: fixup 1.1.3-4 entry
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Sat, 04 Feb 2023 15:56:41 -0500
+
 trapperkeeper-scheduler-clojure (1.1.3-5) unstable; urgency=medium
 
   * Team upload.
@@ -13,12 +30,13 @@ trapperkeeper-scheduler-clojure (1.1.3-5) unstable; urgency=medium
 
  -- Jérôme Charaoui <jerome at riseup.net>  Thu, 14 Jul 2022 15:15:15 -0400
 
-trapperkeeper-scheduler-clojure (1.1.3-4) UNRELEASED; urgency=normal
+trapperkeeper-scheduler-clojure (1.1.3-4) unstable; urgency=medium
 
-  [ Louis-Philippe Véronneau ]
-  * d/control: New email for the Clojure Team.
+  * Team upload.
+  * Disable the testsuite during build. (Closes: #981441)
+  * d/rules: use --java-lib in maven instead of overriding jh_installlibs.
 
- -- Louis-Philippe Véronneau <pollo at debian.org>  Sat, 08 Jan 2022 18:32:32 -0500
+ -- Louis-Philippe Véronneau <pollo at debian.org>  Fri, 12 Feb 2021 21:48:29 -0500
 
 trapperkeeper-scheduler-clojure (1.1.3-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
  libquartz2-java,
  libcomplete-clojure <!nocheck>,
  leiningen,
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure.git
 Vcs-Browser: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure
 Homepage: https://github.com/puppetlabs/trapperkeeper-scheduler
@@ -26,11 +26,9 @@ Architecture: all
 Depends:
  ${java:Depends},
  ${misc:Depends},
- libclojure-java,
  libtrapperkeeper-clojure (>= 3.1.0),
  libpuppetlabs-i18n-clojure (>= 0.9.0),
  libkitchensink-clojure (>= 3.1.1-2),
- libquartz2-java,
 Recommends: ${java:Recommends}
 Description: Trapperkeeper service for scheduling background tasks
  Trapperkeeper-scheduler is a Trapperkeeper service that provides a simple API


=====================================
debian/libtrapperkeeper-scheduler-clojure.poms
=====================================
@@ -1 +1 @@
-debian/pom.xml --artifact=target/trapperkeeper-scheduler.jar --usj-name=trapperkeeper-scheduler
+debian/pom.xml --java-lib --artifact=target/trapperkeeper-scheduler.jar --usj-name=trapperkeeper-scheduler


=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -1,8 +1,18 @@
+From: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
+Date: Sat, 4 Feb 2023 15:17:43 -0500
+Subject: Lein_Local
+
 Patch project.clj to build locally using lein.
-Index: trapperkeeper-scheduler-clojure/project.clj
-===================================================================
---- trapperkeeper-scheduler-clojure.orig/project.clj
-+++ trapperkeeper-scheduler-clojure/project.clj
+
+Forwarded: not-needed
+---
+ project.clj | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/project.clj b/project.clj
+index cb13b74..2a4d54a 100644
+--- a/project.clj
++++ b/project.clj
 @@ -1,17 +1,18 @@
  (defproject puppetlabs/trapperkeeper-scheduler "1.1.3"
    :description "Trapperkeeper Scheduler Service"
@@ -14,7 +24,7 @@ Index: trapperkeeper-scheduler-clojure/project.clj
 -                 [org.quartz-scheduler/quartz "2.3.2" :exclusions [c3p0]]]
 +  :dependencies [[org.clojure/clojure "1.10.x"]
 +                 [puppetlabs/trapperkeeper "debian"]
-+                 [puppetlabs/i18n "debian"  :exclusions [org.gnu.gettext/libintl]]
++                 [puppetlabs/i18n "debian"]
 +                 [puppetlabs/kitchensink "debian"]
 +                 [org.quartz-scheduler/quartz "2.x" :exclusions [c3p0]]
 +                 [org.yaml/snakeyaml "1.x"]


=====================================
debian/patches/0002_Test_Null_Handler.patch
=====================================
@@ -1,10 +1,20 @@
+From: Debian Clojure Maintainers <team+clojure at tracker.debian.org>
+Date: Sat, 4 Feb 2023 15:17:44 -0500
+Subject: Test_Null_Handler
+
 This fails, but because of an error in gettext. It doesn't seems relevant and
 the test is expected to fail anyway (just with a different error). Probably
 caused by some variation in Debian's gettext packaging.
-Index: trapperkeeper-scheduler-clojure/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
-===================================================================
---- trapperkeeper-scheduler-clojure.orig/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
-+++ trapperkeeper-scheduler-clojure/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
+
+Forwarded: not-needed
+---
+ .../services/scheduler/scheduler_service_test.clj  | 30 +++++++++++-----------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj b/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
+index afcc8a6..76853ec 100644
+--- a/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
++++ b/test/integration/puppetlabs/trapperkeeper/services/scheduler/scheduler_service_test.clj
 @@ -633,21 +633,21 @@
              ; the next run should be about the interval frequency
              (is (<= (+ interval-frequency accuracy-low) (nth (distances @start-times) 1) (+ interval-frequency accuracy-high)))))))))


=====================================
debian/rules
=====================================
@@ -14,17 +14,20 @@ 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
 	# 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:
-	lein test
-
-override_jh_installlibs:
-	jh_installlibs target/$(NAME).jar
+	# Hangs on buildds. See #981441.
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+#	lein test
+#endif
 
 override_dh_clean:
 	rm -f debian/maven-repo


=====================================
debian/tests/build
=====================================
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+export CLASSPATH=/usr/share/java/trapperkeeper-scheduler.jar
+
+clojure -cp $CLASSPATH -e '(use '"'"'puppetlabs.trapperkeeper.services.scheduler.scheduler-service)'


=====================================
debian/tests/control
=====================================
@@ -0,0 +1,12 @@
+Tests: build
+Depends:
+ clojure,
+ @,
+Restrictions: superficial
+
+Tests: upstream
+Depends:
+ clojure,
+ libbultitude-clojure,
+ @,
+Restrictions: isolation-container


=====================================
debian/tests/upstream
=====================================
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -efu
+
+export CLASSPATH="/usr/share/java/trapperkeeper-scheduler.jar:/usr/share/java/bultitude.jar:/usr/share/java/trapperkeeper-test.jar:/usr/share/java/kitchensink-test.jar:test/integration"
+
+cp -a test dev-resources "$AUTOPKGTEST_TMP"
+mkdir "$AUTOPKGTEST_TMP/target"
+cd "$AUTOPKGTEST_TMP"
+
+
+clojure \
+    -cp $CLASSPATH \
+    -e "(require '[clojure.test])" \
+    -e "(require '[bultitude.core :as b])" \
+    -e '(def all-tests (b/namespaces-on-classpath :classpath "test/integration"))' \
+    -e "(map #(require %) all-tests)" \
+    -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"puppetlabs\.trapperkeeper\.services\.\S+-test")) 0 1))'



View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure/-/compare/00597f0c18da0ad129c5b3c335af3c013d2b5c3b...8d10711b47d097580930646250d28d6034f96877

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-scheduler-clojure/-/compare/00597f0c18da0ad129c5b3c335af3c013d2b5c3b...8d10711b47d097580930646250d28d6034f96877
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/20230204/b7cf375f/attachment.htm>

More information about the pkg-java-commits mailing list