[med-svn] [openmolar] 07/07: correct copyright

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository openmolar.

commit 8d1af5cd771e8643eae4e116de74532f3ec4dba1
Author: Gert Wollny <gewo at debian.org>
Date:   Tue Jan 10 11:44:15 2017 +0000

    correct copyright
---
 debian/changelog |  2 ++
 debian/copyright | 29 -----------------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a7ab0f..e234a7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ openmolar (1.0.15-gd81f9e5-1) unstable; urgency=medium
   d/rules: set --install-dir option 
   d/control: update run-time dependencies
   d/p/remove_mimetype.patch: Correct desktop file to not specify mimetype 
+  d/copyright: remove section about backports/ordered_dict.py since it is 
+   no longer part of the source
 
  -- Andreas Tille <tille at debian.org>  Sat, 17 Dec 2016 19:04:06 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 66f0809..e48f443 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,13 +7,6 @@ Copyright: 2009-2014 Neil Wallace <neil at openmolar.com>
                                   <rowinggolfer at googlemail.com>
 License: GPL-3+
 
-Files: src/openmolar/backports/ordered_dict.py
-Copyright: 2009      Raymond Hettinger
-           2009-2014 Neil Wallace <neil at openmolar.com>
-License: Expat
-Comment:
- http://code.activestate.com/recipes/576669/
-
 Files: debian/*
 Copyright: 2013-2015 Dmitry Smirnov <onlyjob at debian.org>
 License: GPL-3+
@@ -32,25 +25,3 @@ License: GPL-3+
  The complete text of the GNU General Public License 3
  can be found in "/usr/share/common-licenses/GPL-3".
 
-License: Expat
- 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.
-Comment:
- This license also known as "MIT" however FSF consider "MIT" labelling
- ambiguous and copyright-format specification recommend to label such license
- as "Expat".

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openmolar.git