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

Sat Feb 5 10:36:27 UTC 2011

Date: Saturday, February 5, 2011 @ 10:36:25
  Author: stefanor
Revision: 6574

Update debian/copyright format. youtube-dl is now public domain.

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

Modified: packages/ibid/trunk/debian/changelog
===================================================================

--- packages/ibid/trunk/debian/changelog	2011-02-05 09:43:20 UTC (rev 6573)
+++ packages/ibid/trunk/debian/changelog	2011-02-05 10:36:25 UTC (rev 6574)
@@ -1,8 +1,9 @@
 ibid (0.1.0+dfsg-4) UNRELEASED; urgency=low
 
   * Update my e-mail address.
+  * Update debian/copyright format. youtube-dl is now public domain.
 
- -- Stefano Rivera <stefanor at debian.org>  Sat, 05 Feb 2011 11:39:36 +0200
+ -- Stefano Rivera <stefanor at debian.org>  Sat, 05 Feb 2011 12:35:27 +0200
 
 ibid (0.1.0+dfsg-3) experimental; urgency=low
 

Modified: packages/ibid/trunk/debian/copyright
===================================================================
--- packages/ibid/trunk/debian/copyright	2011-02-05 09:43:20 UTC (rev 6573)
+++ packages/ibid/trunk/debian/copyright	2011-02-05 10:36:25 UTC (rev 6574)
@@ -1,16 +1,9 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: Ibid
-Maintainer: The Ibid Developers <ibid-core at lists.launchpad.net>
-Source: http://ibid.omnia.za.net/
-
-Files: *
-Copyright: 2008-2010, Jonathan Hitchcock, Michael Gorven, Stefano Rivera
- and other contributors.
-License: GPL3+ or MIT
- The complete Ibid package is released under the terms of the GPL license, as
- can be found in /usr/share/common-licenses/GPL-3. The core of Ibid is
- additionally available under the terms of the MIT/X/Expat license, as below.
-X-Repackage-Comment:
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166
+Upstream-Name: Ibid
+Upstream-Contact: The Ibid Developers <ibid-core at lists.launchpad.net>
+Source: https://launchpad.net/ibid/+download
+License: GPL3+
+Comment:
  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:
@@ -19,9 +12,14 @@
   wrestling.json: Wrestling move list
   zippy.json:     Zippy the Pinhead quotes
 
+Files: *
+Copyright: 2008-2010, Jonathan Hitchcock, Michael Gorven, Stefano Rivera
+ and other contributors.
+License: Expat
+
 Files: debian/*
 Copyright: 2008-2011, Michael Gorven, Stefano Rivera
-License: MIT
+License: Expat
 
 Files: ibid/factpacks/divine.json:
 Copyright:
@@ -36,20 +34,21 @@
 
 Files: ibid/factpacks/rubaiyat.json, ibid/factpacks/tao.json
 Copyright: 2003-2010, Jonathan Hitchcock
-License: MIT
+Comment:
  Derived from knab. Derived from works in the Public Domain (expired
  copyright).
+License: Expat
 
 Files: ibid/factpacks/zen.json
 Copyright: 2008-2010, Michael Gorven
-License: MIT
- Generated from a document placed in the public domain.
+Comment: Generated from a document placed in the public domain.
+License: Expat
 
 Files: ibid/lib/nickometer.py
 Copyright:
  2004, William Robinson.
  Derived from work Copyright 1998, Adam Spiers.
-License: BSD
+License:
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -73,19 +72,19 @@
  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.
- .
- The original, Adam Spiers, Perl source was under the following license:
- You may do whatever you want with this code, but give me credit.
 
 Files: ibid/plugins/urlinfo.py
 Copyright:
  2009-2010, Michael Gorven, Stefano Rivera
  Derived from work Copyright 2006-2008, Ricardo Garcia Gonzalez
-License: MIT
- The youtube Processor uses code from youtube-dl, released under the MIT
- Licence.
+Comment:
+ The youtube Processor uses code from youtube-dl, released into the public
+ domain, as stated by the author:
+ It is released to the public domain, which means you can modify it,
+ redistribute it or use it however you like.
+License: Expat
 
-License: MIT
+License: Expat
  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
@@ -103,3 +102,17 @@
  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.
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in the /usr/share/common-licenses/GPL-3 file.


