Commit Debian 3.0 (quilt) metadata

[dgit (6.11~bpo9+1) quilt-fixup]

1 files changed, 64 insertions, 58 deletions

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 68199501..7f6d3d97 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.17.0+dfsg.orig/cider-repl.el
-+++ cider-0.17.0+dfsg/cider-repl.el
-@@ -379,7 +379,9 @@ client process connection.  Unless NO-BA
+--- cider-0.18.0.orig/cider-repl.el
++++ cider-0.18.0/cider-repl.el
+@@ -359,7 +359,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,18 +27,18 @@ 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.17.0+dfsg.orig/cider-util.el
-+++ cider-0.17.0+dfsg/cider-util.el
-@@ -396,7 +396,7 @@ plugin or dependency with:
+--- cider-0.18.0.orig/cider-util.el
++++ cider-0.18.0/cider-util.el
+@@ -404,7 +404,7 @@ plugin or dependency with:
  
  (defvar cider-version)
  
--(defconst cider-manual-url "http://cider.readthedocs.io/en/%s/"
+-(defconst cider-manual-url "http://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 ()
-@@ -407,7 +407,7 @@ plugin or dependency with:
+@@ -415,7 +415,7 @@ plugin or dependency with:
  
  (defun cider-manual-url ()
    "The CIDER manual's url."
@@ -47,10 +47,10 @@ A single combined diff, containing all the changes, follows.
  
  ;;;###autoload
  (defun cider-view-manual ()
---- cider-0.17.0+dfsg.orig/cider.el
-+++ cider-0.17.0+dfsg/cider.el
-@@ -283,7 +283,7 @@ This variable is used by `cider-connect'
-   :type 'boolean
+--- cider-0.18.0.orig/cider.el
++++ cider-0.18.0/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
@@ -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.17.0+dfsg.orig/doc/about/contributing.md
-+++ cider-0.17.0+dfsg/doc/about/contributing.md
+--- cider-0.18.0.orig/doc/about/contributing.md
++++ cider-0.18.0/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.17.0+dfsg.orig/doc/index.md
-+++ cider-0.17.0+dfsg/doc/index.md
+--- cider-0.18.0.orig/doc/index.md
++++ cider-0.18.0/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,9 +79,9 @@ 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.17.0+dfsg.orig/doc/installation.md
-+++ cider-0.17.0+dfsg/doc/installation.md
-@@ -1,120 +1,3 @@
+--- cider-0.18.0.orig/doc/installation.md
++++ cider-0.18.0/doc/installation.md
+@@ -1,125 +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`.
@@ -93,14 +93,17 @@ A single combined diff, containing all the changes, follows.
 -[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>).
 -
--CIDER officially supports Emacs 24.4+, Java 7+ and Clojure(Script) 1.7+.
--CIDER 0.10 was the final release which supported Java 6 and Clojure 1.5 and 1.6.
+-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 their latest stable versions.
 -
--You'll also need a recent version of 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.
+-!!! warning
 -
--**CIDER does not support ClojureCLR.**
+-    CIDER does not support ClojureCLR.
 -
 -## Installation via package.el
 -
@@ -131,18 +134,27 @@ A single combined diff, containing all the changes, follows.
 -obtaining CIDER, as the `master` branch is normally quite stable
 -and serious regressions there are usually fixed pretty quickly.
 -
+-!!! 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.
+-
 -Generally, users of the non-adventurous kind are advised to stick
 -with the stable releases, available from MELPA Stable.
--In Emacs 24.4+, you can pin CIDER to always use MELPA
+-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)
 -```
 -
--**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!**
+-!!! 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
 -
@@ -186,42 +198,36 @@ A single combined diff, containing all the changes, follows.
 -
 -## Manual installation
 -
--Alternatively you can simply load CIDER in your Emacs straight from its source
--repo. Assuming you've already obtained the code you should add something like
--this to your Emacs configuration:
--
--```el
--;; load CIDER from its source code
--(add-to-list 'load-path "~/projects/cider")
--(require 'cider)
--```
--
--Just keep in mind that you'll have to manually install all the packages CIDER
--depends on in advance.
+-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.
 -
  ## CIDER's nREPL middleware
  
- Much of CIDER's functionality depends on the presence of CIDER's
---- cider-0.17.0+dfsg.orig/mkdocs.yml
-+++ cider-0.17.0+dfsg/mkdocs.yml
-@@ -1,6 +1,6 @@
+ Much of CIDER's functionality depends on the presence of CIDER's own
+--- cider-0.18.0.orig/mkdocs.yml
++++ cider-0.18.0/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_favicon: favicon.ico
 +site_dir: html
- copyright: "Copyright (C) 2016-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
- docs_dir: doc
- pages:
-@@ -34,4 +34,5 @@ pages:
+ edit_uri: edit/master/doc/
+ site_favicon: favicon.ico
+ copyright: "Copyright &copy; 2016-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
+@@ -35,6 +36,8 @@ pages:
      - License: about/license.md
  extra_css:
    - css/extra.css
--theme: readthedocs
 +theme_dir: /usr/share/mkdocs/themes/mkdocs_bootstrap
 +use_directory_urls: false
---- cider-0.17.0+dfsg.orig/test/cider-util-tests.el
-+++ cider-0.17.0+dfsg/test/cider-util-tests.el
-@@ -180,15 +180,15 @@
+ markdown_extensions:
+   - admonition
+ theme: readthedocs
+--- cider-0.18.0.orig/test/cider-util-tests.el
++++ cider-0.18.0/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))))
  
@@ -229,19 +235,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://cider.readthedocs.io/en/stable/"))
+-    (expect (cider-manual-url) :to-equal "http://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://cider.readthedocs.io/en/stable/"))
++;;     (expect (cider-manual-url) :to-equal "http://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://cider.readthedocs.io/en/latest/")))
+-    (expect (cider-manual-url) :to-equal "http://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://cider.readthedocs.io/en/latest/")))
++;;     (expect (cider-manual-url) :to-equal "http://docs.cider.mx/en/latest/")))
  
  (describe "cider-refcard-url"
    :var (cider-version)