[Python-modules-commits] r13991 - in packages/pyquery/trunk/debian (3 files)

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

    Date: Sunday, July 18, 2010 @ 16:07:43
  Author: jmw-guest
Revision: 13991

Update copyright; declare source format

Modified:
  packages/pyquery/trunk/debian/changelog
  packages/pyquery/trunk/debian/copyright
  packages/pyquery/trunk/debian/source/format

Modified: packages/pyquery/trunk/debian/changelog
===================================================================
--- packages/pyquery/trunk/debian/changelog	2010-07-18 15:51:23 UTC (rev 13990)
+++ packages/pyquery/trunk/debian/changelog	2010-07-18 16:07:43 UTC (rev 13991)
@@ -5,8 +5,9 @@
   * Add Provides for python-pyquery
   * Standards version 3.9.0, no changes
   * debian/source/format: Declare format 3.0 (quilt)
+  * debian/copyright: Update license information
 
- -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Sun, 18 Jul 2010 16:50:45 +0100
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Sun, 18 Jul 2010 16:58:52 +0100
 
 pyquery (0.5-1) unstable; urgency=low
 

Modified: packages/pyquery/trunk/debian/copyright
===================================================================
--- packages/pyquery/trunk/debian/copyright	2010-07-18 15:51:23 UTC (rev 13990)
+++ packages/pyquery/trunk/debian/copyright	2010-07-18 16:07:43 UTC (rev 13991)
@@ -11,20 +11,33 @@
 License:
 
     Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+    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 Infrae 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 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 INFRAE 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.
 
-    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.
-
 On Debian systems, the complete text of the BSD License can be
 found in `/usr/share/common-licenses/BSD'.
 
@@ -32,4 +45,4 @@
 
     Copyright (C) 2009 Jonathan Wiltshire <debian at jwiltshire.org.uk>
 
-and is also made available under the BSD license.
+and is also made available under the BSD license as above.

Modified: packages/pyquery/trunk/debian/source/format
===================================================================
--- packages/pyquery/trunk/debian/source/format	2010-07-18 15:51:23 UTC (rev 13990)
+++ packages/pyquery/trunk/debian/source/format	2010-07-18 16:07:43 UTC (rev 13991)
@@ -1 +1 @@
-1.0
+3.0 (quilt)