[Python-apps-commits] r4615 - in packages/ibid/trunk/debian (copyright)

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

    Date: Friday, January 29, 2010 @ 17:09:10
  Author: stefanor-guest
Revision: 4615

Merge my dubious double-license DEP5 stanzas

Modified:
  packages/ibid/trunk/debian/copyright

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2010-01-29 16:49:51 UTC (rev 4614)
+++ packages/ibid/trunk/debian/copyright	2010-01-29 17:09:10 UTC (rev 4615)
@@ -60,7 +60,9 @@
  Released under the MIT licence.
 
 Files: ibid/lib/nickometer.py
-Copyright: 2004, William Robinson.
+Copyright:
+ 2004, William Robinson.
+ Derived from work Copyright 1998, Adam Spiers.
 License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -85,8 +87,8 @@
  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.
-Copyright: Derived from work Copyright 1998, Adam Spiers
-License: Other
+ .
+ The original, Adam Spiers, Perl source was under the following license:
  You may do whatever you want with this code, but give me credit.
 
 License: MIT