diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/changelog trapperkeeper-scheduler-clojure-1.1.3/debian/changelog --- trapperkeeper-scheduler-clojure-1.1.3/debian/changelog 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/changelog 2023-02-04 20:56:41.000000000 +0000 @@ -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 Sat, 04 Feb 2023 15:56:41 -0500 + trapperkeeper-scheduler-clojure (1.1.3-5) unstable; urgency=medium * Team upload. @@ -13,12 +30,13 @@ -- Jérôme Charaoui 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 Sat, 08 Jan 2022 18:32:32 -0500 + -- Louis-Philippe Véronneau Fri, 12 Feb 2021 21:48:29 -0500 trapperkeeper-scheduler-clojure (1.1.3-3) unstable; urgency=medium diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/control trapperkeeper-scheduler-clojure-1.1.3/debian/control --- trapperkeeper-scheduler-clojure-1.1.3/debian/control 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/control 2023-02-04 20:56:41.000000000 +0000 @@ -15,7 +15,7 @@ libquartz2-java, libcomplete-clojure , 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 @@ 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 diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/libtrapperkeeper-scheduler-clojure.poms trapperkeeper-scheduler-clojure-1.1.3/debian/libtrapperkeeper-scheduler-clojure.poms --- trapperkeeper-scheduler-clojure-1.1.3/debian/libtrapperkeeper-scheduler-clojure.poms 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/libtrapperkeeper-scheduler-clojure.poms 2023-02-04 20:56:41.000000000 +0000 @@ -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 diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0001_Lein_Local.patch trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0001_Lein_Local.patch --- trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0001_Lein_Local.patch 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0001_Lein_Local.patch 2023-02-04 20:56:41.000000000 +0000 @@ -1,8 +1,18 @@ +From: Debian Clojure Maintainers +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 @@ - [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"] diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0002_Test_Null_Handler.patch trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0002_Test_Null_Handler.patch --- trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0002_Test_Null_Handler.patch 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/patches/0002_Test_Null_Handler.patch 2023-02-04 20:56:41.000000000 +0000 @@ -1,10 +1,20 @@ +From: Debian Clojure Maintainers +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))))))))) diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/rules trapperkeeper-scheduler-clojure-1.1.3/debian/rules --- trapperkeeper-scheduler-clojure-1.1.3/debian/rules 2022-07-14 19:15:15.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/rules 2023-02-04 20:56:41.000000000 +0000 @@ -14,17 +14,20 @@ 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 diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/tests/build trapperkeeper-scheduler-clojure-1.1.3/debian/tests/build --- trapperkeeper-scheduler-clojure-1.1.3/debian/tests/build 1970-01-01 00:00:00.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/tests/build 2023-02-04 20:56:41.000000000 +0000 @@ -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)' diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/tests/control trapperkeeper-scheduler-clojure-1.1.3/debian/tests/control --- trapperkeeper-scheduler-clojure-1.1.3/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/tests/control 2023-02-04 20:56:41.000000000 +0000 @@ -0,0 +1,12 @@ +Tests: build +Depends: + clojure, + @, +Restrictions: superficial + +Tests: upstream +Depends: + clojure, + libbultitude-clojure, + @, +Restrictions: isolation-container diff -Nru trapperkeeper-scheduler-clojure-1.1.3/debian/tests/upstream trapperkeeper-scheduler-clojure-1.1.3/debian/tests/upstream --- trapperkeeper-scheduler-clojure-1.1.3/debian/tests/upstream 1970-01-01 00:00:00.000000000 +0000 +++ trapperkeeper-scheduler-clojure-1.1.3/debian/tests/upstream 2023-02-04 20:56:41.000000000 +0000 @@ -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))'