[Python-modules-commits] r31989 - in packages/checkbox-support/trunk/debian (2 files)

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

    Date: Tuesday, March 10, 2015 @ 11:42:32
  Author: zyga-guest
Revision: 31989

debian/copyright: remove duplicate entry for mock.py 

Modified:
  packages/checkbox-support/trunk/debian/changelog
  packages/checkbox-support/trunk/debian/copyright

Modified: packages/checkbox-support/trunk/debian/changelog
===================================================================
--- packages/checkbox-support/trunk/debian/changelog	2015-03-10 11:38:18 UTC (rev 31988)
+++ packages/checkbox-support/trunk/debian/changelog	2015-03-10 11:42:32 UTC (rev 31989)
@@ -3,6 +3,7 @@
   * debian/watch: use the new pypi redirector
   * debian/copyright: correct license of xrandr.py (it's actually "or later"
     so it is compatible with the rest of the GPL3 code).
+  * debian/copyright: remove duplicate entry for mock.py 
 
  -- Zygmunt Krynicki <zygmunt.krynicki at canonical.com>  Tue, 10 Mar 2015 12:03:13 +0100
 

Modified: packages/checkbox-support/trunk/debian/copyright
===================================================================
--- packages/checkbox-support/trunk/debian/copyright	2015-03-10 11:38:18 UTC (rev 31988)
+++ packages/checkbox-support/trunk/debian/copyright	2015-03-10 11:42:32 UTC (rev 31989)
@@ -75,35 +75,3 @@
  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.
-
-Files: checkbox_support/vendor/mock.py
-Copyright: Copyright (C) 2007-2012 Michael Foord & the mock team
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- .
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
- .
-    * 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.
- .
-    * Neither the name of Michael Foord nor the name of Voidspace
-      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 THE COPYRIGHT
- OWNER 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.