[Git][clojure-team/puppetlabs-i18n-clojure][debian/main] 5 commits: d/rules: get rid of override_jh_installlibs

Sun Feb 5 16:54:29 GMT 2023


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


Commits:
41a2ab6f by Jérôme Charaoui at 2023-02-05T09:56:45-05:00
d/rules: get rid of override_jh_installlibs

- - - - -
5b355fd7 by Jérôme Charaoui at 2023-02-05T10:02:31-05:00
d/patches: drop jackson version overrides

Not needed anymore because kitchensink+cheshire were updated to avoid
publishing bogus versions of jackson libs in their pom dependencies.

- - - - -
094fb7c9 by Jérôme Charaoui at 2023-02-05T11:50:23-05:00
d/tests: fix upstream tests to actually run

- - - - -
76b99a1b by Jérôme Charaoui at 2023-02-05T11:50:24-05:00
put clojure.jar on artifact's classpath

- - - - -
151d42c8 by Jérôme Charaoui at 2023-02-05T11:50:57-05:00
Update changelog for 0.9.2-2 release

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/libpuppetlabs-i18n-clojure.classpath
- debian/libpuppetlabs-i18n-clojure.poms
- debian/patches/0001-Lein-Local.patch
- debian/rules
- debian/tests/control
- − debian/tests/unittests
- + debian/tests/upstream


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+puppetlabs-i18n-clojure (0.9.2-2) unstable; urgency=medium
+
+  * d/patches: drop jackson version overrides
+  * d/rules: get rid of override_jh_installlibs
+  * d/tests: fix upstream tests to actually run
+  * put clojure.jar on artifact's classpath
+
+ -- Jérôme Charaoui <jerome at riseup.net>  Sun, 05 Feb 2023 11:45:23 -0500
+
 puppetlabs-i18n-clojure (0.9.2-1) unstable; urgency=medium
 
   [ Louis-Philippe Véronneau ]


=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends:
  libclojure-java,
  libcomplete-clojure <!nocheck>,
  libcpath-clojure (>= 0.1.2-2),
- libkitchensink-clojure (>= 3.1.1),
+ libkitchensink-clojure (>= 3.2.1),
  libnrepl-clojure <!nocheck>,
  maven-repo-helper,
 Standards-Version: 4.6.2
@@ -28,7 +28,6 @@ Package: libpuppetlabs-i18n-clojure
 Architecture: all
 Depends:
  gettext-base (>= 0.21-3),
- libclojure-java,
  libcpath-clojure (>= 0.1.2-2),
  libkitchensink-clojure (>= 3.1.1),
  ${java:Depends},


=====================================
debian/libpuppetlabs-i18n-clojure.classpath
=====================================
@@ -1 +1 @@
-usr/share/java/puppetlabs-i18n.jar /usr/share/java/cpath-clj.jar /usr/share/java/libintl.jar
+usr/share/java/puppetlabs-i18n.jar /usr/share/java/clojure.jar /usr/share/java/cpath-clj.jar /usr/share/java/libintl.jar


=====================================
debian/libpuppetlabs-i18n-clojure.poms
=====================================
@@ -1 +1 @@
-debian/pom.xml --artifact=target/puppetlabs-i18n.jar --usj-name=puppetlabs-i18n
+debian/pom.xml --java-lib --artifact=target/puppetlabs-i18n.jar --usj-name=puppetlabs-i18n --has-package-version


=====================================
debian/patches/0001-Lein-Local.patch
=====================================
@@ -6,14 +6,14 @@ Patch project.clj to build with local lein.
 
 Forwarded: not-needed
 ---
- project.clj | 19 +++++++++++--------
- 1 file changed, 11 insertions(+), 8 deletions(-)
+ project.clj | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/project.clj b/project.clj
-index d9210fe..6dfc4a1 100644
+index d9210fe..424fb95 100644
 --- a/project.clj
 +++ b/project.clj
-@@ -5,17 +5,20 @@
+@@ -5,17 +5,17 @@
              :url "http://www.apache.org/licenses/LICENSE-2.0"}
  
    :pedantic? :abort
@@ -22,10 +22,7 @@ index d9210fe..6dfc4a1 100644
 -                 [org.gnu.gettext/libintl "0.18.3"]]
 +  :dependencies [[org.clojure/clojure "1.x"]
 +                 [cpath-clj "debian"]
-+                 [org.gnu.gettext/libintl "debian"]
-+                 [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.gnu.gettext/libintl "debian"]]
  
 -  :profiles {:dev {:dependencies [[puppetlabs/kitchensink "3.1.3"
 -                                   :exclusions [org.clojure/clojure]]]


=====================================
debian/rules
=====================================
@@ -25,9 +25,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	lein test
 endif
 
-override_jh_installlibs:
-	jh_installlibs target/$(NAME).jar
-
 override_dh_clean:
 	rm -f debian/maven-repo
 	rm -Rf target


=====================================
debian/tests/control
=====================================
@@ -4,7 +4,12 @@ Depends:
  @,
 Restrictions: superficial
 
-Tests: unittests
+Tests: upstream
 Depends:
  clojure,
+ default-jdk-headless,
+ gettext,
+ git,
+ libbultitude-clojure,
  @,
+Restrictions: allow-stderr


=====================================
debian/tests/unittests deleted
=====================================
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -efu
-
-CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/libintl.jar:/usr/share/java/cpath-clj.jar:/usr/share/java/kitchensink.jar:/usr/share/java/puppetlabs-i18n.jar
-
-cp -a test "$AUTOPKGTEST_TMP"
-cd "$AUTOPKGTEST_TMP"
-
-find . -name "*.clj" | xargs clojure -cp $CLASSPATH


=====================================
debian/tests/upstream
=====================================
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -efu
+
+export CLASSPATH=/usr/share/java/clojure.jar:/usr/share/java/bultitude.jar:/usr/share/java/libintl.jar:/usr/share/java/cpath-clj.jar:/usr/share/java/kitchensink.jar:/usr/share/java/puppetlabs-i18n.jar:test:dev-resources:resources
+
+cp -a dev-resources locales resources src test "$AUTOPKGTEST_TMP"
+cp src/leiningen/i18n/Makefile "$AUTOPKGTEST_TMP"
+
+cd "$AUTOPKGTEST_TMP"
+
+export JAVAC="/usr/lib/jvm/default-java/bin/javac"
+make i18n
+
+clojure \
+    -cp $CLASSPATH \
+    -e "(require '[clojure.test])" \
+    -e "(require '[bultitude.core :as b])" \
+    -e '(def all-tests (b/namespaces-on-classpath :classpath "test"))' \
+    -e "(map #(require %) all-tests)" \
+    -e '(System/exit (if (clojure.test/successful? (clojure.test/run-all-tests #"puppetlabs.i18n.+-test")) 0 1))'



View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure/-/compare/e1e932f119cf5d9d6bc0f3a4cb7c9b84ab70ee9f...151d42c831cca5b00d5289a7628d76c03b3af034

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/puppetlabs-i18n-clojure/-/compare/e1e932f119cf5d9d6bc0f3a4cb7c9b84ab70ee9f...151d42c831cca5b00d5289a7628d76c03b3af034
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/20230205/374ecdcc/attachment.htm>
