diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/copyright | 4 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/patches/debian-changes (renamed from debian/patches/patch-README-for-Debian.patch) | 50 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/source/options | 2 | ||||
| -rw-r--r-- | debian/source/patch-header | 17 |
9 files changed, 70 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index b6c8309..612ee7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +zenburn-emacs (2.6-1) unstable; urgency=medium + + * New upstream release. + * Install new screenshots/ dir. + * Point Vcs-* at salsa. + * Update Maintainer field for team rename. + * Bump copyright years. + * Create d/source/{options,patch-header} for dgit-maint-merge(7). + * Drop --parallel from d/rules. + + -- Sean Whitton <spwhitton@spwhitton.name> Sat, 20 Oct 2018 12:24:45 -0700 + zenburn-emacs (2.5-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 0a82fd9..92e3b95 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: zenburn-emacs Section: lisp Priority: optional -Maintainer: Debian Emacs addons team <pkg-emacsen-addons@lists.alioth.debian.org> +Maintainer: Debian Emacsen team <debian-emacsen@lists.debian.org> Uploaders: Sean Whitton <spwhitton@spwhitton.name> Build-Depends: debhelper (>= 10), dh-elpa Standards-Version: 4.0.0 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-emacsen/pkg/zenburn-emacs.git/ -Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/zenburn-emacs.git +Vcs-Browser: https://salsa.debian.org/emacsen-team/zenburn-emacs +Vcs-Git: https://salsa.debian.org/emacsen-team/zenburn-emacs.git Homepage: http://github.com/bbatsov/zenburn-emacs Package: elpa-zenburn-theme diff --git a/debian/copyright b/debian/copyright index 12eaa41..332faa8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: zenburn-emacs Source: http://github.com/bbatsov/zenburn-emacs Files: * -Copyright: (C) 2011-2017 Bozhidar Batsov +Copyright: (C) 2011-2018 Bozhidar Batsov License: GPL-3+ Files: debian/* -Copyright: (C) 2016, 2017 Sean Whitton <spwhitton@spwhitton.name> +Copyright: (C) 2016, 2017, 2018 Sean Whitton <spwhitton@spwhitton.name> License: GPL-3+ License: GPL-3+ diff --git a/debian/docs b/debian/docs index dd44972..4d4b179 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ *.md +screenshots 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) -[](http://melpa.org/#/zenburn-theme) -[](http://stable.melpa.org/#/zenburn-theme) --[](https://www.gratipay.com/bbatsov/) -- +-[](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. + +  -## 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 diff --git a/debian/rules b/debian/rules index 8eb7ccb..e8e22ba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --parallel --with elpa + dh $@ --with elpa diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..ce071fb --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +single-debian-patch +auto-commit diff --git a/debian/source/patch-header b/debian/source/patch-header new file mode 100644 index 0000000..6a87e9d --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,17 @@ +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. |