diff -Nru circe-2.10/.bumpversion.cfg circe-2.11/.bumpversion.cfg --- circe-2.10/.bumpversion.cfg 2018-05-25 12:31:18.000000000 +0000 +++ circe-2.11/.bumpversion.cfg 2019-03-22 12:42:46.000000000 +0000 @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.10 +current_version = 2.11 parse = (?P\d+)\.(?P.*) serialize = {major}.{minor} files = circe.el circe-pkg.el diff -Nru circe-2.10/circe-color-nicks.el circe-2.11/circe-color-nicks.el --- circe-2.10/circe-color-nicks.el 2018-05-25 12:31:18.000000000 +0000 +++ circe-2.11/circe-color-nicks.el 2019-03-22 12:42:46.000000000 +0000 @@ -81,18 +81,22 @@ recommended is 7:1, or at least 4.5:1 (7 stands for 7:1 here). Lower value allows higher color spread, but could lead to less readability." + :type 'number :group 'circe-color-nicks) (defcustom circe-color-nicks-min-difference 17 "Minimum difference from each other for generated colors." + :type 'integer :group 'circe-color-nicks) (defcustom circe-color-nicks-min-fg-difference 17 "Minimum difference from foreground for generated colors." + :type 'integer :group 'circe-color-nicks) (defcustom circe-color-nicks-min-my-message-difference 0 "Minimum difference from own nick color for generated colors." + :type 'integer :group 'circe-color-nicks) (defcustom circe-color-nicks-everywhere nil diff -Nru circe-2.10/circe-display-images.el circe-2.11/circe-display-images.el --- circe-2.10/circe-display-images.el 2018-05-25 12:31:18.000000000 +0000 +++ circe-2.11/circe-display-images.el 2019-03-22 12:42:46.000000000 +0000 @@ -77,21 +77,25 @@ "\\(https?:\/\/[^ ]*?\.\\\(?:png\\|jpg\\|jpeg\\|svg\\|gif\\)\\)" "Regex used to find images in channel messages. This regex needs to be greedy to match multiple images on the same line." - :group 'circe-display-images) + :group 'circe-display-images + :type 'string) (defcustom circe-display-images-max-height 400 "The image's maximum allowed height. Images will be scaled down if they are larger than this" - :group 'circe-display-images) + :group 'circe-display-images + :type 'integer) (defcustom circe-display-images-background nil "Background used for the images background, if image supports transparency. Defaults to the frame's background color." - :group 'circe-display-images) + :group 'circe-display-images + :type 'string) (defcustom circe-display-images-animate-gifs nil "Animate any gifs that are displayed. This might slow down Emacs." - :group 'circe-display-images) + :group 'circe-display-images + :type 'boolean) (defvar-local circe-display-images-text-property-map (make-hash-table :test 'equal) diff -Nru circe-2.10/circe.el circe-2.11/circe.el --- circe-2.10/circe.el 2018-05-25 12:31:18.000000000 +0000 +++ circe-2.11/circe.el 2019-03-22 12:42:46.000000000 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 2005 - 2015 Jorgen Schaefer -;; Version: 2.10 +;; Version: 2.11 ;; Keywords: IRC, chat ;; Author: Jorgen Schaefer ;; URL: https://github.com/jorgenschaefer/circe @@ -31,7 +31,7 @@ ;;; Code: -(defvar circe-version "2.10" +(defvar circe-version "2.11" "Circe version string.") (require 'circe-compat) diff -Nru circe-2.10/circe-pkg.el circe-2.11/circe-pkg.el --- circe-2.10/circe-pkg.el 2018-05-25 12:31:18.000000000 +0000 +++ circe-2.11/circe-pkg.el 2019-03-22 12:42:46.000000000 +0000 @@ -1,3 +1,3 @@ -(define-package "circe" "2.10" "Client for IRC in Emacs" +(define-package "circe" "2.11" "Client for IRC in Emacs" '((cl-lib "0.5")) :url "https://github.com/jorgenschaefer/circe") diff -Nru circe-2.10/debian/changelog circe-2.11/debian/changelog --- circe-2.10/debian/changelog 2019-08-24 18:58:45.000000000 +0000 +++ circe-2.11/debian/changelog 2019-09-14 13:42:17.000000000 +0000 @@ -1,3 +1,18 @@ +circe (2.11-2) unstable; urgency=medium + + * Upload to unstable + * Assert Compliance with policy 4.4.0 (no changes) + + -- David Bremner Sat, 14 Sep 2019 10:42:17 -0300 + +circe (2.11-1) experimental; urgency=medium + + * fix Vcs-* + * New upstream version + * experimental rebuild with dh-elpa 2.0 + + -- David Bremner Mon, 02 Sep 2019 13:21:43 -0300 + circe (2.10-2) unstable; urgency=medium * Team upload. diff -Nru circe-2.10/debian/control circe-2.11/debian/control --- circe-2.10/debian/control 2019-08-24 18:58:45.000000000 +0000 +++ circe-2.11/debian/control 2019-09-14 13:42:17.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian Emacs addons team Uploaders: David Bremner -Build-Depends: debhelper (>= 10), dh-elpa (>= 0.0.17), elpa-buttercup -Standards-Version: 4.0.1 +Build-Depends: debhelper (>= 10), dh-elpa (>= 2.0), elpa-buttercup +Standards-Version: 4.4.0 Homepage: https://github.com/jorgenschaefer/circe -Vcs-Git: https://salsa.debian.org/emacsen-team/pkg/circe.git -Vcs-Browser: https://salsa.debian.org/cgit/emacsen-team/pkg/circe.git +Vcs-Git: https://salsa.debian.org/emacsen-team/circe.git +Vcs-Browser: https://salsa.debian.org/cgit/emacsen-team/circe.git Package: elpa-circe Architecture: all diff -Nru circe-2.10/debian/patches/debian-changes circe-2.11/debian/patches/debian-changes --- circe-2.10/debian/patches/debian-changes 2019-08-24 18:58:45.000000000 +0000 +++ circe-2.11/debian/patches/debian-changes 2019-09-14 13:42:17.000000000 +0000 @@ -5,10 +5,10 @@ information below has been extracted from the changelog. Adjust it or drop it. . - circe (2.10-2) unstable; urgency=medium + circe (2.11-2) unstable; urgency=medium . - * Team upload. - * Rebuild with current dh-elpa + * Upload to unstable + * Assert Compliance with policy 4.4.0 (no changes) Author: David Bremner --- @@ -22,10 +22,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: -Last-Update: 2019-08-24 +Last-Update: 2019-09-14 ---- circe-2.10.orig/tests/test-circe.el -+++ circe-2.10/tests/test-circe.el +--- circe-2.11.orig/tests/test-circe.el ++++ circe-2.11/tests/test-circe.el @@ -61,7 +61,10 @@ (before-each (setq server-buffer (generate-new-buffer "*Test Server*"))