summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-05-12 10:00:53 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-05-12 10:00:53 -0700
commitf979e3ae4a69d35df4bc65bef9f12a2e9de5918a (patch)
treee9d5ab75df81cbb0b4b442984b589a05278ba6a8 /debian/patches
parent2000a1689a11c8c4ce8b98a7801839e82efc78fa (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (4.3~bpo9+1) quilt-fixup]
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/debian-changes56
1 files changed, 28 insertions, 28 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 0eceb10f..68199501 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.16.0+dfsg.orig/cider-repl.el
-+++ cider-0.16.0+dfsg/cider-repl.el
-@@ -336,7 +336,9 @@ client process connection. Unless NO-BA
+--- 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
(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.16.0+dfsg.orig/cider-util.el
-+++ cider-0.16.0+dfsg/cider-util.el
-@@ -399,7 +399,7 @@ plugin or dependency with:
+--- 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:
(defvar cider-version)
--(defconst cider-manual-url "http://cider.readthedocs.org/en/%s/"
+-(defconst cider-manual-url "http://cider.readthedocs.io/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 ()
-@@ -410,7 +410,7 @@ plugin or dependency with:
+@@ -407,7 +407,7 @@ plugin or dependency with:
(defun cider-manual-url ()
"The CIDER manual's url."
@@ -47,9 +47,9 @@ A single combined diff, containing all the changes, follows.
;;;###autoload
(defun cider-view-manual ()
---- cider-0.16.0+dfsg.orig/cider.el
-+++ cider-0.16.0+dfsg/cider.el
-@@ -230,7 +230,7 @@ This variable is used by `cider-connect'
+--- 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
:package-version '(cider . "0.9.0"))
@@ -57,9 +57,9 @@ A single combined diff, containing all the changes, follows.
+(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 #'stringp
---- cider-0.16.0+dfsg.orig/doc/about/contributing.md
-+++ cider-0.16.0+dfsg/doc/about/contributing.md
+ :safe #'booleanp
+--- cider-0.17.0+dfsg.orig/doc/about/contributing.md
++++ cider-0.17.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.16.0+dfsg.orig/doc/index.md
-+++ cider-0.16.0+dfsg/doc/index.md
+--- cider-0.17.0+dfsg.orig/doc/index.md
++++ cider-0.17.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,8 +79,8 @@ 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.16.0+dfsg.orig/doc/installation.md
-+++ cider-0.16.0+dfsg/doc/installation.md
+--- cider-0.17.0+dfsg.orig/doc/installation.md
++++ cider-0.17.0+dfsg/doc/installation.md
@@ -1,120 +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
@@ -202,25 +202,25 @@ A single combined diff, containing all the changes, follows.
## CIDER's nREPL middleware
Much of CIDER's functionality depends on the presence of CIDER's
---- cider-0.16.0+dfsg.orig/mkdocs.yml
-+++ cider-0.16.0+dfsg/mkdocs.yml
+--- cider-0.17.0+dfsg.orig/mkdocs.yml
++++ cider-0.17.0+dfsg/mkdocs.yml
@@ -1,6 +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-2017 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
+ copyright: "Copyright (C) 2016-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
docs_dir: doc
pages:
-@@ -33,4 +33,5 @@ pages:
+@@ -34,4 +34,5 @@ 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.16.0+dfsg.orig/test/cider-util-tests.el
-+++ cider-0.16.0+dfsg/test/cider-util-tests.el
+--- 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 @@
(expect (cider--deep-vector-to-list '[bug]) :to-equal '(bug))
(expect (cider--deep-vector-to-list '(bug)) :to-equal '(bug))))
@@ -229,19 +229,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.org/en/stable/"))
+- (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/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.org/en/stable/"))
++;; (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/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.org/en/latest/")))
+- (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/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.org/en/latest/")))
++;; (expect (cider-manual-url) :to-equal "http://cider.readthedocs.io/en/latest/")))
(describe "cider-refcard-url"
:var (cider-version)