[Python-apps-commits] r11302 - in packages/roundup/trunk/debian (copyright rules)

Fri Sep 19 19:59:33 UTC 2014

Date: Friday, September 19, 2014 @ 19:59:32
  Author: kaisan-guest
Revision: 11302

More licensing corrections to the 1.5.0 packaging of roundup.

* Remove 2 OPL-1.0 licensed files that are incomatible with Debian
* no need to include the OPL-1.0 license in the copyright file
* included a blurp about the GPL-2 license

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

Modified: packages/roundup/trunk/debian/copyright
===================================================================

--- packages/roundup/trunk/debian/copyright	2014-09-19 07:52:19 UTC (rev 11301)
+++ packages/roundup/trunk/debian/copyright	2014-09-19 19:59:32 UTC (rev 11302)
@@ -2,7 +2,14 @@
 Upstream-Name: roundup
 Source: https://pypi.python.org/pypi/roundup/#downloads
 Comment: For the debian project we have removed several files from the upstream
- release as they were minified without including an unminified version.
+ release as they were:
+ .
+ - minified code without including their original counterparts of
+   Bootstrap (css, javascript) and jQuery (javascript)
+ - files that were licensed under the incompatible OPL-1.0 license
+   (Files: doc/original_overview.html doc/spec.html by Ka-Ping Yee)
+ Please see debian/rules' get-orig-source target for the exact files that
+ were removed.
 
 Files: *
 Copyright: 2003-2009 Richard Jones (richard at mechanicalcat.net)
@@ -29,14 +36,14 @@
 Files: share/doc/roundup/html/_static/jquery.js
 Copyright: 2010, John Resig
            2010, The Dojo Foundation
-License: GPL-2.0
+License: GPL-2 or Expat
 Comment: This specific jquery.js includes sizzlejs; both projects share gpl2.
- sizzle.js is licensed under MIT or BSD or GPL;
- jquery.js itself is licensed under either MIT (Expat) or GPL2
+ sizzle.js is licensed under Expat or BSD or GPL-2;
+ jquery.js itself is licensed under either Expat or GPL-2
 
 Files: share/roundup/templates/devel/html/jquery.js share/roundup/templates/responsive/html/jquery.js
 Copyright: 2009 John Resig
-License: MIT or GPL-2.0
+License: Expat or GPL-2
 
 Files: scripts/spam-remover
 Copyright: 2012 Dr. Ralf Schlatterbeck Open Source Consulting
@@ -46,10 +53,6 @@
 Copyright: 2003 by Intevation GmbH
 License: GPL-2+ or Expat
 
-Files: doc/original_overview.html doc/spec.html
-Copyright: 2000 Ka-Ping Yee
-License: OPL-1.0
-
 Files: roundup/backends/tsearch2_setup.py
 Copyright: 1996-2003, The PostgreSQL Global Development Group
            1994, The Regents of the University of California
@@ -157,116 +160,21 @@
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: OPL-1.0
- Open Publication License
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 as published by
+ the Free Software Foundation.
  .
- v1.0, 8 June 1999
+ This package 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.
  .
- I. REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
  .
- The Open Publication works may be reproduced and distributed in whole or
- in part, in any medium physical or electronic, provided that the terms of
- this license are adhered to, and that this license or an incorporation
- of it by reference (with any options elected by the author(s) and/or
- publisher) is displayed in the reproduction.
- .
- Proper form for an incorporation by reference is as follows: Copyright
- (c) <year> by <author's name or designee>. This material may be
- distributed only subject to the terms and conditions set forth in the
- Open Publication License, vX.Y or later (the latest version is presently
- available at http://www.opencontent.org/openpub/). The reference must
- be immediately followed with any options elected by the author(s)
- and/or publisher of the document (see section VI).
- .
- Commercial redistribution of Open Publication-licensed material is permitted.
- .
- Any publication in standard (paper) book form shall require the citation
- of the original publisher and author. The publisher and author's names
- shall appear on all outer surfaces of the book. On all outer surfaces
- of the book the original publisher's name shall be as large as the
- title of the work and cited as possessive with respect to the title.
- .
- II. COPYRIGHT
- .
- The copyright to each Open Publication is owned by its author(s) or designee.
- .
- III. SCOPE OF LICENSE
- .
- The following license terms apply to all Open Publication works, unless
- otherwise explicitly stated in the document.
- .
- Mere aggregation of Open Publication works or a portion of an Open
- Publication work with other works or programs on the same media shall
- not cause this license to apply to those other works. The aggregate work
- shall contain a notice specifying the inclusion of the Open Publication
- material and appropriate copyright notice.
- .
- SEVERABILITY. If any part of this license is found to be unenforceable in
- any jurisdiction, the remaining portions of the license remain in force.
- .
- NO WARRANTY. Open Publication works are licensed and provided as is
- without warranty of any kind, express or implied, including, but not
- limited to, the implied warranties of merchantability and fitness for
- a particular purpose or a warranty of non-infringement.
- .
- IV. REQUIREMENTS ON MODIFIED WORKS
- .
- All modified versions of documents covered by this license, including
- translations, anthologies, compilations and partial documents, must
- meet the following requirements:
- .
- The modified version must be labeled as such.
- The person making the modifications must be identified and the
- modifications dated.
- Acknowledgement of the original author and publisher if applicable must
- be retained according to normal academic citation practices.
- The location of the original unmodified document must be identified.
- The original author's (or authors') name(s) may not be used to assert
- or imply endorsement of the resulting document without the original
- author's (or authors') permission.
- .
- V. GOOD-PRACTICE RECOMMENDATIONS
- .
- In addition to the requirements of this license, it is requested from
- and strongly recommended of redistributors that:
- .
- If you are distributing Open Publication works on hardcopy or CD-ROM, you
- provide email notification to the authors of your intent to redistribute
- at least thirty days before your manuscript or media freeze, to give
- the authors time to provide updated documents. This notification should
- describe modifications, if any, made to the document.
- All substantive modifications (including deletions) be either clearly
- marked up in the document or else described in an attachment to the
- document.
- Finally, while it is not mandatory under this license, it is considered
- good form to offer a free copy of any hardcopy and CD-ROM expression
- of an Open Publication-licensed work to its author(s).
- .
- VI. LICENSE OPTIONS
- .
- The author(s) and/or publisher of an Open Publication-licensed document
- may elect certain options by appending language to the reference to or
- copy of the license. These options are considered part of the license
- instance and must be included with the license (or its incorporation
- by reference) in derived works.
- .
- A. To prohibit distribution of substantively modified versions without
- the explicit permission of the author(s). Substantive modification
- is defined as a change to the semantic content of the document, and
- excludes mere changes in format or typographical corrections.
- .
- To accomplish this, add the phrase Distribution of substantively modified
- versions of this document is prohibited without the explicit permission
- of the copyright holder. to the license reference or copy.
- .
- B. To prohibit any publication of this work or derivative works in whole
- or in part in standard (paper) book form for commercial purposes is
- prohibited unless prior permission is obtained from the copyright holder.
- .
- To accomplish this, add the phrase Distribution of the work or derivative
- of the work in any standard (paper) book form is prohibited unless
- prior permission is obtained from the copyright holder. to the license
- reference or copy.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 License: BSD
  Permission to use, copy, modify, and distribute this software and its

Modified: packages/roundup/trunk/debian/rules
===================================================================
--- packages/roundup/trunk/debian/rules	2014-09-19 07:52:19 UTC (rev 11301)
+++ packages/roundup/trunk/debian/rules	2014-09-19 19:59:32 UTC (rev 11302)
@@ -33,6 +33,9 @@
 	rm roundup-$(DEB_UPSTREAM_VERSION)/share/roundup/templates/jinja2/static/bootstrap-responsive.min.css
 	rm roundup-$(DEB_UPSTREAM_VERSION)/share/roundup/templates/responsive/static/bootstrap.min.css
 	rm roundup-$(DEB_UPSTREAM_VERSION)/share/roundup/templates/responsive/static/bootstrap-responsive.min.css
+	rm roundup-$(DEB_UPSTREAM_VERSION)/doc/original_overview.html
+	rm roundup-$(DEB_UPSTREAM_VERSION)/doc/spec.html
+	(cd roundup-$(DEB_UPSTREAM_VERSION) && python setup.py sdist --manifest-only)
 	GZIP=--best tar -cz --owner root --group root --mode a+rX \
 		-f roundup_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.gz \
 		roundup-$(DEB_UPSTREAM_VERSION)


