[Python-modules-commits] r29257 - in packages/python-django-debug-toolbar/trunk/debian (2 files)

[asb at users.alioth.debian.org]

    Date: Sunday, June 8, 2014 @ 03:33:55
  Author: asb
Revision: 29257

debian/copyright: Update to properly conform to the machine-readable 
copyright spec.

Modified:
  packages/python-django-debug-toolbar/trunk/debian/changelog
  packages/python-django-debug-toolbar/trunk/debian/copyright

Modified: packages/python-django-debug-toolbar/trunk/debian/changelog
===================================================================
--- packages/python-django-debug-toolbar/trunk/debian/changelog	2014-06-08 03:30:22 UTC (rev 29256)
+++ packages/python-django-debug-toolbar/trunk/debian/changelog	2014-06-08 03:33:55 UTC (rev 29257)
@@ -1,3 +1,10 @@
+python-django-debug-toolbar (1:1.2.1-2) UNRELEASED; urgency=medium
+
+  * debian/copyright: Update to properly conform to the machine-readable 
+    copyright spec.
+
+ -- Andrew Starr-Bochicchio <asb at debian.org>  Sat, 07 Jun 2014 23:32:19 -0400
+
 python-django-debug-toolbar (1:1.2.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/python-django-debug-toolbar/trunk/debian/copyright
===================================================================
--- packages/python-django-debug-toolbar/trunk/debian/copyright	2014-06-08 03:30:22 UTC (rev 29256)
+++ packages/python-django-debug-toolbar/trunk/debian/copyright	2014-06-08 03:33:55 UTC (rev 29257)
@@ -1,9 +1,22 @@
-Author: Rob Hudson <rob at cogit8.org>
-Download: http://github.com/robhudson/django-debug-toolbar/tree/master
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/django-debug-toolbar/django-debug-toolbar
+Upstream-Name: django-debug-toolbar
+Upstream-Contact: Rob Hudson <rob at cogit8.org>
 
 Files: *
-Copyright: © 2008 Rob Hudson <rob at cogit8.org>
+Copyright: 2008, Rob Hudson <rob at cogit8.org>
 License: BSD
+
+Files: debug_toolbar/media/jquery.js
+Copyright: 2008, John Resig
+License: GPL-2 | MIT
+
+Files: debian/*
+Copyright: 2008, Chris Lamb <lamby at debian.org>
+           2014, Andrew Starr-Bochicchio <asb at debian.org>
+License: BSD
+
+License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -28,10 +41,6 @@
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: debug_toolbar/media/jquery.js
-Copyright: © 2008 John Resig
-License: GPL-2 | MIT
-
 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
@@ -63,30 +72,3 @@
  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.
-
-Files: debian/*
-Copyright: © 2008 Chris Lamb <lamby at debian.org>
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 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.
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.