diff -Nru smart-mode-line-2.11.0/debian/changelog smart-mode-line-2.12.0/debian/changelog --- smart-mode-line-2.11.0/debian/changelog 2018-05-22 21:52:51.000000000 +0000 +++ smart-mode-line-2.12.0/debian/changelog 2018-10-03 03:21:57.000000000 +0000 @@ -1,3 +1,23 @@ +smart-mode-line (2.12.0-1) unstable; urgency=medium + + * New upstream release. + * Rebase patch onto upstream 2.12.0. + - 0003-Fix-privacy-breach-generic-logo-and-donation.patch + * debian/docs: + - Install new screenshot-atom-one-dark.png. + - Explicitly install README.org rather than use *.org. + * debian/control: + - Drop explicit ELPA dependencies for binary packages and trust dh-elpa's + automatic dependency generation support. + - Add Enhances: elpa-solarized-theme. + - Refine long description. + * Declare Standards-Version: 4.2.1. + * Install upstream news.md as NEWS + - debian/rules: Add override_dh_elpa to install news.md to debian/tmp/NEWS. + - debian/docs: Drop *.md and install NEWS. + + -- Nicholas D Steeves Tue, 02 Oct 2018 23:21:57 -0400 + smart-mode-line (2.11.0-1) unstable; urgency=medium * Initial release. (Closes: #861214) diff -Nru smart-mode-line-2.11.0/debian/control smart-mode-line-2.12.0/debian/control --- smart-mode-line-2.11.0/debian/control 2018-05-22 21:52:51.000000000 +0000 +++ smart-mode-line-2.12.0/debian/control 2018-10-03 03:21:57.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Nicholas D Steeves Build-Depends: debhelper (>= 11~) , dh-elpa -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/emacsen-team/smart-mode-line Vcs-Git: https://salsa.debian.org/emacsen-team/smart-mode-line.git Homepage: https://github.com/Malabarba/smart-mode-line @@ -14,34 +14,33 @@ Architecture: all Depends: ${elpa:Depends} , ${misc:Depends} - , elpa-rich-minority (>=0.1.1) Recommends: emacs (>= 46.0) Suggests: elpa-solarized-theme Enhances: emacs , emacs25 + , elpa-solarized-theme Description: powerful and beautiful mode-line for Emacs - Smart Mode Line is a sexy mode-line for Emacs. Its main features are: + Smart Mode Line is a sexy mode-line for Emacs. Its main features are: . * Highlights the most important information * Intelligently truncates path name and mode names - * Allows right indentation of strings in the modeline + * Allows right indentation of strings * Shorthand directory names (e.g. ~/.emacs.d/ is translated to :ED:) * Hide or highlight minor-modes * Easy configuration of all colours and variables - * Compatible with any other packages that write to the mode-line + * Compatible with other packages that write to the mode-line . - If you have a small screen device such as a netbook, and have been - looking for a way to maximise the vertical real estate available - for editing, without losing the consistent location of the clock, - then install this addon, run emacs full-screen, and discover - how powerful the mode-line can be. It can replace most of the - functionality that a desktop panel provides! - + If you have a small screen device such as a netbook and have been + looking for a way to maximise the vertical real estate available for + editing, without losing the consistent location of the clock, then + install this addon, run Emacs full-screen, and discover how powerful + the mode-line can be. This makes using screens with a 16:9 aspect + ratio slightly less painful. + Package: elpa-smart-mode-line-powerline-theme Architecture: all Depends: ${elpa:Depends} , ${misc:Depends} - , elpa-powerline (>= 2.2) Recommends: emacs (>= 46.0) Enhances: emacs , emacs25 diff -Nru smart-mode-line-2.11.0/debian/docs smart-mode-line-2.12.0/debian/docs --- smart-mode-line-2.11.0/debian/docs 2018-05-22 21:52:51.000000000 +0000 +++ smart-mode-line-2.12.0/debian/docs 2018-10-03 03:21:57.000000000 +0000 @@ -1,7 +1,8 @@ -*.md -*.org +NEWS +README.org screenshot-2013-11-11-dark.png screenshot-2013-11-11-light.png +screenshot-atom-one-dark.png screenshot-light-powerline-theme.png screenshot-powerline-theme.png screenshot-solarized-dark-theme.png diff -Nru smart-mode-line-2.11.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch smart-mode-line-2.12.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch --- smart-mode-line-2.11.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch 2018-05-22 21:52:51.000000000 +0000 +++ smart-mode-line-2.12.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch 2018-10-03 03:21:57.000000000 +0000 @@ -2,15 +2,16 @@ Date: Fri, 9 Jun 2017 15:14:08 -0400 Subject: Fix privacy-breach generic, logo, and donation Forwarded: not-needed +Last-Update: 2018-10-01 --- - README.org | 39 ++++++--------------------------------- - 1 file changed, 6 insertions(+), 33 deletions(-) + README.org | 37 +++++++++++++------------------------ + 1 file changed, 13 insertions(+), 24 deletions(-) -Index: smart-mode-line/README.org -=================================================================== ---- smart-mode-line.orig/README.org -+++ smart-mode-line/README.org +diff --git a/README.org b/README.org +index 15d86f7..35711d4 100644 +--- a/README.org ++++ b/README.org @@ -1,6 +1,4 @@ -#+TITLE: Smart-mode-line [[http://melpa.org/#/smart-mode-line][file:http://melpa.org/packages/smart-mode-line-badge.svg]] [[http://melpa.org/#/smart-mode-line][file:http://stable.melpa.org/packages/smart-mode-line-badge.svg]] - @@ -19,7 +20,7 @@ Smart Mode Line is a sexy mode-line for Emacs. It aims to be easy to read from small to large monitors by using /colors/, a /prefix feature/, -@@ -9,34 +7,32 @@ and /smart truncation/. +@@ -9,41 +7,38 @@ and /smart truncation/. * Images *Dark Theme*\\ @@ -30,18 +31,14 @@ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-2013-11-11-light.png]] +[[file:screenshot-2013-11-11-light.png]] - *Powerline Theme*\\ --[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-powerline-theme.png]] -+[[file:screenshot-powerline-theme.png]] - - *Light Powerline Theme*\\ --[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-light-powerline-theme.png]] -+[[file:screenshot-light-powerline-theme.png]] + *Atom-one Dark Theme*\\ +-[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-atom-one-dark.png]] ++[[file:screenshot-atom-one-dark.png]] --(Note: to use either powerline theme, install the --=smart-mode-line-powerline-theme= package from MELPA) -+Note: to use either powerline theme, install the -+=smart-mode-line-powerline-theme= package + (Note: to use the Atom-one theme, install the +-[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=smart-mode-line-atom-one-dark-theme=]] +-package from MELPA) ++[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=elpa-smart-mode-line-atom-one-dark-theme=]] package) *Solarized Dark Theme*\\ -[[https://cloud.githubusercontent.com/assets/601365/7131638/34a3b0f8-e247-11e4-8fd5-811365167d22.png]] @@ -51,11 +48,22 @@ -[[https://cloud.githubusercontent.com/assets/601365/7131637/34946ac6-e247-11e4-8e0e-35a47df70686.png]] +[[file:screenshot-solarized-light-theme.png]] --(Note: to use the Solarized themes, install the + (Note: to use the Solarized themes, install the -[[https://github.com/bbatsov/solarized-emacs/][=solarized-theme=]] -package from MELPA) -+Note: to use the Solarized themes, install the -+=elpa-solarized-theme= package ++=elpa-solarized-theme= package) + + *Powerline Theme*\\ +-[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-powerline-theme.png]] ++[[file:screenshot-powerline-theme.png]] + + *Light Powerline Theme*\\ +-[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-light-powerline-theme.png]] ++[[file:screenshot-light-powerline-theme.png]] + + (Note: to use either powerline theme, install the +-=smart-mode-line-powerline-theme= package from MELPA) ++=elpa-smart-mode-line-powerline-theme= package) * Installation @@ -65,7 +73,7 @@ #+BEGIN_SRC emacs-lisp (sml/setup) -@@ -97,7 +93,7 @@ Its main features include: +@@ -104,7 +99,7 @@ Its main features include: path. See below for examples. - Hide or Highlight minor-modes :: @@ -74,7 +82,7 @@ package saves even more space. Select which minor modes you don't want to see listed by adding them to the variable =rm-blacklist=, or even highlight the modes that are more -@@ -209,9 +205,3 @@ the project is in the =~/Projects= direc +@@ -216,9 +211,3 @@ the project is in the =~/Projects= directory: (lambda (s) (concat ":" (upcase (match-string 1 s)) ":"))) t) #+END_SRC diff -Nru smart-mode-line-2.11.0/debian/rules smart-mode-line-2.12.0/debian/rules --- smart-mode-line-2.11.0/debian/rules 2018-05-22 21:52:51.000000000 +0000 +++ smart-mode-line-2.12.0/debian/rules 2018-10-03 03:21:57.000000000 +0000 @@ -2,3 +2,7 @@ %: dh $@ --with elpa + +override_dh_elpa: + dh_elpa + install -D news.md debian/tmp/NEWS diff -Nru smart-mode-line-2.11.0/README.org smart-mode-line-2.12.0/README.org --- smart-mode-line-2.11.0/README.org 2018-01-29 09:30:26.000000000 +0000 +++ smart-mode-line-2.12.0/README.org 2018-09-25 00:30:26.000000000 +0000 @@ -14,14 +14,12 @@ *Light Theme*\\ [[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-2013-11-11-light.png]] -*Powerline Theme*\\ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-powerline-theme.png]] - -*Light Powerline Theme*\\ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-light-powerline-theme.png]] +*Atom-one Dark Theme*\\ +[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-atom-one-dark.png]] -(Note: to use either powerline theme, install the -=smart-mode-line-powerline-theme= package from MELPA) +(Note: to use the Atom-one theme, install the +[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=smart-mode-line-atom-one-dark-theme=]] +package from MELPA) *Solarized Dark Theme*\\ [[https://cloud.githubusercontent.com/assets/601365/7131638/34a3b0f8-e247-11e4-8fd5-811365167d22.png]] @@ -33,6 +31,15 @@ [[https://github.com/bbatsov/solarized-emacs/][=solarized-theme=]] package from MELPA) +*Powerline Theme*\\ +[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-powerline-theme.png]] + +*Light Powerline Theme*\\ +[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-light-powerline-theme.png]] + +(Note: to use either powerline theme, install the +=smart-mode-line-powerline-theme= package from MELPA) + * Installation *smart-mode-line* is available on Melpa, and that's the recommended Binary files /tmp/tmp51Pbp7/LvCrVQ2Eg7/smart-mode-line-2.11.0/screenshot-atom-one-dark.png and /tmp/tmp51Pbp7/bl3GKiGpgW/smart-mode-line-2.12.0/screenshot-atom-one-dark.png differ diff -Nru smart-mode-line-2.11.0/smart-mode-line.el smart-mode-line-2.12.0/smart-mode-line.el --- smart-mode-line-2.11.0/smart-mode-line.el 2018-01-29 09:30:26.000000000 +0000 +++ smart-mode-line-2.12.0/smart-mode-line.el 2018-09-25 00:30:26.000000000 +0000 @@ -1077,12 +1077,12 @@ (add-hook 'comint-output-filter-functions 'sml/generate-buffer-identification) (add-hook 'eshell-directory-change-hook 'sml/generate-buffer-identification) - ;; Term support - (defadvice term-command-hook (after sml/term-advice-1 activate) - (sml/generate-buffer-identification)) + ;; ;; Term support - Disabled for now because of Issue#198 + ;; (defadvice term-command-hook (after sml/term-advice-1 activate) + ;; (sml/generate-buffer-identification)) - (defadvice term-handle-ansi-terminal-messages (after sml/term-advice-2 activate) - (sml/generate-buffer-identification)) + ;; (defadvice term-handle-ansi-terminal-messages (after sml/term-advice-2 activate) + ;; (sml/generate-buffer-identification)) ;; Dired overrides the buffer-identification (which we would ;; normally respect) but doesn't actually do anything useful with @@ -1415,7 +1415,8 @@ ;;;; mode-line-position ;; Color the position percentage - ((sml/is-%p-p el) + ((or (sml/is-%p-p el) + (and (listp el) (memq 'mode-line-percent-position el))) `(sml/position-percentage-format (-3 (:propertize (:eval sml/position-percentage-format) local-map ,mode-line-column-line-number-mode-map @@ -1453,7 +1454,10 @@ ;; Color the mode line process ((or (equal el '("" mode-line-process)) (equal (car (cdr-safe el)) '("" mode-line-process))) - `(:propertize ("" mode-line-process) face sml/process)) + '(mode-line-process + (:eval (let ((text (format-mode-line mode-line-process))) + (add-face-text-property 0 (length text) 'sml/process t text) + text)))) ;; Color the mode name, without changing other properties ((and (listp el) (equal (car el) :propertize) @@ -1648,7 +1652,9 @@ (setq out (replace-regexp-in-string (car cur) (car (cdr cur)) out)))) ;; Try truename replacements (when (string= out in) - (let* ((true-in (abbreviate-file-name (file-truename in))) + (let* ((true-in (abbreviate-file-name (if (file-remote-p in) + in + (file-truename in)))) (true-out true-in)) (dolist (cur sml/replacer-regexp-list) (setq true-out (replace-regexp-in-string