summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-01-20 10:45:08 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-01-20 10:45:08 -0700
commitea5b29021644a9b8dca817a35c3a3d7fe639e774 (patch)
tree46023add6367d2fa1a9bf9bdbea48d82dfccb19c /debian/patches
parentd80e0136f21f513dc9a50b785ec6d7bd5d8ee65d (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (3.13) quilt-fixup]
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/debian-changes37
1 files changed, 19 insertions, 18 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 972d28aa..440361a4 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -14,20 +14,21 @@ 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.15.1.orig/cider-repl.el
-+++ cider-0.15.1/cider-repl.el
-@@ -326,7 +326,8 @@ client process connection. Unless NO-BA
+--- cider-0.15.1+dfsg.orig/cider-repl.el
++++ cider-0.15.1+dfsg/cider-repl.el
+@@ -326,7 +326,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 <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.
++;; 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.15.1.orig/cider-util.el
-+++ cider-0.15.1/cider-util.el
+--- cider-0.15.1+dfsg.orig/cider-util.el
++++ cider-0.15.1+dfsg/cider-util.el
@@ -398,7 +398,7 @@ plugin or dependency with:
(defvar cider-version)
@@ -46,8 +47,8 @@ A single combined diff, containing all the changes, follows.
;;;###autoload
(defun cider-view-manual ()
---- cider-0.15.1.orig/doc/about/contributing.md
-+++ cider-0.15.1/doc/about/contributing.md
+--- cider-0.15.1+dfsg.orig/doc/about/contributing.md
++++ cider-0.15.1+dfsg/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.
@@ -60,8 +61,8 @@ A single combined diff, containing all the changes, follows.
### Open Collective
---- cider-0.15.1.orig/doc/index.md
-+++ cider-0.15.1/doc/index.md
+--- cider-0.15.1+dfsg.orig/doc/index.md
++++ cider-0.15.1+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"/>
@@ -70,8 +71,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.15.1.orig/doc/installation.md
-+++ cider-0.15.1/doc/installation.md
+--- cider-0.15.1+dfsg.orig/doc/installation.md
++++ cider-0.15.1+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
@@ -193,25 +194,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.15.1.orig/mkdocs.yml
-+++ cider-0.15.1/mkdocs.yml
-@@ -1,6 +1,7 @@
+--- cider-0.15.1+dfsg.orig/mkdocs.yml
++++ cider-0.15.1+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_favicon: favicon.ico
+site_dir: html
copyright: "Copyright (C) 2016-2017 Bozhidar Batsov, Artur Malabarba and CIDER contributors"
docs_dir: doc
pages:
-@@ -33,4 +34,5 @@ pages:
+@@ -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
---- cider-0.15.1.orig/test/cider-util-tests.el
-+++ cider-0.15.1/test/cider-util-tests.el
+--- cider-0.15.1+dfsg.orig/test/cider-util-tests.el
++++ cider-0.15.1+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))))