diff -Nru bbdb3-3.2/debian/changelog bbdb3-3.2/debian/changelog --- bbdb3-3.2/debian/changelog 2020-09-28 19:59:01.000000000 +0000 +++ bbdb3-3.2/debian/changelog 2021-01-16 11:45:09.000000000 +0000 @@ -1,3 +1,11 @@ +bbdb3 (3.2-10) unstable; urgency=medium + + * track upstream mods through first half of Jan 2021 + * yak shave uscan support file + * bump policy + + -- Barak A. Pearlmutter Sat, 16 Jan 2021 11:45:09 +0000 + bbdb3 (3.2-9) unstable; urgency=medium * track upstream mods through 28-Sep-2020 including emacs 27 fix diff -Nru bbdb3-3.2/debian/control bbdb3-3.2/debian/control --- bbdb3-3.2/debian/control 2020-09-28 19:50:03.000000000 +0000 +++ bbdb3-3.2/debian/control 2021-01-16 11:44:21.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Barak A. Pearlmutter Build-Depends: debhelper-compat (= 13), emacs | emacs26-nox | emacs26 | emacs25-nox | emacs25 | emacs24-nox | emacs24 -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Rules-Requires-Root: no Homepage: https://savannah.nongnu.org/projects/bbdb/ Vcs-Git: https://salsa.debian.org/debian/bbdb3.git diff -Nru bbdb3-3.2/debian/patches/debian-changes bbdb3-3.2/debian/patches/debian-changes --- bbdb3-3.2/debian/patches/debian-changes 2020-09-28 19:59:01.000000000 +0000 +++ bbdb3-3.2/debian/patches/debian-changes 2021-01-16 11:45:09.000000000 +0000 @@ -1,31 +1,15 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - bbdb3 (3.2-9) unstable; urgency=medium - . - * track upstream mods through 28-Sep-2020 including emacs 27 fix -Author: Barak A. Pearlmutter - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2020-09-28 +This is an autogenerated patch header for a single-debian-patch file. The +delta against upstream is either kept as a single patch, or maintained +in some VCS, and exported as a single patch instead of more manageable +atomic patches. --- bbdb3-3.2.orig/ChangeLog +++ bbdb3-3.2/ChangeLog -@@ -1,3 +1,106 @@ +@@ -1,3 +1,110 @@ ++2021-01-07 Roland Winkler ++ * lisp/bbdb-sc.el: Add third arg to define-obsolete-variable-alias ++ and define-obsolete-function-alias. ++ +2020-09-28 Roland Winkler + * lisp/bbdb-sc.el (bbdb-sc-attribution-field): Quieten compiler. + @@ -132,6 +116,15 @@ 2018-01-06 Roland Winkler * configure.ac: Increase version number to 3.2. +@@ -2358,7 +2465,7 @@ + ;; coding: utf-8 + ;; End: + +- Copyright (C) 2010-2017 Free Software Foundation, Inc. ++ Copyright (C) 2010-2021 Free Software Foundation, Inc. + + This file is part of the Insidious Big Brother Database (aka BBDB), + --- bbdb3-3.2.orig/Makefile.am +++ bbdb3-3.2/Makefile.am @@ -18,7 +18,11 @@ @@ -1335,7 +1328,7 @@ ;; Copyright (C) 1991, 1992 Jamie Zawinski . -;; Copyright (C) 2010-2017 Roland Winkler -+;; Copyright (C) 2010-2020 Roland Winkler ++;; Copyright (C) 2010-2021 Roland Winkler ;; This file is part of the Insidious Big Brother Database (aka BBDB), @@ -1344,7 +1337,7 @@ (require 'supercite) +(define-obsolete-variable-alias 'bbdb/sc-attribution-field -+ 'bbdb-sc-attribution-field) ++ 'bbdb-sc-attribution-field "3.0") (defcustom bbdb-sc-attribution-field 'attribution "The BBDB xfield used for Supercite attribution." :group 'bbdb-utilities-sc @@ -1354,6 +1347,42 @@ (defcustom bbdb-sc-update-records-p 'search "How `bbdb-sc-set-attrib' updates BBDB records automatically. +@@ -105,6 +105,7 @@ Allowed values include + "Last attribution used by Supercite. + Used to compare against citation selected by the user.") + ++(define-obsolete-function-alias 'bbdb/sc-consult-attr 'bbdb-sc-get-attrib "3.0") + (defun bbdb-sc-get-attrib (mail) + "Get the Supercite attribution from BBDB. + MAIL is the mail address to look for in BBDB." +@@ -120,8 +121,8 @@ MAIL is the mail address to look for in + (sit-for 1)) + (if record + (bbdb-record-field (car record) bbdb-sc-attribution-field)))) +-(define-obsolete-function-alias 'bbdb/sc-consult-attr 'bbdb-sc-get-attrib) + ++(define-obsolete-function-alias 'bbdb/sc-set-attr 'bbdb-sc-set-attrib "3.0") + (defun bbdb-sc-set-attrib () + "Store attribution in BBDB." + (let ((from (bbdb-extract-address-components (sc-mail-field "from"))) +@@ -147,8 +148,8 @@ MAIL is the mail address to look for in + (bbdb-record-name record) attrib)))) + (bbdb-record-set-field record bbdb-sc-attribution-field attrib) + (bbdb-change-record record)))))) +-(define-obsolete-function-alias 'bbdb/sc-set-attr 'bbdb-sc-set-attrib) + ++(define-obsolete-function-alias 'bbdb/sc-default 'bbdb-sc-update-from "3.0") + ;;;###autoload + (defun bbdb-sc-update-from () + "Update the \"from\" field in `sc-mail-info'. +@@ -169,7 +170,6 @@ complement the \"from\" field in `sc-mai + (if name + (setcdr (assoc-string "from" sc-mail-info t) + (format "%s <%s>" name (cadr address)))))) +-(define-obsolete-function-alias 'bbdb/sc-default 'bbdb-sc-update-from) + + ;; Insert our hooks + --- bbdb3-3.2.orig/lisp/bbdb-snarf.el +++ bbdb3-3.2/lisp/bbdb-snarf.el @@ -1,6 +1,6 @@ diff -Nru bbdb3-3.2/debian/watch bbdb3-3.2/debian/watch --- bbdb3-3.2/debian/watch 2020-09-28 19:50:03.000000000 +0000 +++ bbdb3-3.2/debian/watch 2021-01-16 11:42:45.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 -opts="pgpsigurlmangle=s/$/.sig/" \ - https://download.savannah.gnu.org/releases/bbdb/bbdb-(.*)\.tar\.gz +version=4 +opts=pgpsigurlmangle=s/$/.sig/ https://download.savannah.gnu.org/releases/bbdb bbdb-@ANY_VERSION@@ARCHIVE_EXT@