[Python-modules-commits] r33514 - in packages/plainbox/trunk/debian (changelog copyright)

[zyga-guest at users.alioth.debian.org]

    Date: Tuesday, July 28, 2015 @ 17:08:01
  Author: zyga-guest
Revision: 33514

* De-duplicate licenses in debian/copyright
* Correct filename patterns for pyglibc/glibc files.

Modified:
  packages/plainbox/trunk/debian/changelog
  packages/plainbox/trunk/debian/copyright

Modified: packages/plainbox/trunk/debian/changelog
===================================================================
--- packages/plainbox/trunk/debian/changelog	2015-07-28 16:59:29 UTC (rev 33513)
+++ packages/plainbox/trunk/debian/changelog	2015-07-28 17:08:01 UTC (rev 33514)
@@ -8,6 +8,8 @@
   * Remove duplicate dependency on python3-xlsxwriter (via suggests and
     depends) from python3-plainbox.
   * Remove XS-Testsuite: autopkgtest as recommend by lintian.
+  * De-duplicate licenses in debian/copyright
+  * Correct filename patterns for pyglibc/glibc files.
 
  -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Tue, 28 Jul 2015 12:23:17 +0200
 

Modified: packages/plainbox/trunk/debian/copyright
===================================================================
--- packages/plainbox/trunk/debian/copyright	2015-07-28 16:59:29 UTC (rev 33513)
+++ packages/plainbox/trunk/debian/copyright	2015-07-28 17:08:01 UTC (rev 33514)
@@ -122,36 +122,15 @@
 Files: plainbox/vendor/morris/*
 Copyright: Copyright (c) 2012-15 Canonical Ltd.
 License: LGPL-3+
- This file is part of Morris.
- .
- Morris is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License.
- .
- Morris 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 Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with Morris.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: plainbox/vendor/glibc/*
+Files: plainbox/vendor/glibc.py
 Copyright: Copyright (c) 2014 Canonical Ltd.
 License: LGPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- 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 Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+Files: plainbox/vendor/pyglibc/*
+Copyright: Copyright (c) 2014 Canonical Ltd.
+License: LGPL-3+
+
 Files: plainbox/impl/_argparse.py
 Copyright: Steven J. Bethard <steven.bethard at gmail.com>.
 License: Python
@@ -211,3 +190,18 @@
  .
  8. By copying, installing or otherwise using Python, Licensee agrees to be
     bound by the terms and conditions of this License Agreement.
+
+License: LGPL-3+
+ This file is part of Morris.
+ .
+ Morris is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License.
+ .
+ Morris 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 Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with Morris.  If not, see <http://www.gnu.org/licenses/>.