The Debian packaging of cider is maintained in git, using the merging workflow described in dgit-maint-merge(7). There isn't a patch queue that can be represented as a quilt series. A detailed breakdown of the changes is available from their canonical representation - git commits in the packaging repository. For example, to see the changes made by the Debian maintainer in the first upload of upstream version 1.2.3, you could use: % git clone https://git.dgit.debian.org/cider % cd cider % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' (If you have dgit, use `dgit clone cider`, rather than plain `git clone`.) A single combined diff, containing all the changes, follows. --- 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 -;; manual first. Type to view it. +;; manual first. Install the cider-doc apt package and then type +;; to view it. +;; You should also read /usr/share/doc/elpa-cider/README.Debian ;; In case you're seeing any warnings you should consult the manual's ;; \"Troubleshooting\" section. ;; --- 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 "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.") (defun cider--manual-version () @@ -415,7 +415,7 @@ plugin or dependency with: (defun cider-manual-url () "The CIDER manual's url." - (format cider-manual-url (cider--manual-version))) + cider-manual-url) ;;;###autoload (defun cider-view-manual () --- 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")) -(defcustom cider-inject-dependencies-at-jack-in t +(defcustom cider-inject-dependencies-at-jack-in nil "When nil, do not inject repl dependencies (most likely nREPL middlewares) at `cider-jack-in' time." :type 'boolean :safe #'booleanp --- 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. -[![Paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GRQKNBM6P8VRQ) +[Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GRQKNBM6P8VRQ) ### Open Collective --- cider-0.19.0+dfsg.orig/doc/index.md +++ cider-0.19.0+dfsg/doc/index.md @@ -1,7 +1,3 @@ -

- CIDER Logo -

- CIDER is the **C**lojure(Script) **I**nteractive **D**evelopment **E**nvironment that **R**ocks! --- 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 -[the guided tour of Emacs](https://www.gnu.org/software/emacs/tour/index.html) -and the built-in tutorial (just press C-h t). - -CIDER officially supports Emacs 25.1+, Java 8+ and Clojure(Script) -1.8+. CIDER 0.17 (Andalucía) was the final release which supported -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 the latest stable versions. - -!!! warning - - CIDER does not support ClojureCLR. - -## Installation via package.el - -CIDER is available on the two major `package.el` community -maintained repos - -[MELPA Stable](http://stable.melpa.org) -and [MELPA](http://melpa.org). - -You can install CIDER with the following command: - -M-x package-install [RET] cider [RET] - -or by adding this bit of Emacs Lisp code to your Emacs initialization file -(`.emacs` or `init.el`): - -```el -(unless (package-installed-p 'cider) - (package-install 'cider)) -``` - -If the installation doesn't work try refreshing the package list: - -M-x package-refresh-contents [RET] - -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 - - If you don't want to (or can't) wait for MELPA to rebuild CIDER, - you can easily build and install an up-to-date MELPA package locally yourself. Check out - [this article](http://emacsredux.com/blog/2015/05/10/building-melpa-packages-locally/) - for details on the subject. - -!!! note - - CIDER has dependencies (e.g. `queue` & `seq`) that are only available in the - [GNU ELPA repository](https://elpa.gnu.org/). It's the only package repository - enabled by default in Emacs and you should not disable it! - -## Installation via use-package - -`use-package` can be used to install CIDER via the `package.el`'s repositories -[MELPA Stable](http://stable.melpa.org) and [MELPA](http://melpa.org). - -If you wanted to install the version of CIDER which is what is to be found in -the `master` branch, declare the following in your Emacs initialization file -(`.emacs` or `init.el`): - -```el -(use-package cider - :ensure t) -``` - -However, if you wanted to be a bit more conservative and only use the stable -releases of CIDER, you'd declare the following: - -```el -(use-package cider - :ensure t - :pin melpa-stable) -``` - -After placing one of the above s-expressions, evaluate it, for it to take effect -by entering: C-x C-e. - -For further configuration options with `use-package`, consult the -official [use-package repository](https://github.com/jwiegley/use-package). - - -## Installation via el-get - -CIDER is also available for installation from -the [el-get](https://github.com/dimitri/el-get) package manager. - -Provided you've already installed `el-get` you can install CIDER with the -following command: - -M-x el-get-install [RET] cider [RET] - -## 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. Check out the section -[Hacking on CIDER](hacking_on_cider.md) for more details. - ## CIDER's nREPL Middleware 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-2019 Bozhidar Batsov, Artur Malabarba and CIDER contributors" @@ -35,6 +36,7 @@ pages: - License: about/license.md extra_css: - css/extra.css +use_directory_urls: false markdown_extensions: - admonition theme: readthedocs --- 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)))) -(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 "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 "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 "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 "https://docs.cider.mx/en/latest/"))) (describe "cider-refcard-url" :var (cider-version)