1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
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.15.1.orig/cider-repl.el
+++ cider-0.15.1/cider-repl.el
@@ -326,7 +326,8 @@ 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 <M-x cider-view-manual> to view it.
+;; manual first. Install the cider-doc apt package and then type
+;; <M-x cider-view-manual> to view it.
;; In case you're seeing any warnings you should consult the manual's
;; \"Troubleshooting\" section.
;;
--- cider-0.15.1.orig/cider-util.el
+++ cider-0.15.1/cider-util.el
@@ -398,7 +398,7 @@ plugin or dependency with:
(defvar cider-version)
-(defconst cider-manual-url "http://cider.readthedocs.org/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 ()
@@ -409,7 +409,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.15.1.orig/doc/about/contributing.md
+++ cider-0.15.1/doc/about/contributing.md
@@ -70,9 +70,9 @@ You can support the development of CIDER
[Salt](https://salt.bountysource.com/teams/cider),
[Gratipay](https://www.gratipay.com/cider) and PayPal.
-[](https://gratipay.com/cider)
+[Support via Gratipay](https://gratipay.com/cider)
-[](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.15.1.orig/doc/index.md
+++ cider-0.15.1/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"/>
-</p>
-
CIDER is the **C**lojure(Script) **I**nteractive **D**evelopment **E**nvironment
that **R**ocks!
--- cider-0.15.1.orig/mkdocs.yml
+++ cider-0.15.1/mkdocs.yml
@@ -1,11 +1,11 @@
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"
docs_dir: doc
pages:
- Home: index.md
-- Installation: installation.md
- Up and Running: up_and_running.md
- Interactive Programming: interactive_programming.md
- Using the REPL: using_the_repl.md
@@ -33,4 +33,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
|
