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

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

    Date: Friday, February 5, 2010 @ 12:48:12
  Author: stefanor-guest
Revision: 4677

Add factpacks to debian/copyright, re-include divine

Modified:
  packages/ibid/trunk/debian/copyright
  packages/ibid/trunk/debian/rules

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2010-02-05 10:08:49 UTC (rev 4676)
+++ packages/ibid/trunk/debian/copyright	2010-02-05 12:48:12 UTC (rev 4677)
@@ -14,7 +14,6 @@
  Some of the factpacks included in the upstream tarball contain quotes that
  aren't licensed for redistribution. The following factpacks have been removed
  from the Debian version of this package:
-  divine.json:    8 ball messages
   handey.json:    Jack Handey quotes
   overlord.json:  Overlord list
   wrestling.json: Wrestling move list
@@ -24,6 +23,25 @@
 Copyright: 2008-2010, Michael Gorven, Stefano Rivera
 License: MIT
 
+Files: ibid/factpacks/divine.json:
+Copyright:
+ 1996-2000, Sarah Burcham, Kevin Lenzo
+ 2003-2010, Jonathan Hitchcock
+ 2008-2010, Stefano Rivera
+License: Perl
+ The Infobot is covered under the same terms as Perl itself (the Artistic
+ License). This software is meant to be freely available under those terms in
+ perpetuity.
+
+Files: ibid/factpacks/rubaiyat.json, ibid/factpacks/tao.json
+Copyright: Public Domain
+ Collected from works with expired copyright.
+
+Files: ibid/factpacks/zen.json
+Copyright: Public Domain
+ Generated from a document placed in the public domain.
+ http://www.python.org/dev/peps/pep-0020/
+
 Files: ibid/lib/nickometer.py
 Copyright:
  2004, William Robinson.

Modified: packages/ibid/trunk/debian/rules
===================================================================
--- packages/ibid/trunk/debian/rules	2010-02-05 10:08:49 UTC (rev 4676)
+++ packages/ibid/trunk/debian/rules	2010-02-05 12:48:12 UTC (rev 4677)
@@ -42,6 +42,6 @@
 		mv ibid-$(VER).tar.gz ibid_$(VER).orig.tar.gz; \
 	fi
 	tar -xf ibid_$(VER).orig.tar.gz
-	cd ibid-$(VER)/factpacks/ && rm -f divine.json handey.json overlord.json wrestling.json zippy.json
+	cd ibid-$(VER)/factpacks/ && rm -f handey.json overlord.json wrestling.json zippy.json
 	GZIP=--best tar -czf ibid_$(VER)+dfsg.orig.tar.gz ibid-$(VER)
 	rm -rf ibid-$(VER) ibid_$(VER).orig.tar.gz