[Python-modules-commits] r25386 - in packages/python-django-voting/trunk/debian (2 files)

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

    Date: Sunday, August 4, 2013 @ 19:00:08
  Author: ockham-guest
Revision: 25386

debian/copyright: Improve structure.

Modified:
  packages/python-django-voting/trunk/debian/changelog
  packages/python-django-voting/trunk/debian/copyright

Modified: packages/python-django-voting/trunk/debian/changelog
===================================================================
--- packages/python-django-voting/trunk/debian/changelog	2013-08-04 18:22:02 UTC (rev 25385)
+++ packages/python-django-voting/trunk/debian/changelog	2013-08-04 19:00:08 UTC (rev 25386)
@@ -5,7 +5,9 @@
   * debian/control:
     - Bump Standards-Version to 3.9.4.
     - Bump debhelper Build-Depends to >= 8.1.
-  * debian/copyright: Add Jannis Leidel to copyright holders.
+  * debian/copyright:
+    - Add Jannis Leidel to copyright holders.
+    - Improve structure.
   * debian/patches/django14: Whitespace fix.
   * debian/patches/test_settings: Add a SECRET_KEY setting.
     (Closes: #711371, LP: #1193942)

Modified: packages/python-django-voting/trunk/debian/copyright
===================================================================
--- packages/python-django-voting/trunk/debian/copyright	2013-08-04 18:22:02 UTC (rev 25385)
+++ packages/python-django-voting/trunk/debian/copyright	2013-08-04 19:00:08 UTC (rev 25386)
@@ -7,16 +7,15 @@
 Copyright: 2007, Jonathan Buchanan
            2007, Jacob Kaplan-Moss
            2012, Jannis Leidel
-License: MIT
+License: Expat and BSD-3-clause
+Comment: Jacob Kaplan-Moss's code is licensed under the BSD-3-clause license,
+ while the rest is licensed under the Expat license.
 
 Files: debian/*
-Copyright: 2010, Bernhard Reiter <ockham at raz.or.at>
-License: MIT
+Copyright: 2010-2013, Bernhard Reiter <ockham at raz.or.at>
+License: Expat
 
-License: MIT
- Copyright (c) 2007, Jonathan Buchanan
- Copyright (c) 2012, Jannis Leidel
- .
+License: Expat
  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
@@ -33,11 +32,8 @@
  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.
- .
- CheeseRater
- -----------
- .
- Copyright (c) 2007, Jacob Kaplan-Moss
+ 
+License: BSD-3-clause
  All rights reserved.
  .
  Redistribution and use in source and binary forms, with or without modification,