[Python-modules-commits] [coreschema] 01/01: Merges changelog for -2 and -1 as -1 got rejected, and fixes the copyright issues

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository coreschema.

commit 7fc93c7da630b2588739eee786da7cabb1a594c1
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Wed Jan 24 18:28:16 2018 +0100

    Merges changelog for -2 and -1 as -1 got rejected, and fixes the copyright issues
---
 debian/changelog |  8 +-------
 debian/copyright | 26 +++++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcbde47..fd0bf45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,5 @@
-coreschema (0.0.4-2) UNRELEASED; urgency=medium
-
-  * Drops git-dpm stuff and unapply patches from working tree.
-
- -- Pierre-Elliott Bécue <becue at crans.org>  Wed, 24 Jan 2018 09:20:09 +0100
-
 coreschema (0.0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #886783)
 
- -- Pierre-Elliott Bécue <becue at crans.org>  Thu, 11 Jan 2018 13:49:37 +0100
+ -- Pierre-Elliott Bécue <becue at crans.org>  Wed, 24 Jan 2018 18:31:17 +0100
diff --git a/debian/copyright b/debian/copyright
index eb0192e..2be2a61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: coreschema
 Source: https://github.com/core-api/python-coreschema
 Comment: Upstream did not provide a specific license file. In PKG-INFO and in
@@ -10,6 +10,10 @@ Files: *
 Copyright: Copyright 2016-2017 Tom Christie <tom at tomchristie.com>
 License: BSD-2-Clause
 
+Files: coreschema/utils.py
+Copyright: Copyright 2013 Julian Berman <Julian at GrayVines.com>
+License: X11
+
 Files: debian/*
 Copyright: Copyright 2018 Pierre-Elliott Bécue <becue at crans.org>
 License: BSD-2-Clause
@@ -35,3 +39,23 @@ License: BSD-2-Clause
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
+
+License: X11
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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