[Python-modules-commits] r16872 - in packages/cssutils/trunk/debian (changelog copyright)

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

    Date: Tuesday, May 3, 2011 @ 04:32:17
  Author: cjsmo-guest
Revision: 16872

swaped file blocks, combined comments into one

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

Modified: packages/cssutils/trunk/debian/changelog
===================================================================
--- packages/cssutils/trunk/debian/changelog	2011-05-03 04:21:39 UTC (rev 16871)
+++ packages/cssutils/trunk/debian/changelog	2011-05-03 04:32:17 UTC (rev 16872)
@@ -16,6 +16,7 @@
     - debian/man/csscombine.manpage1.
     - debian/man/cssparse.manpage1.
   * Added debian/python-cssutils.manpages to install the new manpages.
+  * Updated debian/copyright to DEP5.
   * Added manpage copyright info to debian/copyright.
   * Added debian/doc-base to register the html documentation with doc-base.
   * Added debian/python-cssutils-doc.links to create the jquery.js symlink.

Modified: packages/cssutils/trunk/debian/copyright
===================================================================
--- packages/cssutils/trunk/debian/copyright	2011-05-03 04:21:39 UTC (rev 16871)
+++ packages/cssutils/trunk/debian/copyright	2011-05-03 04:32:17 UTC (rev 16872)
@@ -6,8 +6,32 @@
 
 Comment: Only explicit copyright is from Christof Hoeke, but the mention of
  Walter Doerwald in the credits and the __author__ stanzas in some Python
- source files quite certainly make him a copyright holder.
+ source files quite certainly make him a copyright holder.  The upstream
+ licensing moved from Creative Commons licensing to LGPL 2.1 and subsequently
+ to LGPL 3.  Some files such as setup.py mention LGPL 2.1+, but
+ COPYING.LESSER, the upstream site, and most files clearly mention LGPL 3+
+ rendering the result LGPL 3+.
 
+Files: *
+Copyright: Christof Hoeke
+           Walter Doerwald
+License: LGPL-3+
+ encutils 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.
+ .
+ encutils 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 encutils.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-3'.
+
 Files: debian/*
 Copyright: 2008 Bernd Zeimetz <bzed at debian.org>
            2008 Damien Churchill <damoxc at gmail.com>
@@ -29,28 +53,3 @@
  .
  On Debian systems, the complete text of the GNU Lesser General Public License
  can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-Comment: the upstream licensing moved from Creative Commons licensing to
- LGPL 2.1 and subsequently to LGPL 3.  Some files such as setup.py mention
- LGPL 2.1+, but COPYING.LESSER, the upstream site, and most files clearly
- mention LGPL 3+ rendering the result LGPL 3+.
-
-Files: *
-Copyright: Christof Hoeke
-           Walter Doerwald
-License: LGPL-3+
- encutils 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.
- .
- encutils 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 encutils.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-3'.