[Python-modules-commits] r33522 - in packages/pygments/trunk/debian (changelog copyright)

[mitya57 at users.alioth.debian.org]

    Date: Tuesday, July 28, 2015 @ 19:30:07
  Author: mitya57
Revision: 33522

Merge my last commit with NMU uploaded to archive

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

Modified: packages/pygments/trunk/debian/changelog
===================================================================
--- packages/pygments/trunk/debian/changelog	2015-07-28 19:20:10 UTC (rev 33521)
+++ packages/pygments/trunk/debian/changelog	2015-07-28 19:30:07 UTC (rev 33522)
@@ -2,8 +2,20 @@
 
   * Disable two tests that need example files, again.
 
- -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 23 Jan 2015 16:59:20 +0300
+ -- Dmitry Shachnev <mitya57 at debian.org>  Tue, 28 Jul 2015 22:29:07 +0300
 
+pygments (2.0.1+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/copyright: add the missing licenses of:
+    - pygments/lexers/robotframework.py
+    - tests/dtds/HTMLspec.ent
+    - tests/dtds/HTMLlat1.ent
+    - tests/dtds/HTMLsym.ent
+    (Closes: #766042)
+
+ -- Sébastien Villemot <sebastien at debian.org>  Sun, 22 Mar 2015 10:23:41 +0100
+
 pygments (2.0.1+dfsg-1) unstable; urgency=medium
 
   [ Dmitry Shachnev ]

Modified: packages/pygments/trunk/debian/copyright
===================================================================
--- packages/pygments/trunk/debian/copyright	2015-07-28 19:20:10 UTC (rev 33521)
+++ packages/pygments/trunk/debian/copyright	2015-07-28 19:30:07 UTC (rev 33522)
@@ -42,6 +42,46 @@
  scripts/vim2pygments.py:
 	2006 by Armin Ronacher.
 
+
+Files with different licenses:
+
+ - pygments/lexers/robotframework.py:
+
+   Copyright: 2012 Nokia Siemens Networks Oyj
+              2006-2014 The Pygments team
+
+   License: Apache-2.0 and BSD-2-clause
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+    On Debian systems, the complete text of the Apache License, version 2.0,
+    can be found in the file `/usr/share/common-licenses/Apache-2.0`.
+
+    The text of the BSD license is the same as the main Pygments license.
+
+ - tests/dtds/HTMLlat1.ent
+   tests/dtds/HTMLspec.ent
+   tests/dtds/HTMLsym.ent:
+
+   Copyright: 1986 International Organization for Standardization
+
+   License:
+
+    Permission to copy in any form is granted for use with
+    conforming SGML systems and applications as defined in
+    ISO 8879, provided this notice is included in all copies.
+
+
 The Debian packaging is © 2006-2009, Piotr Ożarowski <piotr at debian.org> and
 is licensed under the same licence as Pygments.