[Python-modules-commits] [python-aniso8601] 01/01: Update upstream licensing info
Jonathan Carter
highvoltage-guest at moszumanska.debian.org
Fri Nov 4 19:19:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
highvoltage-guest pushed a commit to branch master
in repository python-aniso8601.
commit 2e6c1008a644b12c57e3c04af57cc60360a000bb
Author: Jonathan Carter <jcarter at linux.com>
Date: Fri Nov 4 21:18:30 2016 +0200
Update upstream licensing info
---
debian/changelog | 5 +++--
debian/copyright | 39 +++++++++++++++++++++++++--------------
2 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e4a8f26..58c5318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,14 @@
-python-aniso8601 (1.2.0-1) UNRELEASED; urgency=medium
+python-aniso8601 (1.2.0-1) unstable; urgency=medium
* New upstream version
* Set new maintainer address
* Update standards version to 0.9.8 (no changes)
* Update copyright to 2016 in copyright file
+ * New upstream license (GPL-3+ -> BSD)
-- Jonathan Carter <jcarter at linux.com> Sun, 30 Oct 2016 09:41:38 +0200
-python-aniso8601 (1.1.0-1) UNRELEASED; urgency=medium
+python-aniso8601 (1.1.0-1) unstable; urgency=medium
* New upstream version
diff --git a/debian/copyright b/debian/copyright
index 88565d2..495f91a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,23 +4,34 @@ Source: https://bitbucket.org/nielsenb/aniso8601
Files: *
Copyright: 2016 Brandon Nielsen <nielsenb at jetfuse.net>
-License: GPL-3+
- 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
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
+License: BSD
+Copyright (c) 2016, Brandon Nielsen
+ All rights reserved.
.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
.
- On Debian systems the full text of the GNU General Public License
- version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
Files: debian/*
Copyright: 2016 Jonathan Carter <jonathan at ubuntu.com>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-aniso8601.git
More information about the Python-modules-commits
mailing list