From 09d50e005b33d915f8ff399d1e5ad25342fd272d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 20 Jan 2018 10:58:32 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (3.13) quilt-fixup] --- debian/patches/debian-changes | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'debian') diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 440361a4..1337f0d7 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.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 +--- 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 (substitute-command-keys "\n;; ====================================================================== ;; If you're new to CIDER it is highly recommended to go through its @@ -27,9 +27,9 @@ 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.15.1+dfsg.orig/cider-util.el -+++ cider-0.15.1+dfsg/cider-util.el -@@ -398,7 +398,7 @@ plugin or dependency with: +--- 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: (defvar cider-version) @@ -38,7 +38,7 @@ A single combined diff, containing all the changes, follows. "The URL to CIDER's manual.") (defun cider--manual-version () -@@ -409,7 +409,7 @@ plugin or dependency with: +@@ -410,7 +410,7 @@ plugin or dependency with: (defun cider-manual-url () "The CIDER manual's url." @@ -47,22 +47,19 @@ A single combined diff, containing all the changes, follows. ;;;###autoload (defun cider-view-manual () ---- 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. - --[![Support via Gratipay](https://cdn.rawgit.com/gratipay/gratipay-badge/2.1.3/dist/gratipay.png)](https://gratipay.com/cider) -+[Support via Gratipay](https://gratipay.com/cider) +--- cider-0.16.0+dfsg.orig/doc/about/contributing.md ++++ cider-0.16.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.15.1+dfsg.orig/doc/index.md -+++ cider-0.15.1+dfsg/doc/index.md +--- cider-0.16.0+dfsg.orig/doc/index.md ++++ cider-0.16.0+dfsg/doc/index.md @@ -1,7 +1,3 @@ -

- CIDER Logo @@ -71,8 +68,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+dfsg.orig/doc/installation.md -+++ cider-0.15.1+dfsg/doc/installation.md +--- cider-0.16.0+dfsg.orig/doc/installation.md ++++ cider-0.16.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 @@ -194,8 +191,8 @@ 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+dfsg.orig/mkdocs.yml -+++ cider-0.15.1+dfsg/mkdocs.yml +--- cider-0.16.0+dfsg.orig/mkdocs.yml ++++ cider-0.16.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 @@ -211,8 +208,8 @@ A single combined diff, containing all the changes, follows. -theme: readthedocs +theme_dir: /usr/share/mkdocs/themes/mkdocs_bootstrap +use_directory_urls: false ---- cider-0.15.1+dfsg.orig/test/cider-util-tests.el -+++ cider-0.15.1+dfsg/test/cider-util-tests.el +--- cider-0.16.0+dfsg.orig/test/cider-util-tests.el ++++ cider-0.16.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)))) -- cgit v1.2.3