[Python-apps-commits] r13353 - in packages/retext/trunk/debian (changelog copyright)

[mitya57 at users.alioth.debian.org]

    Date: Saturday, June 25, 2016 @ 10:47:59
  Author: mitya57
Revision: 13353

Update debian/copyright.

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

Modified: packages/retext/trunk/debian/changelog
===================================================================
--- packages/retext/trunk/debian/changelog	2016-06-25 10:38:13 UTC (rev 13352)
+++ packages/retext/trunk/debian/changelog	2016-06-25 10:47:59 UTC (rev 13353)
@@ -8,6 +8,7 @@
     mechanism (closes: #793934).
   * Update the retext.1 manual page.
   * Bump Standards-Version to 3.9.8, no changes needed.
+  * Update debian/copyright.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 08 Apr 2016 23:27:20 +0200
 

Modified: packages/retext/trunk/debian/copyright
===================================================================
--- packages/retext/trunk/debian/copyright	2016-06-25 10:38:13 UTC (rev 13352)
+++ packages/retext/trunk/debian/copyright	2016-06-25 10:47:59 UTC (rev 13353)
@@ -3,35 +3,55 @@
 Source: https://github.com/retext-project/retext
 
 Files: *
-Copyright: 2011-2015, Dmitry Shachnev <mitya57 at gmail.com>
+Copyright: 2011-2016, Dmitry Shachnev <mitya57 at gmail.com>
 License: GPL-2+
 
-Files: ReText/tablemode.py tests/test_tablemode.py
-Copyright: 2013-2014, Maurice van der Pot <griffon26 at kfk4ever.com>
+Files: ReText/tablemode.py ReText/syncscroll.py
+       tests/test_tablemode.py tests/test_window.py
+Copyright: 2013-2016, Maurice van der Pot <griffon26 at kfk4ever.com>
 License: GPL-2+
 
+Files: ReText/mdx_posmap.py
+Copyright: 2016, Maurice van der Pot <griffon26 at kfk4ever.com>
+License: BSD-2-clause
+
 Files: ReText/fakevimeditor.py
 Copyright: 2014, Lukas Holecek <hluk at email.cz>
 License: GPL-2+
 
 License: GPL-2+
- 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 2 of the License, or (at your option) any later
- version.
+ 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 2 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 General Public License for more
- details.
+ 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.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ 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.
+ .
+ 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.