[Git][java-team/trapperkeeper-scheduler-clojure][debian/main] Use lein i18n, as gettext has been fixed. (Closes: #980708 )

[Louis-Philippe Véronneau]

Louis-Philippe Véronneau pushed to branch debian/main at Debian Java Maintainers / trapperkeeper-scheduler-clojure


Commits:
6c6e7dcc by Louis-Philippe Véronneau at 2021-01-24T12:13:21-05:00
Use lein i18n, as gettext has been fixed. (Closes: #980708 )

- - - - -


6 changed files:

- − debian/.gitignore
- debian/changelog
- debian/patches/0001_Lein_Local.patch
- + debian/patches/0002_Test_Null_Handler.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/.gitignore deleted
=====================================
@@ -1 +0,0 @@
-!pom.xml


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+trapperkeeper-scheduler-clojure (1.1.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Use lein i18n, as gettext has been fixed. (Closes: #980708 )
+
+ -- Louis-Philippe Véronneau <pollo at debian.org>  Sun, 24 Jan 2021 12:12:22 -0500
+
 trapperkeeper-scheduler-clojure (1.1.3-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/0001_Lein_Local.patch
=====================================
@@ -30,7 +30,7 @@ Index: trapperkeeper-scheduler-clojure/project.clj
    :pedantic? :abort
  
    :test-paths ["test/unit" "test/integration"]
-@@ -25,10 +26,11 @@
+@@ -25,10 +26,13 @@
                                       :sign-releases false}]]
  
    :profiles {:dev {:source-paths ["dev"]
@@ -41,8 +41,10 @@ Index: trapperkeeper-scheduler-clojure/project.clj
  
 -  :plugins  [[lein-parent "0.3.7"]
 -             [puppetlabs/i18n "0.8.0"]]
-+  :plugins  [[puppetlabs/i18n "debian" :exclusions [[org.gnu.gettext/libintl]
-+                                                    [org.clojure/clojure]]]]
++  :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]]]]
    :aot [puppetlabs.trapperkeeper.services.scheduler.job]
 -  :repl-options {:init-ns user})
 +  :repl-options {:init-ns user}


=====================================
debian/patches/0002_Test_Null_Handler.patch
=====================================
@@ -0,0 +1,44 @@
+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
+@@ -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)))))))))
+ 
+-(deftest ^:integration null-handling
+-  (with-app-with-empty-config app [scheduler-service]
+-      (let [service (tk/get-service app :SchedulerService)]
+-        (testing "interspaced throws exception on nil function"
+-          (is (thrown? IllegalArgumentException
+-                (interspaced service 300 nil))))
+-        (testing "after throws exception on nil function"
+-          (is (thrown? IllegalArgumentException
+-                (after service 300 nil))))
+-        (testing "interval throws exception on nil function"
+-          (is (thrown? IllegalArgumentException
+-                (interval service 300 nil))))
+-        (testing "interval-after throws exception on nil function"
+-          (is (thrown? IllegalArgumentException
+-                (interval-after service 1 300 nil)))))))
++;(deftest ^:integration null-handling
++;  (with-app-with-empty-config app [scheduler-service]
++;      (let [service (tk/get-service app :SchedulerService)]
++;        (testing "interspaced throws exception on nil function"
++;          (is (thrown? IllegalArgumentException
++;                (interspaced service 300 nil))))
++;        (testing "after throws exception on nil function"
++;          (is (thrown? IllegalArgumentException
++;                (after service 300 nil))))
++;        (testing "interval throws exception on nil function"
++;          (is (thrown? IllegalArgumentException
++;                (interval service 300 nil))))
++;        (testing "interval-after throws exception on nil function"
++;          (is (thrown? IllegalArgumentException
++;                (interval-after service 1 300 nil)))))))
+ 
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001_Lein_Local.patch
+0002_Test_Null_Handler.patch


=====================================
debian/rules
=====================================
@@ -15,6 +15,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	lein 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
@@ -27,6 +28,6 @@ override_jh_installlibs:
 
 override_dh_clean:
 	rm -f debian/maven-repo
-	rm -Rf target
+	rm -Rf target ressources
 	rm -f debian/pom.xml
 	dh_clean



View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-scheduler-clojure/-/commit/6c6e7dcc0437229204af72bc9f318c2771afb5fa

-- 
View it on GitLab: https://salsa.debian.org/java-team/trapperkeeper-scheduler-clojure/-/commit/6c6e7dcc0437229204af72bc9f318c2771afb5fa
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/20210124/99cf1f0c/attachment.html>