[Python-modules-commits] [sphinx] 01/02: Update debian/copyright from upstream LICENSE and AUTHORS files.

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch debian/master
in repository sphinx.

commit aaa0fa95f020169c2bfecfde1cf379f0d1948e0b
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Aug 5 20:36:46 2017 +0300

    Update debian/copyright from upstream LICENSE and AUTHORS files.
---
 debian/changelog |  1 +
 debian/copyright | 41 ++++++++++++++++++++++++++++++++++-------
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d86e420..84b6edf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ sphinx (1.6.3-1) UNRELEASED; urgency=medium
   * Disable one more test that needs network in skip_tests_network.diff.
   * Move libjs-sphinxdoc package to javascript section.
   * Update numbers in debian/jstest/run-tests for the new release.
+  * Update debian/copyright from upstream LICENSE and AUTHORS files.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 09 Jul 2017 12:12:43 +0300
 
diff --git a/debian/copyright b/debian/copyright
index de6ac0e..d956242 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -101,7 +101,7 @@ is available under the following license:
 | SmartyPants license::
 | 
 |     Copyright (c) 2003 John Gruber
-|     (http://daringfireball.net/)
+|     (https://daringfireball.net/projects/smartypants/)
 |     All rights reserved.
 | 
 |     Redistribution and use in source and binary forms, with or without
@@ -166,10 +166,38 @@ is available under the following license:
 |     the use of this software, even if advised of the possibility of
 |     such damage.
 
+The ElementTree package, included in this distribution in
+tests/etree13, is available under the following license:
+
+| The ElementTree toolkit is
+|
+| Copyright (c) 1999-2007 by Fredrik Lundh
+|
+| By obtaining, using, and/or copying this software and/or its
+| associated documentation, you agree that you have read, understood,
+| and will comply with the following terms and conditions:
+|
+| Permission to use, copy, modify, and distribute this software and its
+| associated documentation for any purpose and without fee is hereby
+| granted, provided that the above copyright notice appears in all
+| copies, and that both that copyright notice and this permission notice
+| appear in supporting documentation, and that the name of Secret Labs
+| AB or the author not be used in advertising or publicity pertaining to
+| distribution of the software without specific, written prior
+| permission.
+|
+| SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
+| THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- ABILITY
+| AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE
+| FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+| WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+| ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+| OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 The included JQuery JavaScript library is available under the MIT
 license:
 
-| Copyright (c) 2008 John Resig, http://jquery.com/
+| Copyright (c) 2008 John Resig, https://jquery.com/
 |
 | Permission is hereby granted, free of charge, to any person obtaining
 | a copy of this software and associated documentation files (the
@@ -244,9 +272,6 @@ was derived from code under the following license:
 | IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 | POSSIBILITY OF SUCH DAMAGE.
 
-AUTHORS file
-============
-
 Sphinx is written and maintained by Georg Brandl <georg at python.org>.
 
 Substantial parts of the templates were written by Armin Ronacher
@@ -261,6 +286,8 @@ Other co-maintainers:
 * Robert Lehmann <@lehmannro>
 * Roland Meister <@rolmei>
 * Takeshi Komiya <@tk0miya>
+* Jean-François Burnol <@jfbu>
+* Yoshiki Shibukawa <@shibu_jp>
 
 Other contributors, listed alphabetically, are:
 
@@ -269,7 +296,7 @@ Other contributors, listed alphabetically, are:
 * Jakob Lykke Andersen -- Rewritten C++ domain
 * Henrique Bastos -- SVG support for graphviz extension
 * Daniel Bültmann -- todo extension
-* Jean-François Burnol -- LaTeX improvements
+* Marco Buttu -- doctest extension (pyversion option)
 * Etienne Desautels -- apidoc module
 * Michael Droettboom -- inheritance_diagram extension
 * Charles Duffy -- original graphviz extension
@@ -303,7 +330,6 @@ Other contributors, listed alphabetically, are:
 * Rob Ruana -- napoleon extension
 * Stefan Seefeld -- toctree improvements
 * Gregory Szorc -- performance improvements
-* Shibukawa Yoshiki -- pluggable search API and Japanese search, epub3 builder improvements
 * Taku Shimizu -- epub3 builder
 * Antonio Valentino -- qthelp builder
 * Filip Vavera -- napoleon todo directive
@@ -316,6 +342,7 @@ Other contributors, listed alphabetically, are:
 * Michael Wilson -- Intersphinx HTTP basic auth support
 * Joel Wurtz -- cellspanning support in LaTeX
 * Hong Xu -- svg support in imgmath extension and various bug fixes
+* Stephen Finucane -- setup command improvements and documentation
 
 Many thanks for all contributions!
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sphinx.git