diff options
Diffstat (limited to 'debian/patches/debian-changes')
| -rw-r--r-- | debian/patches/debian-changes | 99 |
1 files changed, 49 insertions, 50 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 0a8a2ddc..bd28438d 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -14,9 +14,9 @@ version 1.2.3, you could use: (If you have dgit, use `dgit clone cider`, rather than plain `git clone`.) A single combined diff, containing all the changes, follows. ---- cider-0.18.0+dfsg.orig/cider-repl.el -+++ cider-0.18.0+dfsg/cider-repl.el -@@ -359,7 +359,9 @@ client process connection. Unless NO-BA +--- cider-0.19.0+dfsg.orig/cider-repl.el ++++ cider-0.19.0+dfsg/cider-repl.el +@@ -368,7 +368,9 @@ client process connection. Unless NO-BA (substitute-command-keys "\n;; ====================================================================== ;; If you're new to CIDER it is highly recommended to go through its @@ -27,13 +27,13 @@ A single combined diff, containing all the changes, follows. ;; In case you're seeing any warnings you should consult the manual's ;; \"Troubleshooting\" section. ;; ---- cider-0.18.0+dfsg.orig/cider-util.el -+++ cider-0.18.0+dfsg/cider-util.el +--- cider-0.19.0+dfsg.orig/cider-util.el ++++ cider-0.19.0+dfsg/cider-util.el @@ -404,7 +404,7 @@ plugin or dependency with: (defvar cider-version) --(defconst cider-manual-url "http://docs.cider.mx/en/%s/" +-(defconst cider-manual-url "https://docs.cider.mx/en/%s/" +(defconst cider-manual-url "file:///usr/share/doc/elpa-cider/html/index.html" "The URL to CIDER's manual.") @@ -47,8 +47,8 @@ A single combined diff, containing all the changes, follows. ;;;###autoload (defun cider-view-manual () ---- cider-0.18.0+dfsg.orig/cider.el -+++ cider-0.18.0+dfsg/cider.el +--- cider-0.19.0+dfsg.orig/cider.el ++++ cider-0.19.0+dfsg/cider.el @@ -286,7 +286,7 @@ This variable is used by `cider-connect' :group 'cider :package-version '(cider . "0.9.0")) @@ -58,8 +58,8 @@ A single combined diff, containing all the changes, follows. "When nil, do not inject repl dependencies (most likely nREPL middlewares) at `cider-jack-in' time." :type 'boolean :safe #'booleanp ---- cider-0.18.0+dfsg.orig/doc/about/contributing.md -+++ cider-0.18.0+dfsg/doc/about/contributing.md +--- cider-0.19.0+dfsg.orig/doc/about/contributing.md ++++ cider-0.19.0+dfsg/doc/about/contributing.md @@ -71,7 +71,7 @@ You can support the development of CIDER [Patreon](https://www.patreon.com/bbatsov), [Liberapay](https://liberapay.com/bbatsov/donate) and PayPal. @@ -69,8 +69,8 @@ A single combined diff, containing all the changes, follows. ### Open Collective ---- cider-0.18.0+dfsg.orig/doc/index.md -+++ cider-0.18.0+dfsg/doc/index.md +--- cider-0.19.0+dfsg.orig/doc/index.md ++++ cider-0.19.0+dfsg/doc/index.md @@ -1,7 +1,3 @@ -<p align="center"> - <img src="https://raw.github.com/clojure-emacs/cider/master/logo/cider-logo-w640.png" alt="CIDER Logo"/> @@ -79,17 +79,17 @@ A single combined diff, containing all the changes, follows. CIDER is the **C**lojure(Script) **I**nteractive **D**evelopment **E**nvironment that **R**ocks! ---- cider-0.18.0+dfsg.orig/doc/installation.md -+++ cider-0.18.0+dfsg/doc/installation.md -@@ -1,125 +1,3 @@ +--- cider-0.19.0+dfsg.orig/doc/installation.md ++++ cider-0.19.0+dfsg/doc/installation.md +@@ -1,124 +1,3 @@ -The canonical way to install CIDER is via `package.el` (Emacs's built-in package -manager), but it can be installed manually or via alternative package managers such -as `el-get`. - -## Prerequisites - --You'll need to have Emacs installed (preferably the latest stable --release). If you're new to Emacs you might want to go through +-You'll need to have Emacs installed, preferably the latest stable +-release. If you're new to Emacs you might want to go through -[the guided tour of Emacs](https://www.gnu.org/software/emacs/tour/index.html) -and the built-in tutorial (just press <kbd>C-h t</kbd>). - @@ -98,8 +98,8 @@ A single combined diff, containing all the changes, follows. -Java 7 and Clojure(Script) 1.7. - -You'll also need a recent version of either the Clojure CLI tools or your --favorite build tool (Leiningen, Boot or Gradle) to be able to start CIDER via --`cider-jack-in`. Generally it's a good idea to use their latest stable versions. +-favorite build tool (Leiningen, Boot, or Gradle) to be able to start CIDER via +-`cider-jack-in`. Generally it's a good idea to use the latest stable versions. - -!!! warning - @@ -128,11 +128,20 @@ A single combined diff, containing all the changes, follows. - -<kbd>M-x package-refresh-contents [RET]</kbd> - --Keep in mind that MELPA packages are built automatically from --the `master` branch, meaning bugs might creep in there from time to --time. Never-the-less, installing from MELPA is a reasonable way of --obtaining CIDER, as the `master` branch is normally quite stable --and serious regressions there are usually fixed pretty quickly. +-It's important to note that MELPA packages are built automatically +-from the `master` branch, and that means you'll be right on the +-leading edge of development. This has upsides and downsides; you'll +-see new features first, but you might experience some bugs from +-time to time. Nevertheless, installing from MELPA is a reasonable way +-to obtain CIDER. The `master` branch is normally quite stable +-and serious regressions there are usually fixed quickly. +- +-If you have concerns about living on the leading edge of CIDER +-deveopment, you can always pin CIDER to use MELPA Stable like this: +- +-```el +-(add-to-list 'package-pinned-packages '(cider . "melpa-stable") t) +-``` - -!!! Tip - @@ -141,15 +150,6 @@ A single combined diff, containing all the changes, follows. - [this article](http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/) - for details on the subject. - --Generally, users of the non-adventurous kind are advised to stick --with the stable releases, available from MELPA Stable. --You can pin CIDER to always use MELPA --Stable by adding this to your Emacs initialization: -- --```el --(add-to-list 'package-pinned-packages '(cider . "melpa-stable") t) --``` -- -!!! note - - CIDER has dependencies (e.g. `queue` & `seq`) that are only available in the @@ -196,26 +196,25 @@ A single combined diff, containing all the changes, follows. - -<kbd>M-x el-get-install [RET] cider [RET]</kbd> - --## Manual installation +-## Manual Installation - --Installing CIDER manually is discouraged unless you plan to work with --CIDER's codebase. The manual installation is relatively involved as it --requires manual installation of the dependencies and manual generation --of the package autoloads. Check out the section [Hacking on --CIDER](hacking_on_cider.md) for more details. +-Installing CIDER manually is discouraged unless you plan to work with CIDER's +-codebase. The manual installation is relatively involved as it requires manual +-installation of the dependencies. Check out the section +-[Hacking on CIDER](hacking_on_cider.md) for more details. - - ## CIDER's nREPL middleware + ## CIDER's nREPL Middleware - Much of CIDER's functionality depends on the presence of CIDER's own ---- cider-0.18.0+dfsg.orig/mkdocs.yml -+++ cider-0.18.0+dfsg/mkdocs.yml + Much of CIDER's functionality depends on its own [nREPL +--- cider-0.19.0+dfsg.orig/mkdocs.yml ++++ cider-0.19.0+dfsg/mkdocs.yml @@ -1,5 +1,6 @@ site_name: "CIDER: The Clojure Interactive Development Environment that Rocks" repo_url: https://github.com/clojure-emacs/cider +site_dir: html edit_uri: edit/master/doc/ site_favicon: favicon.ico - copyright: "Copyright © 2016-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors" + copyright: "Copyright © 2016-2019 Bozhidar Batsov, Artur Malabarba and CIDER contributors" @@ -35,6 +36,7 @@ pages: - License: about/license.md extra_css: @@ -224,8 +223,8 @@ A single combined diff, containing all the changes, follows. markdown_extensions: - admonition theme: readthedocs ---- cider-0.18.0+dfsg.orig/test/cider-util-tests.el -+++ cider-0.18.0+dfsg/test/cider-util-tests.el +--- cider-0.19.0+dfsg.orig/test/cider-util-tests.el ++++ cider-0.19.0+dfsg/test/cider-util-tests.el @@ -179,15 +179,15 @@ (expect (cider--deep-vector-to-list '[bug]) :to-equal '(bug)) (expect (cider--deep-vector-to-list '(bug)) :to-equal '(bug)))) @@ -234,19 +233,19 @@ A single combined diff, containing all the changes, follows. - :var (cider-version) - (it "returns the manual correct url for stable cider versions" - (setq cider-version "0.11.0") -- (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/stable/")) +- (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/stable/")) +;; (describe "cider-manual-url" +;; :var (cider-version) +;; (it "returns the manual correct url for stable cider versions" +;; (setq cider-version "0.11.0") -+;; (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/stable/")) ++;; (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/stable/")) - (it "returns the manual correct url for snapshot cider versions" - (setq cider-version "0.11.0-snapshot") -- (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/latest/"))) +- (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/latest/"))) +;; (it "returns the manual correct url for snapshot cider versions" +;; (setq cider-version "0.11.0-snapshot") -+;; (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/latest/"))) ++;; (expect (cider-manual-url) :to-equal "https://docs.cider.mx/en/latest/"))) (describe "cider-refcard-url" :var (cider-version) |