[clojure] 09/11: Simplified the usage instructions for the command line tool

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository clojure.

commit c81eaaea6b3f4828fdf2b40a9bcacf07b3ee8db6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 22 17:18:33 2016 +0100

    Simplified the usage instructions for the command line tool
---
 debian/changelog                         |  1 +
 debian/patches/02-modify-cli-usage.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0fe2309..3a47c7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ clojure (1.8.0-1) UNRELEASED; urgency=medium
     - Increased the priority of the alternatives
   * Moved the library to its own libclojure-java package
   * No longer use the system ASM to avoid runtime conflicts
+  * Simplified the usage instructions for the command line tool
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 Dec 2016 15:38:43 +0100
 
diff --git a/debian/patches/02-modify-cli-usage.patch b/debian/patches/02-modify-cli-usage.patch
new file mode 100644
index 0000000..12cf5bb
--- /dev/null
+++ b/debian/patches/02-modify-cli-usage.patch
@@ -0,0 +1,29 @@
+Description: Simplify the usage instructions for the command line tool
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/clj/clojure/main.clj
++++ b/src/clj/clojure/main.clj
+@@ -367,7 +367,7 @@
+   [args]
+   (println "WARNING: clojure.lang.Repl is deprecated.
+ Instead, use clojure.main like this:
+-java -cp clojure.jar clojure.main -i init.clj -r args...")
++clojure -i init.clj -r args...")
+   (let [[inits [sep & args]] (split-with (complement #{"--"}) args)]
+     (repl-opt (concat ["-r"] args) (map vector (repeat "-i") inits))))
+ 
+@@ -377,12 +377,12 @@
+   [args]
+   (println "WARNING: clojure.lang.Script is deprecated.
+ Instead, use clojure.main like this:
+-java -cp clojure.jar clojure.main -i init.clj script.clj args...")
++clojure -i init.clj script.clj args...")
+   (let [[inits [sep & args]] (split-with (complement #{"--"}) args)]
+     (null-opt args (map vector (repeat "-i") inits))))
+ 
+ (defn main
+-  "Usage: java -cp clojure.jar clojure.main [init-opt*] [main-opt] [arg*]
++  "Usage: clojure [init-opt*] [main-opt] [arg*]
+ 
+   With no options or args, runs an interactive Read-Eval-Print Loop
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f3f28a5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+02-modify-cli-usage.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/clojure.git