diff -Nru semi-1.14.7~0.20210613/debian/changelog semi-1.14.7~0.20220503/debian/changelog --- semi-1.14.7~0.20210613/debian/changelog 2021-08-19 10:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/debian/changelog 2022-05-07 06:26:32.000000000 +0000 @@ -1,3 +1,12 @@ +semi (1.14.7~0.20220503-1) unstable; urgency=medium + + * New upstream version 1.14.7~0.20220503 + * Update debian/copyright + * Remove empty maintainer scripts + * Update Standards-Version to 4.6.0 + + -- Tatsuya Kinoshita Sat, 07 May 2022 15:26:32 +0900 + semi (1.14.7~0.20210613-1) unstable; urgency=medium * New upstream version 1.14.7~0.20210613 diff -Nru semi-1.14.7~0.20210613/debian/control semi-1.14.7~0.20220503/debian/control --- semi-1.14.7~0.20210613/debian/control 2021-02-06 09:31:01.000000000 +0000 +++ semi-1.14.7~0.20220503/debian/control 2022-05-07 06:25:33.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Tatsuya Kinoshita Build-Depends: debhelper-compat (= 13) Build-Depends-Indep: texinfo -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/debian/semi Vcs-Git: https://salsa.debian.org/debian/semi.git Homepage: https://github.com/wanderlust/semi diff -Nru semi-1.14.7~0.20210613/debian/copyright semi-1.14.7~0.20220503/debian/copyright --- semi-1.14.7~0.20210613/debian/copyright 2021-02-06 09:31:49.000000000 +0000 +++ semi-1.14.7~0.20220503/debian/copyright 2022-05-07 06:24:15.000000000 +0000 @@ -22,7 +22,7 @@ version 2 can be found in "/usr/share/common-licenses/GPL-2". Files: debian/* -Copyright: 2003-2021, Tatsuya Kinoshita +Copyright: 2003-2022, Tatsuya Kinoshita 1998-2002, Takuo KITAME License: permissive-debian There is no restriction, so this package may be distributed under diff -Nru semi-1.14.7~0.20210613/debian/postinst semi-1.14.7~0.20220503/debian/postinst --- semi-1.14.7~0.20210613/debian/postinst 2018-06-03 09:00:03.000000000 +0000 +++ semi-1.14.7~0.20220503/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -#DEBHELPER# diff -Nru semi-1.14.7~0.20210613/debian/prerm semi-1.14.7~0.20220503/debian/prerm --- semi-1.14.7~0.20210613/debian/prerm 2018-06-03 09:00:09.000000000 +0000 +++ semi-1.14.7~0.20220503/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -#DEBHELPER# diff -Nru semi-1.14.7~0.20210613/Makefile semi-1.14.7~0.20220503/Makefile --- semi-1.14.7~0.20210613/Makefile 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/Makefile 2022-05-03 14:49:09.000000000 +0000 @@ -20,6 +20,7 @@ LISPDIR = NONE PACKAGEDIR = NONE VERSION_SPECIFIC_LISPDIR = NONE +PACKAGE_LISPDIR = package-user-dir GOMI = *.elc @@ -29,23 +30,16 @@ elc: - $(EMACS) $(FLAGS) -f compile-semi \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) + $(EMACS) $(FLAGS) -f compile-semi $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) install-elc: elc - $(EMACS) $(FLAGS) -f install-semi \ - $(PREFIX) $(LISPDIR) $(VERSION_SPECIFIC_LISPDIR) + $(EMACS) $(FLAGS) -f install-semi $(PREFIX) $(LISPDIR) \ + $(VERSION_SPECIFIC_LISPDIR) $(PACKAGE_LISPDIR) install: install-elc -package: - $(XEMACS) $(FLAGS) -f compile-semi-package $(PACKAGEDIR) - -install-package: package - $(XEMACS) $(FLAGS) -f install-semi-package $(PACKAGEDIR) - - clean: -$(RM) $(GOMI) diff -Nru semi-1.14.7~0.20210613/mime-edit.el semi-1.14.7~0.20220503/mime-edit.el --- semi-1.14.7~0.20210613/mime-edit.el 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/mime-edit.el 2022-05-03 14:49:09.000000000 +0000 @@ -1370,7 +1370,8 @@ (mime-edit-insert-binary-file file encoding))) (defun mime-edit-insert-file-as-text (file &optional verbose) - "Insert a text from a file. This function decodes inserted file and does not define Content-Transfer-Encoding: header and charset parameter." + "Insert a text from a file. This function decodes inserted file and +does not define Content-Transfer-Encoding: header and charset parameter." (interactive "fInsert file as text: \nP") (let* ((guess (mime-find-file-type file)) (type "text") @@ -1944,8 +1945,10 @@ (delete-region (match-beginning 0) (match-end 0)))))) (defun mime-edit-pgp-keys-valid-key (key-list usage) - "Return the first valid key for USAGE from KEY-LIST or nil if there is no valid key. -KEY-LIST is a list of epg key object. Secret key list couldn't be evaluated appropriately. + "Return the first valid key for USAGE from KEY-LIST or nil +if there is no valid key. +KEY-LIST is a list of epg key object. +Secret key list couldn't be evaluated appropriately. USAGE is a symbol denoting the intended usage." (catch 'found (while key-list @@ -2091,7 +2094,9 @@ (mime-charset-to-coding-system charset)))) (defun mime-edit-sign-pgp-nonmime (start end signers mode) - "Sign the current region between START and END by SIGNERS keys selected. Appropriate coding system is selected automatically. When called interactively, current mime part is signed." + "Sign the current region between START and END by SIGNERS keys selected. +Appropriate coding system is selected automatically. +When called interactively, current mime part is signed." (interactive (progn (let ((mime-edit-pgp-verbose @@ -2107,7 +2112,9 @@ (epa-sign-region start end signers mode)) (defun mime-edit-encrypt-pgp-nonmime (start end recipients sign signers) - "Encrypt the current region between START and END for RECIPIENTS. Appropriate coding system is selected automatically. When called interactively, current mime part is encrypted. + "Encrypt the current region between START and END for RECIPIENTS. +Appropriate coding system is selected automatically. +When called interactively, current mime part is encrypted. When SIGN is non-nil, also sign by SIGNERS keys selected." (interactive (let ((mime-edit-pgp-verbose diff -Nru semi-1.14.7~0.20210613/mime-vcard.el semi-1.14.7~0.20220503/mime-vcard.el --- semi-1.14.7~0.20210613/mime-vcard.el 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/mime-vcard.el 2022-05-03 14:49:09.000000000 +0000 @@ -28,7 +28,8 @@ ;;; Code: -(require 'vcard) +;; bbdb-vcard-vcard21.el is available in MELPA's bbdb-vcard package. +(require 'bbdb-vcard-vcard21) (defvar mime-display-text/vcard-hook nil) diff -Nru semi-1.14.7~0.20210613/mime-view.el semi-1.14.7~0.20220503/mime-view.el --- semi-1.14.7~0.20210613/mime-view.el 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/mime-view.el 2022-05-03 14:49:09.000000000 +0000 @@ -1247,7 +1247,8 @@ (defun mime-display-multipart/multilingual (entity situation) "MIME-View mode preview method for multipart/multilingual entity. -When `mime-display-multipart/multilingual-interactive' is nil, select child entity to display automatically. +When `mime-display-multipart/multilingual-interactive' is nil, +select child entity to display automatically. Automatic selection algorithm is below. 1. Select highest score entity calculated from diff -Nru semi-1.14.7~0.20210613/SEMI-CFG semi-1.14.7~0.20220503/SEMI-CFG --- semi-1.14.7~0.20210613/SEMI-CFG 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/SEMI-CFG 2022-05-03 14:49:09.000000000 +0000 @@ -24,6 +24,10 @@ (if VERSION_SPECIFIC_LISPDIR (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR)) +(if (boundp 'PACKAGE_LISPDIR) + (let ((default-directory PACKAGE_LISPDIR)) + (normal-top-level-add-subdirs-to-load-path))) + (condition-case nil (require 'install) (error (error "Please install APEL 8.7 or later."))) diff -Nru semi-1.14.7~0.20210613/SEMI-ELS semi-1.14.7~0.20220503/SEMI-ELS --- semi-1.14.7~0.20210613/SEMI-ELS 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/SEMI-ELS 2022-05-03 14:49:09.000000000 +0000 @@ -25,16 +25,13 @@ (nconc semi-modules-not-to-compile i-modules)) ) ))) - '((w3 mime-w3) - (vcard mime-vcard) - (shr mime-shr) + '((w3 mime-w3) + (bbdb-vcard-vcard21 mime-vcard) + (shr mime-shr) )) -(if (or (string-match "XEmacs" emacs-version) - (featurep 'mule)) - (setq semi-modules-to-compile - (nconc semi-modules-to-compile '(mime-image))) - ) +(setq semi-modules-to-compile + (nconc semi-modules-to-compile '(mime-image))) (when (eq system-type 'darwin) (setq semi-modules-to-compile diff -Nru semi-1.14.7~0.20210613/SEMI-MK semi-1.14.7~0.20220503/SEMI-MK --- semi-1.14.7~0.20210613/SEMI-MK 2021-06-13 09:48:59.000000000 +0000 +++ semi-1.14.7~0.20220503/SEMI-MK 2022-05-03 14:49:09.000000000 +0000 @@ -24,7 +24,16 @@ VERSION_SPECIFIC_LISPDIR))) )) (setq command-line-args-left (cdr command-line-args-left)) - ) + (and (setq package-lisp-dir (car command-line-args-left)) + (or (string-equal "NONE" package-lisp-dir) + (progn + (defvar PACKAGE_LISPDIR + (if (boundp (intern package-lisp-dir)) + (symbol-value (intern package-lisp-dir)) + package-lisp-dir)) + (princ (format "PACKAGE_LISPDIR=%s\n" + PACKAGE_LISPDIR))))) + (setq command-line-args-left (cdr command-line-args-left))) (load-file "SEMI-CFG") (load-file "SEMI-ELS") (princ (format "PREFIX=%s @@ -51,44 +60,4 @@ (install-elisp-modules '(mime-setup) "." SETUP_FILE_DIR) ) -(defun config-semi-package () - (let (package-dir) - (and (setq package-dir (car command-line-args-left)) - (or (string= "NONE" package-dir) - (defvar PACKAGEDIR package-dir) - )) - (setq command-line-args-left (cdr command-line-args-left)) - (load-file "SEMI-CFG") - (load-file "SEMI-ELS") - - (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR)) - )) - -(defun compile-semi-package () - (config-semi-package) - - (setq autoload-package-name "semi") - (add-to-list 'command-line-args-left ".") - (batch-update-directory) - - (add-to-list 'command-line-args-left ".") - (Custom-make-dependencies) - - (compile-elisp-modules (append semi-modules-to-compile - '(mime-setup auto-autoloads custom-load)) - ".") - ) - -(defun install-semi-package () - (config-semi-package) - (install-elisp-modules (append semi-modules - '(mime-setup auto-autoloads custom-load)) - "./" - (expand-file-name SEMI_PREFIX - (expand-file-name "lisp" - PACKAGEDIR))) - (delete-file "./auto-autoloads.el") - (delete-file "./custom-load.el") - ) - ;;; SEMI-MK ends here