diff -pruN 2.1.3-5/debian/changelog 2.1.5-3/debian/changelog --- 2.1.3-5/debian/changelog 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/changelog 2022-08-02 23:38:43.000000000 +0000 @@ -1,3 +1,38 @@ +rainbow-delimiters (2.1.5-3) unstable; urgency=medium + + * Third attempt at 2.1.5-1 upload with correct content. + + -- Sean Whitton Tue, 02 Aug 2022 16:38:43 -0700 + +rainbow-delimiters (2.1.5-2) unstable; urgency=medium + + * Upload intended 2.1.5-1. + Previous upload was of a detached HEAD, by mistake. + + -- Sean Whitton Tue, 02 Aug 2022 15:30:17 -0700 + +rainbow-delimiters (2.1.5-1) unstable; urgency=medium + + [ Aymeric Agon-Rambosson ] + * New upstream release. + * Adopt the package from Sean Whitton (Closes: #1007869). + + * d/control: + - Bump debhelper compat to 13 (removed + package-needs-versioned-debhelper-build-depends lintian-override, not + applicable anymore, and removed parallel from rules). + - Bump Standards version to 4.5.1 (no changes required). + - Add optional Rules-Requires-Root field to respect Debian Policy. + + * Update copyright years. + * Refresh patch. + * Correct d/watch. + + [ Nicholas D Steeves ] + * Drop emacs24 from Enhances (package does not exist in bullseye). + + -- Aymeric Agon-Rambosson Mon, 01 Aug 2022 02:24:30 +0200 + rainbow-delimiters (2.1.3-5) unstable; urgency=medium * Team upload diff -pruN 2.1.3-5/debian/compat 2.1.5-3/debian/compat --- 2.1.3-5/debian/compat 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -pruN 2.1.3-5/debian/control 2.1.5-3/debian/control --- 2.1.3-5/debian/control 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/control 2022-08-02 23:38:43.000000000 +0000 @@ -2,11 +2,13 @@ Source: rainbow-delimiters Section: lisp Priority: optional Maintainer: Debian Emacsen Team -Uploaders: Sean Whitton -Build-Depends: debhelper (>= 9.20160402), +Uploaders: Aymeric Agon-Rambosson +Build-Depends: + debhelper-compat (= 13), dh-elpa +Rules-Requires-Root: no Homepage: https://github.com/Fanael/rainbow-delimiters -Standards-Version: 3.9.8 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/emacsen-team/rainbow-delimiters Vcs-Git: https://salsa.debian.org/emacsen-team/rainbow-delimiters.git @@ -15,8 +17,7 @@ Architecture: all Depends: ${elpa:Depends}, ${misc:Depends}, emacs Recommends: emacs (>= 46.0) -Enhances: emacs, - emacs24 +Enhances: emacs Built-Using: ${misc:Built-Using} Description: Emacs mode to colour-code delimiters according to their depth rainbow-delimiters is a "rainbow parentheses"-like mode which diff -pruN 2.1.3-5/debian/copyright 2.1.5-3/debian/copyright --- 2.1.3-5/debian/copyright 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/copyright 2022-08-02 23:38:43.000000000 +0000 @@ -4,7 +4,7 @@ Source: https://github.com/Fanael/rainbo Files: * Copyright: (C) 2010-2013 Jeremy Rayman - (C) 2013-2016 Fanael Linithien + (C) 2013-2021 Fanael Linithien License: GPL-3+ Files: rainbow-delimiters-test.el diff -pruN 2.1.3-5/debian/patches/0001-patch-README-for-Debian.patch 2.1.5-3/debian/patches/0001-patch-README-for-Debian.patch --- 2.1.3-5/debian/patches/0001-patch-README-for-Debian.patch 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/patches/0001-patch-README-for-Debian.patch 2022-08-02 23:38:43.000000000 +0000 @@ -7,19 +7,17 @@ Forwarded: not-needed README.md | 20 -------------------- 1 file changed, 20 deletions(-) -diff --git a/README.md b/README.md -index 3f1fb58..379aaf5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -[![MELPA](http://melpa.org/packages/rainbow-delimiters-badge.svg)](http://melpa.org/#/rainbow-delimiters) -[![MELPA Stable](http://stable.melpa.org/packages/rainbow-delimiters-badge.svg)](http://stable.melpa.org/#/rainbow-delimiters) --[![Build status](https://travis-ci.org/Fanael/rainbow-delimiters.svg?branch=master)](https://travis-ci.org/Fanael/rainbow-delimiters) +-[![Build Status](https://github.com/Fanael/rainbow-delimiters/workflows/CI/badge.svg)](https://github.com/Fanael/rainbow-delimiters/actions) - # rainbow-delimiters `rainbow-delimiters` is a "rainbow parentheses"-like mode which highlights -@@ -20,25 +16,9 @@ at even if you usually don't like rainbow parentheses modes. A number of major +@@ -20,25 +16,9 @@ at even if you usually don't like rainbo color themes such as Zenburn and Solarized have added their own faces for the mode. diff -pruN 2.1.3-5/debian/rules 2.1.5-3/debian/rules --- 2.1.3-5/debian/rules 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/rules 2022-08-02 23:38:43.000000000 +0000 @@ -1,4 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --parallel --with elpa + dh $@ --with elpa diff -pruN 2.1.3-5/debian/source/lintian-overrides 2.1.5-3/debian/source/lintian-overrides --- 2.1.3-5/debian/source/lintian-overrides 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# using experimental compat for dh_elpa_test -package-needs-versioned-debhelper-build-depends 10 diff -pruN 2.1.3-5/debian/watch 2.1.5-3/debian/watch --- 2.1.3-5/debian/watch 2021-01-23 12:02:30.000000000 +0000 +++ 2.1.5-3/debian/watch 2022-08-02 23:38:43.000000000 +0000 @@ -1,2 +1,2 @@ version=4 -opts="mode=git" https://github.com/Fanael/rainbow-delimiters refs/tags/v([\d\.\d\.]+) debian \ No newline at end of file +opts="mode=git" https://github.com/Fanael/rainbow-delimiters refs/tags/([\d\.\d\.]+) debian \ No newline at end of file diff -pruN 2.1.3-5/.github/workflows/test.yml 2.1.5-3/.github/workflows/test.yml --- 2.1.3-5/.github/workflows/test.yml 1970-01-01 00:00:00.000000000 +0000 +++ 2.1.5-3/.github/workflows/test.yml 2021-05-15 12:54:09.000000000 +0000 @@ -0,0 +1,27 @@ +name: CI + +on: + push: + paths-ignore: + - '**/*.md' + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + emacs_version: + - 23.4 + - 24.5 + - 25.3 + - 26.3 + - snapshot + env: + EMACS_VERSION: ${{ matrix.emacs_version }} + steps: + - uses: purcell/setup-emacs@master + with: + version: ${{ matrix.emacs_version }} + - uses: actions/checkout@v1 + - name: Run tests + run: './run-tests.sh' diff -pruN 2.1.3-5/rainbow-delimiters.el 2.1.5-3/rainbow-delimiters.el --- 2.1.3-5/rainbow-delimiters.el 2016-05-01 06:58:52.000000000 +0000 +++ 2.1.5-3/rainbow-delimiters.el 2021-05-15 12:54:09.000000000 +0000 @@ -2,12 +2,12 @@ ;; Copyright (C) ;; 2010-2013 Jeremy Rayman -;; 2013-2016 Fanael Linithien +;; 2013-2021 Fanael Linithien ;; Author: Jeremy Rayman ;; Fanael Linithien ;; Maintainer: Fanael Linithien ;; Created: 2010-09-02 -;; Version: 2.1.3 +;; Version: 2.1.5 ;; Keywords: faces, convenience, lisp, tools ;; Homepage: https://github.com/Fanael/rainbow-delimiters @@ -104,14 +104,24 @@ The function should not move the point o :type 'function :group 'rainbow-delimiters) +(defface rainbow-delimiters-base-face + '((default (:inherit unspecified))) + "Face inherited by all other rainbow-delimiter faces." + :group 'rainbow-delimiters-faces) + +(defface rainbow-delimiters-base-error-face + '((default (:inherit rainbow-delimiters-base-face)) + (t (:foreground "#88090B"))) + "Face inherited by all other rainbow-delimiter error faces." + :group 'rainbow-delimiters-faces) + (defface rainbow-delimiters-unmatched-face - '((((background light)) (:foreground "#88090B")) - (((background dark)) (:foreground "#88090B"))) + '((default (:inherit rainbow-delimiters-base-error-face))) "Face to highlight unmatched closing delimiters in." :group 'rainbow-delimiters-faces) (defface rainbow-delimiters-mismatched-face - '((t :inherit rainbow-delimiters-unmatched-face)) + '((default (:inherit rainbow-delimiters-unmatched-face))) "Face to highlight mismatched closing delimiters in." :group 'rainbow-delimiters-faces) @@ -124,7 +134,8 @@ The function should not move the point o "#b0b0b3" "#90a890" "#a2b6da" "#9cb6ad"])) (dotimes (i 9) (push `(defface ,(intern (format "rainbow-delimiters-depth-%d-face" (1+ i))) - '((((class color) (background light)) :foreground ,(aref light-colors i)) + '((default (:inherit rainbow-delimiters-base-face)) + (((class color) (background light)) :foreground ,(aref light-colors i)) (((class color) (background dark)) :foreground ,(aref dark-colors i))) ,(format "Nested delimiter face, depth %d." (1+ i)) :group 'rainbow-delimiters-faces) @@ -220,6 +231,10 @@ Returns t if char at loc meets one of th "Highlight delimiters in region between point and END. Used by font-lock for dynamic highlighting." + (when (bound-and-true-p mmm-current-submode) + ;; `mmm-mode' is weird and apparently needs this hack, because otherwise we + ;; may end up thinking matched parentheses are mismatched. + (widen)) (let* ((last-ppss-pos (point)) (ppss (syntax-ppss))) (while (> end (progn (skip-syntax-forward "^()" end) @@ -255,7 +270,9 @@ Used by font-lock for dynamic highlighti ;;;###autoload (define-minor-mode rainbow-delimiters-mode "Highlight nested parentheses, brackets, and braces according to their depth." - nil "" nil ; No modeline lighter - it's already obvious when the mode is on. + :init-value nil + :lighter "" ; No modeline lighter - it's already obvious when the mode is on. + :keymap nil (font-lock-remove-keywords nil rainbow-delimiters--font-lock-keywords) (when rainbow-delimiters-mode (font-lock-add-keywords nil rainbow-delimiters--font-lock-keywords 'append) diff -pruN 2.1.3-5/README.md 2.1.5-3/README.md --- 2.1.3-5/README.md 2016-05-01 06:58:52.000000000 +0000 +++ 2.1.5-3/README.md 2021-05-15 12:54:09.000000000 +0000 @@ -1,6 +1,6 @@ [![MELPA](http://melpa.org/packages/rainbow-delimiters-badge.svg)](http://melpa.org/#/rainbow-delimiters) [![MELPA Stable](http://stable.melpa.org/packages/rainbow-delimiters-badge.svg)](http://stable.melpa.org/#/rainbow-delimiters) -[![Build status](https://travis-ci.org/Fanael/rainbow-delimiters.svg?branch=master)](https://travis-ci.org/Fanael/rainbow-delimiters) +[![Build Status](https://github.com/Fanael/rainbow-delimiters/workflows/CI/badge.svg)](https://github.com/Fanael/rainbow-delimiters/actions) # rainbow-delimiters diff -pruN 2.1.3-5/run-tests.sh 2.1.5-3/run-tests.sh --- 2.1.3-5/run-tests.sh 1970-01-01 00:00:00.000000000 +0000 +++ 2.1.5-3/run-tests.sh 2021-05-15 12:54:09.000000000 +0000 @@ -0,0 +1,12 @@ +#!/bin/sh +set -o errexit +set -o nounset + +if [ "$EMACS_VERSION" = '23.4' ]; then + curl -O 'https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el' +fi + +EMACS="${EMACS:=emacs}" + +"$EMACS" -Q -batch --eval '(setq byte-compile-error-on-warn t)' -f batch-byte-compile rainbow-delimiters.el +"$EMACS" -Q -batch -l rainbow-delimiters-test.el -f ert-run-tests-batch-and-exit diff -pruN 2.1.3-5/.travis.yml 2.1.5-3/.travis.yml --- 2.1.3-5/.travis.yml 2016-05-01 06:58:52.000000000 +0000 +++ 2.1.5-3/.travis.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -language: emacs-lisp -env: - - EMACS=emacs23 - - EMACS=emacs24 - - EMACS=emacs-snapshot -before_install: - - sudo add-apt-repository -y ppa:cassou/emacs - - sudo add-apt-repository -y ppa:ubuntu-elisp/ppa - - sudo apt-get update -y -q - - sudo apt-get install -y $EMACS-nox -install: - - if [ "$EMACS" = "emacs23" ]; then - curl -O 'https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el'; - fi -script: - - $EMACS -Q -batch --eval '(setq byte-compile-error-on-warn t)' -f batch-byte-compile rainbow-delimiters.el - - $EMACS -Q -batch -l rainbow-delimiters-test.el -f ert-run-tests-batch-and-exit -notifications: - email: false