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

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

    Date: Sunday, April 3, 2011 @ 08:46:38
  Author: davide125-guest
Revision: 16317

debian/copyright: use the correct license names

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

Modified: packages/python-geohash/trunk/debian/copyright
===================================================================
--- packages/python-geohash/trunk/debian/copyright	2011-04-02 16:20:04 UTC (rev 16316)
+++ packages/python-geohash/trunk/debian/copyright	2011-04-03 08:46:38 UTC (rev 16317)
@@ -3,11 +3,11 @@
 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
+License: Apache-2.0 or Expat or BSD-3-clause
 
 Files: debian/*
 Copyright: 2010-2011 Davide Cavalca <davide at geexbox.org>
-License: Apache-2.0 or MIT or NEWBSD
+License: Apache-2.0 or Expat or BSD-3-clause
 
 License: Apache-2.0
  *** Apache License 2.0
@@ -28,7 +28,7 @@
  On Debian systems, the complete text of the Apache license can be found in
  /usr/share/common-licenses/Apache-2.0.
 
-License: MIT
+License: Expat
  *** 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
@@ -48,7 +48,7 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-License: NEWBSD
+License: BSD-3-clause
  *** New BSD License
  Copyright (c) 2011, Hiroaki Kawai
  All rights reserved.