[Git][clojure-team/trapperkeeper-clojure][debian/main] 3 commits: Build localisation using puppetlabs-i18n.

[Louis-Philippe Véronneau]

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


Commits:
1de8e21d by Louis-Philippe Véronneau at 2020-12-27T19:58:09-05:00
Build localisation using puppetlabs-i18n.

- - - - -
146bd154 by Louis-Philippe Véronneau at 2020-12-27T20:04:08-05:00
d/*.examples: install examples.

- - - - -
25e6a578 by Louis-Philippe Véronneau at 2020-12-27T20:08:34-05:00
Release 3.1.0-2 to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/libtrapperkeeper-clojure.examples
- debian/patches/0002_Lein_Local.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+trapperkeeper-clojure (3.1.0-2) unstable; urgency=medium
+
+  * Build localisation using puppetlabs-i18n.
+  * d/*.examples: install examples.
+
+ -- Louis-Philippe Véronneau <pollo at debian.org>  Sun, 27 Dec 2020 20:08:08 -0500
+
 trapperkeeper-clojure (3.1.0-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/libtrapperkeeper-clojure.examples
=====================================
@@ -0,0 +1 @@
+examples/*


=====================================
debian/patches/0002_Lein_Local.patch
=====================================
@@ -3,7 +3,14 @@ Index: trapperkeeper-clojure/project.clj
 ===================================================================
 --- trapperkeeper-clojure.orig/project.clj
 +++ trapperkeeper-clojure/project.clj
-@@ -13,35 +13,41 @@
+@@ -6,42 +6,44 @@
+ 
+   :min-lein-version "2.9.0"
+ 
+-  :parent-project {:coords [puppetlabs/clj-parent "4.0.1"]
+-                   :inherit [:managed-dependencies]}
+-
+   ;; Abort when version ranges or version conflicts are detected in
    ;; dependencies. Also supports :warn to simply emit warnings.
    ;; requires lein 2.2.0+.
    :pedantic? :abort
@@ -30,8 +37,7 @@ Index: trapperkeeper-clojure/project.clj
 +                 [ch.qos.logback/logback-access "debian"]
                   ;; Janino can be used for some advanced logback configurations
 -                 [org.codehaus.janino/janino]
-+                 [org.codehaus.janino/janino "debian"]
- 
+-
 -                 [clj-time]
 -                 [clj-commons/fs]
 -                 [clj-commons/clj-yaml]
@@ -40,7 +46,8 @@ Index: trapperkeeper-clojure/project.clj
 -                 [prismatic/schema]
 -
 -                 [beckon]
--
++                 [org.codehaus.janino/janino "debian"]
+ 
 -                 [puppetlabs/typesafe-config]
 -                 [puppetlabs/kitchensink]
 -                 [puppetlabs/i18n]
@@ -56,8 +63,7 @@ Index: trapperkeeper-clojure/project.clj
 +
 +                 [puppetlabs/typesafe-config "debian"]
 +                 [puppetlabs/kitchensink "debian"]
-+                 ; See BTS #976738
-+                 [puppetlabs/i18n "debian" :exclusions [org.gnu.gettext/libintl]]
++                 [puppetlabs/i18n "debian"]
 +                 [nrepl/nrepl "debian"]
 +
 +                 [org.yaml/snakeyaml "1.x"]
@@ -67,7 +73,7 @@ Index: trapperkeeper-clojure/project.clj
                   ]
  
    :deploy-repositories [["releases" {:url "https://clojars.org/repo"
-@@ -65,14 +71,12 @@
+@@ -65,14 +67,17 @@
               :dev {:source-paths ["examples/shutdown_app/src"
                                    "examples/java_service/src/clj"]
                     :java-source-paths ["examples/java_service/src/java"]
@@ -80,7 +86,11 @@ Index: trapperkeeper-clojure/project.clj
  
 -  :plugins [[lein-parent "0.3.7"]
 -            [puppetlabs/i18n "0.8.0"]]
--
++  :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]]]]
+ 
    :main puppetlabs.trapperkeeper.main
 +  :local-repo "debian/maven-repo"
    )


=====================================
debian/rules
=====================================
@@ -15,6 +15,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	lein pom debian/pom.xml
+	lein i18n make
 	lein jar
 	# symlinks so we don't need a version in debian/*.poms
 	cd target && ln -sf $(NAME)-$(DEB_VERSION_UPSTREAM).jar $(NAME).jar
@@ -29,6 +30,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/clojure-team/trapperkeeper-clojure/-/compare/3cb7c0ea671cecbc80ce0d27b7d781c6d37ec323...25e6a578e69321d702802f9c9510acdbd6b1ecfe

-- 
View it on GitLab: https://salsa.debian.org/clojure-team/trapperkeeper-clojure/-/compare/3cb7c0ea671cecbc80ce0d27b7d781c6d37ec323...25e6a578e69321d702802f9c9510acdbd6b1ecfe
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/20201228/1aeeea7d/attachment.html>