[tryton-debian-vcs] relatorio branch debian updated. debian/0.8.0-1_exp1-2-g833e7d1

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/relatorio.git;a=commitdiff;h=debian/0.8.0-1_exp1-2-g833e7d1

commit 833e7d11de44764e11c9dc03a691ea39f28a947a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Jan 19 19:29:26 2018 +0100

    Update year of debian copyright.

diff --git a/debian/copyright b/debian/copyright
index 950db46..05e3e84 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,7 +35,7 @@ License: GPL-3+
 
 Files: debian/*
 Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
-           2012-2017 Mathias Behrle <mathiasb at m9s.biz>
+           2012-2018 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
commit b6b64a2cc678c48ea2b908f3565fbfa08d2fa4ff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Jan 19 19:22:42 2018 +0100

    Remove copyright information of former embedded code copy of python-magic.

diff --git a/debian/changelog b/debian/changelog
index 57c7b54..020a12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-relatorio (0.8.0-1~exp1) experimental; urgency=medium
+relatorio (0.8.0-1~exp1) unstable; urgency=medium
 
   * Merging upstream version 0.8.0.
   * Remove 01-add-pypi-magic.patch.
diff --git a/debian/copyright b/debian/copyright
index fce7f16..950db46 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,13 +33,6 @@ Copyright: 2007-2008 OpenHex SPRL <http://www.openhex.com/>
            2014-2017 Cedric Krier
 License: GPL-3+
 
-Files: thirdparty/magic/*
-Copyright: 2011 Adam Hupp
-License: MIT
-Comment:
- (upstream switched to from PSF to MIT on 4 jan 2014
- https://github.com/ahupp/python-magic/commit/a0f2249dad53 )
-
 Files: debian/*
 Copyright: 2009-2012 Daniel Baumann <daniel at debian.org>
            2012-2017 Mathias Behrle <mathiasb at m9s.biz>
@@ -61,23 +54,3 @@ License: GPL-3+
  .
  The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.
-
-License: MIT
- The MIT License
- 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.
-- 
relatorio