[Python-modules-commits] r16304 - in packages/python-geohash/trunk/debian (changelog copyright)

Fri Apr 1 13:55:36 UTC 2011

Date: Friday, April 1, 2011 @ 13:55:33
  Author: davide125-guest
Revision: 16304

convert debian/copyright to DEP-5

Modified:
  packages/python-geohash/trunk/debian/changelog
  packages/python-geohash/trunk/debian/copyright

Modified: packages/python-geohash/trunk/debian/changelog
===================================================================

--- packages/python-geohash/trunk/debian/changelog	2011-04-01 13:54:32 UTC (rev 16303)
+++ packages/python-geohash/trunk/debian/changelog	2011-04-01 13:55:33 UTC (rev 16304)
@@ -3,8 +3,9 @@
   * New upstream release:
     - drop uncomment-tests-main.patch, applied upstream
     - run more tests at build time
+  * Convert debian/copyright to DEP-5 format.
 
- -- Davide Cavalca <davide at geexbox.org>  Fri, 01 Apr 2011 15:50:05 +0200
+ -- Davide Cavalca <davide at geexbox.org>  Fri, 01 Apr 2011 15:54:47 +0200
 
 python-geohash (0.7-1) unstable; urgency=low
 

Modified: packages/python-geohash/trunk/debian/copyright
===================================================================
--- packages/python-geohash/trunk/debian/copyright	2011-04-01 13:54:32 UTC (rev 16303)
+++ packages/python-geohash/trunk/debian/copyright	2011-04-01 13:55:33 UTC (rev 16304)
@@ -1,28 +1,61 @@
-This work was packaged for Debian by:
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: python-geohash
+Upstream-Contact: Hiroaki Kawai <kawai at iij.ad.jp>
+Source: http://code.google.com/p/python-geohash/
+Copyright: 2009-2011 Hiroaki Kawai <kawai at iij.ad.jp>
+License: Apache-2.0 or MIT or NEWBSD
 
-    Davide Cavalca <davide at geexbox.org> on Fri, 12 Nov 2010 14:33:08 +0100
+Files: debian/*
+Copyright: 2010-2011 Davide Cavalca <davide at geexbox.org>
+License: Apache-2.0 or MIT or NEWBSD
 
-It was downloaded from <http://code.google.com/p/python-geohash/>
+License: Apache-2.0
+  On Debian systems, the complete text of the Apache license can be found in
+  /usr/share/common-licenses/Apache-2.0.
 
-Upstream Author(s):
+License: MIT
+  *** MIT License
+  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 use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR 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.
 
-    Hiroaki Kawai <kawai at iij.ad.jp>
+License: NEWBSD
+  *** New BSD License
+  Copyright (c) 2011, Hiroaki Kawai
+  All rights reserved.
+  .
+  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 the <organization> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
 
-Copyright:
-
-    Copyright (C) 2009 Hiroaki Kawai <kawai at iij.ad.jp>
-
-License:
-
-    Code is licensed under Apache License 2.0, MIT Licence and NEW BSD 
-    License.
-    You can choose one of the licences above.
-
-    In Debian, full text of the Apache license is available at
-    /usr/share/common-licenses/Apache-2.0.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Davide Cavalca <davide at geexbox.org>
-
-and is licensed under the same conditions as the upstream work.
+  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 <COPYRIGHT HOLDER> 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.


