summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-10-20 12:21:29 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-10-20 12:21:29 -0700
commit798132b55002f05accc7bb8e45b4791578903c51 (patch)
treed355ac33c7d16b5d63bd933beffae57cbe5c3545
parent1514d024cd1dfdd71be4143a8a983043d4e11d36 (diff)
Commit Debian 3.0 (quilt) metadata
[dgit (8.0~bpo9+1) quilt-fixup]
-rw-r--r--debian/patches/debian-changes (renamed from debian/patches/patch-README-for-Debian.patch)50
-rw-r--r--debian/patches/series2
2 files changed, 32 insertions, 20 deletions
diff --git a/debian/patches/patch-README-for-Debian.patch b/debian/patches/debian-changes
index 318584f..cbbef27 100644
--- a/debian/patches/patch-README-for-Debian.patch
+++ b/debian/patches/debian-changes
@@ -1,29 +1,41 @@
-Description: Patch README for Debian
-Author: Sean Whitton <spwhitton@spwhitton.name>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/README.md
-+++ b/README.md
-@@ -1,8 +1,3 @@
+The Debian packaging of zenburn-emacs 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/zenburn-emacs
+ % cd zenburn-emacs
+ % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
+
+(If you have dgit, use `dgit clone zenburn-emacs`, rather than plain
+`git clone`.)
+
+A single combined diff, containing all the changes, follows.
+--- zenburn-emacs-2.6.orig/README.md
++++ zenburn-emacs-2.6/README.md
+@@ -1,7 +1,4 @@
-[![License GPL 3][badge-license]](http://www.gnu.org/licenses/gpl-3.0.txt)
-[![MELPA](http://melpa.org/packages/zenburn-theme-badge.svg)](http://melpa.org/#/zenburn-theme)
-[![MELPA Stable](http://stable.melpa.org/packages/zenburn-theme-badge.svg)](http://stable.melpa.org/#/zenburn-theme)
--[![Gratipay](http://img.shields.io/gratipay/bbatsov.svg)](https://www.gratipay.com/bbatsov/)
--
+-[![Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bbatsov)
++[Patreon](https://www.patreon.com/bbatsov)
+
## About
- Zenburn for Emacs is a direct port of the popular
-@@ -15,49 +10,6 @@ the eyes.
- This theme uses the new built-in theming support available starting
- with Emacs 24.
+@@ -18,49 +15,6 @@ Emacs 24.1.
+
+ ![Overview screenshot](screenshots/overview.png)
-## Installation
-
-### Manual
-
-Download `zenburn-theme.el` to the directory `~/.emacs.d/themes/`. Add this to your
--`.emacs`:
+-`.emacs` (or `init.el`):
-
-```lisp
-(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/")
@@ -63,10 +75,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
## Customization
- If you'd like to tweak the theme by changing just a few colors, you can
-@@ -104,5 +56,3 @@ You can support my work on Zenburn and [
+ ### Custom colors
+@@ -128,5 +82,3 @@ contributors have done so.
- Cheers,<br\>
- [Bozhidar](http://twitter.com/bbatsov)
+ You can support my work on Zenburn and [all my other projects](https://github.com/bbatsov)
+ via [Patreon](https://www.patreon.com/bbatsov).
-
-[badge-license]: https://img.shields.io/badge/license-GPL_3-green.svg
diff --git a/debian/patches/series b/debian/patches/series
index 252c97d..7bb8252 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-patch-README-for-Debian.patch
+debian-changes