Commit Debian 3.0 (quilt) metadata

[dgit (4.0) quilt-fixup]

4 files changed, 63 insertions, 64 deletions

diff --git a/debian/patches/configure-mkdocs-for-debian b/debian/patches/configure-mkdocs-for-debian
deleted file mode 100644
index 2bf82ed5..00000000
--- a/debian/patches/configure-mkdocs-for-debian
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Tue, 26 Dec 2017 18:57:49 +0000
-X-Dgit-Generated: 0.15.1-1 a9678e7ecb5e2e755d50184a45a471e739d40525
-Subject: configure mkdocs for Debian
-
-1. set site_dir so that docs end up in /usr/share/doc/elpa-cider/html
-
-2. set use_directory_urls so that links are to foo/index.html rather
-   than to just foo/, which is better for offline browsing
-
-3. don't generate installation instructions page
-
-4. use bootstrap theme not readthedocs theme: the readthedocs theme
-   has template directives that are evaluated only when the docs are
-   uploaded to readthedocs.org, and its search functionality also fails
-
----
-
---- 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
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
new file mode 100644
index 00000000..516ca1d6
--- /dev/null
+++ b/debian/patches/debian-changes
@@ -0,0 +1,62 @@
+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/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.
+ 
+-[![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)
+ 
+-[![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.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
diff --git a/debian/patches/drop-privacy-infringing-images-in-docabo b/debian/patches/drop-privacy-infringing-images-in-docabo
deleted file mode 100644
index 63d19735..00000000
--- a/debian/patches/drop-privacy-infringing-images-in-docabo
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Sean Whitton <spwhitton@spwhitton.name>
-Date: Tue, 26 Dec 2017 19:00:55 +0000
-X-Dgit-Generated: 0.15.1-1 2ccf8d3cdced6a1d5cdfc29082b3649e75850079
-Subject: drop privacy-infringing images in doc/about/contributing.md
-
-
----
-
---- 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.
- 
--[![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)
- 
--[![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
- 
diff --git a/debian/patches/series b/debian/patches/series
index 210c50e1..7bb82529 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-configure-mkdocs-for-debian
-drop-privacy-infringing-images-in-docabo
+debian-changes