diff -Nru auto-install-el-1.53/auto-install.el auto-install-el-1.58/auto-install.el --- auto-install-el-1.53/auto-install.el 2011-04-23 15:44:41.000000000 +0000 +++ auto-install-el-1.58/auto-install.el 2015-04-19 00:02:47.000000000 +0000 @@ -1,5 +1,5 @@ ;;; auto-install.el --- Auto install elisp file -;; $Id: auto-install.el,v 1.53 2011/04/12 06:28:20 rubikitch Exp $ +;; $Id: auto-install.el,v 1.58 2015/01/14 08:24:23 rubikitch Exp $ ;; Filename: auto-install.el ;; Description: Auto install elisp file @@ -9,7 +9,7 @@ ;; Copyright (C) 2008, 2009, Andy Stewart, all rights reserved. ;; Copyright (C) 2009, rubikitch, all rights reserved. ;; Created: 2008-12-11 13:56:50 -;; Version: $Revision: 1.53 $ +;; Version: $Revision: 1.58 $ ;; URL: http://www.emacswiki.org/emacs/download/auto-install.el ;; Keywords: auto-install ;; Compatibility: GNU Emacs 22 ~ 23 @@ -24,7 +24,7 @@ ;; `url-util', `url-vars'. ;; -(defvar auto-install-version "$Id: auto-install.el,v 1.53 2011/04/12 06:28:20 rubikitch Exp $") +(defvar auto-install-version "$Id: auto-install.el,v 1.58 2015/01/14 08:24:23 rubikitch Exp $") ;;; This file is NOT part of GNU Emacs ;;; License @@ -106,7 +106,7 @@ ;; default = "auto-install" ;; `auto-install-emacswiki-base-url' ;; The base emacswiki.org url from which to download elisp files. -;; default = "http://www.emacswiki.org/cgi-bin/wiki/download/" +;; default = "http://www.emacswiki.org/emacs/download/" ;; `auto-install-gist-base-url' ;; The base gist.github.com url from which to download elisp files. ;; default = "http://gist.github.com/" @@ -130,7 +130,7 @@ ;; default = "wget" ;; `auto-install-use-wget' ;; *Use wget instead of `url-retrieve'. -;; default = t +;; default = nil ;; `auto-install-batch-list' ;; This list contain packages information for batch install. ;; default = nil @@ -296,6 +296,18 @@ ;;; Change log: ;; ;; $Log: auto-install.el,v $ +;; Revision 1.58 2015/01/14 08:24:23 rubikitch +;; Change auto-install-batch-list-el-url +;; +;; Revision 1.57 2015/01/04 21:58:24 rubikitch +;; Don't use wget by default because of problem. +;; +;; Revision 1.56 2015/01/04 21:53:56 rubikitch +;; Summary: Change emacswiki download URL +;; +;; Revision 1.54 2012/01/15 12:10:20 rubikitch +;; Default value of `auto-install-use-wget' is whether wget exists or not. +;; ;; Revision 1.53 2011/04/12 06:28:20 rubikitch ;; fix for proxy ;; @@ -655,7 +667,7 @@ :type 'string :group 'auto-install) -(defcustom auto-install-emacswiki-base-url "http://www.emacswiki.org/cgi-bin/wiki/download/" +(defcustom auto-install-emacswiki-base-url "http://www.emacswiki.org/emacs/download/" "The base emacswiki.org url from which to download elisp files." :type 'string :group 'auto-install) @@ -702,14 +714,15 @@ (defcustom auto-install-wget-command "wget" "*Wget command. Use only if `auto-install-use-wget' is non-nil." - :type 'string + :type 'string :group 'auto-install) -(defcustom auto-install-use-wget t +(defcustom auto-install-use-wget nil "*Use wget instead of `url-retrieve'. -It is enabled by default when wget is found." - :type 'boolean +It WAS enabled by default when wget is found. +But some files (e.g. icicles.el) are downloaded incorrectly." + :type 'boolean :group 'auto-install) (defcustom auto-install-batch-list @@ -731,7 +744,7 @@ "The real value of `auto-install-batch-list'. ") (defvar auto-install-batch-list-el-url - "http://www.rubyist.net/~rubikitch/archive/auto-install-batch-list.el" + "http://rubikitch.com/f/auto-install-batch-list.el" "The url of auto-install-batch-list.el. It is downloaded and evaluated just after M-x `auto-install-batch'. ") @@ -812,7 +825,7 @@ (auto-install-download (concat auto-install-emacswiki-base-url file))) (t ;; Otherwise update package name and install. - (auto-install-download "http://www.emacswiki.org/cgi-bin/emacs?action=index;raw=1" + (auto-install-download "http://www.emacswiki.org/?action=index;raw=1" 'auto-install-handle-emacswiki-package-install)))) (defun auto-install-from-gist (&optional gistid-or-url) @@ -881,7 +894,7 @@ (prog1 (not (zerop (buffer-size))) (kill-buffer (current-buffer)))))) ;; (auto-install-network-available-p "www.emacswiki.org") - +(require 'timer) (defun auto-install-update-emacswiki-package-name (&optional unforced) "Update the list of elisp package names from `EmacsWiki'. By default, this function will update package name forcibly. @@ -889,9 +902,11 @@ (interactive) (unless (and unforced auto-install-package-name-list) - (if (auto-install-network-available-p "www.emacswiki.org") - (auto-install-download "http://www.emacswiki.org/cgi-bin/emacs?action=index;raw=1" - 'auto-install-handle-emacswiki-package-name) + (if (and (auto-install-network-available-p "www.emacswiki.org") + (with-timeout (5 nil) + (progn (auto-install-download "http://www.emacswiki.org/?action=index;raw=1" + 'auto-install-handle-emacswiki-package-name)) + t)) (message (concat "Network unreachable!\n" "Try M-x auto-install-handle-emacswiki-package-name afterward.")) @@ -905,7 +920,7 @@ ;; Mark files that exist at `EmacsWiki'. (auto-install-dired-mark-files-internal) ;; Or get package name list and match files. - (auto-install-download "http://www.emacswiki.org/cgi-bin/emacs?action=index;raw=1" + (auto-install-download "http://www.emacswiki.org/?action=index;raw=1" 'auto-install-handle-dired-mark-files)) (error "This command just use in `dired-mode'."))) @@ -1044,8 +1059,8 @@ (car (last (auto-install-batch-get-info url batch-list)))))))))))) ;;;; unit test -;; (install-elisp "http://www.emacswiki.org/cgi-bin/wiki/download/el-expectations.el") -;; (install-elisp "http://www.emacswiki.org/cgi-bin/wiki/download/el-mock.el") +;; (install-elisp "http://www.emacswiki.org/emacs/download/el-expectations.el") +;; (install-elisp "http://www.emacswiki.org/emacs/download/el-mock.el") (dont-compile (when (fboundp 'expectations) (expectations @@ -1091,7 +1106,7 @@ (unless (file-exists-p auto-install-directory) (make-directory auto-install-directory) (when auto-install-add-load-path-flag - (add-to-list 'load-path auto-install-directory)) + (add-to-list 'load-path auto-install-directory)) (message "Create directory %s for install elisp file." auto-install-directory)) ;; Download. (funcall @@ -1498,4 +1513,3 @@ ;;; LocalWords: el eol dirs fontify gistid txt func bytecomp DDirectory ediff ;;; LocalWords: noselect Unmark unmark AutoInstall keybindings defalias'es - diff -Nru auto-install-el-1.53/debian/changelog auto-install-el-1.58/debian/changelog --- auto-install-el-1.53/debian/changelog 2012-03-22 06:33:52.000000000 +0000 +++ auto-install-el-1.58/debian/changelog 2017-12-24 04:56:14.000000000 +0000 @@ -1,3 +1,22 @@ +auto-install-el (1.58-1~ubuntu16.04.1~c42.ppa1) xenial; urgency=medium + + * No-change backport to xenial + + -- H.-Dirk Schmitt Sun, 24 Dec 2017 05:56:14 +0100 + +auto-install-el (1.58-1) unstable; urgency=low + + * New upstream release + * debian/compat: Update debhelper to 9. + * debian/control: + - Update Standards-Version to 3.9.8. + - Build-Depends: Update debhelper to 9. + - Depends: Support various versions.(Closes: #694780) + * debian/copyright: Fixed lintian error. + * debian/emacsen-compat: Comply to newer Emacs policy. + + -- Takaya Yamashita Fri, 30 Dec 2016 22:28:01 +0900 + auto-install-el (1.53-1) unstable; urgency=low * New upstream release. diff -Nru auto-install-el-1.53/debian/compat auto-install-el-1.58/debian/compat --- auto-install-el-1.53/debian/compat 2011-12-10 08:55:49.000000000 +0000 +++ auto-install-el-1.58/debian/compat 2016-12-30 13:28:01.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru auto-install-el-1.53/debian/control auto-install-el-1.58/debian/control --- auto-install-el-1.53/debian/control 2012-03-22 06:31:23.000000000 +0000 +++ auto-install-el-1.58/debian/control 2016-12-30 13:28:01.000000000 +0000 @@ -2,13 +2,13 @@ Section: lisp Priority: extra Maintainer: Takaya Yamashita -Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 Homepage: http://www.emacswiki.org/AutoInstall Package: auto-install-el Architecture: all -Depends: ${misc:Depends}, emacs | emacs23 | emacs-snapshot, emacsen-common (>= 1.4.14) +Depends: ${misc:Depends}, emacsen-common (>= 2.0.8), emacs | emacs25 Description: Auto install elisp file Effortlessly download, install, and update Elisp files from the web or from a local buffer. diff -Nru auto-install-el-1.53/debian/copyright auto-install-el-1.58/debian/copyright --- auto-install-el-1.53/debian/copyright 2011-12-10 08:55:50.000000000 +0000 +++ auto-install-el-1.58/debian/copyright 2016-12-30 13:28:01.000000000 +0000 @@ -7,6 +7,10 @@ 2009, rubikitch License: GPL-3.0+ +Files: debian/* +Copyright: 2016 Takaya Yamashita +License: GPL-3.0+ + License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru auto-install-el-1.53/debian/emacsen-compat auto-install-el-1.58/debian/emacsen-compat --- auto-install-el-1.53/debian/emacsen-compat 1970-01-01 00:00:00.000000000 +0000 +++ auto-install-el-1.58/debian/emacsen-compat 2016-12-30 13:28:01.000000000 +0000 @@ -0,0 +1 @@ +0