Bug#692873: unblock: epydoc/3.0.1-13
Control: tags 692733 + fixed pending
On Fri, Nov 09, 2012 at 11:37:46PM -0400, David Prévot wrote:
> Le 09/11/2012 22:31, Kenneth Pronovici a écrit :
>
> > Please unblock package epydoc. The only change is to remove one
> > outdated file is under the non-free CC-BY-NC-SA license. This closes
> > release-critical bug #692733
>
> You need to strip out the non-free file from the source tarball, and
> prepare a repacked one (e.g. 3.0.1+dfsg). Your patch only removes the
> non-free file when applying the patch, but it's still present in the
> source package.
Ok, I have repackaged the upstream tarball and uploaded 3.0.1+dfsg-1.
Below is a debdiff between 3.0.1-12 and 3.0.1+dfsg-1.
Thanks,
KEN
----------
debdiff epydoc_3.0.1-12/epydoc_3.0.1-12.dsc epydoc_3.0.1+dfsg-1/epydoc_3.0.1+dfsg-1.dsc
diff -Nru epydoc-3.0.1/debian/changelog epydoc-3.0.1+dfsg/debian/changelog
--- epydoc-3.0.1/debian/changelog 2012-03-12 13:18:04.000000000 -0500
+++ epydoc-3.0.1+dfsg/debian/changelog 2012-11-10 10:18:09.000000000 -0600
@@ -1,3 +1,21 @@
+epydoc (3.0.1+dfsg-1) unstable; urgency=low
+
+ * Package a new DFSG-free upstream tarball (closes: #692733).
+ - The new tarball removes non-free doc/pycon-epydoc.html
+ - Remove debian/patches/remove-cc-by-nc-sa.patch; no longer needed
+ - Add opts=dversionmangle in debian/watch per Lintian recommendation
+
+ -- Kenneth J. Pronovici <pronovic@debian.org> Sat, 10 Nov 2012 16:04:44 +0000
+
+epydoc (3.0.1-13) unstable; urgency=low
+
+ * Update copyright date for Debian package files in debian/copyright.
+ * Remove non-free doc/pycon-epydoc.html from the package (closes: #692733).
+ - Remove reference to doc/pycon-epydoc.html from debian/copyright
+ - Add new patch debian/patches/remove-cc-by-nc-sa.patch
+
+ -- Kenneth J. Pronovici <pronovic@debian.org> Thu, 08 Nov 2012 09:35:39 -0600
+
epydoc (3.0.1-12) unstable; urgency=low
* Update to machine-readable debian/copyright file format, version 1.0.
diff -Nru epydoc-3.0.1/debian/copyright epydoc-3.0.1+dfsg/debian/copyright
--- epydoc-3.0.1/debian/copyright 2012-03-12 16:31:43.000000000 -0500
+++ epydoc-3.0.1+dfsg/debian/copyright 2012-11-09 19:55:01.000000000 -0600
@@ -11,12 +11,6 @@
Copyright: 2007 Daniele Varrazzo
License: Expat
-Files: doc/pycon-epydoc.html
-Copyright: 2004 Edward Loper
-License: CC-BY-NC-SA
- This work (in all its forms) is licensed under the Creative Commons
- Attribution-NonCommercial-ShareAlike License.
-
Files: doc/custom.css doc/docutils.css
Copyright: Public Domain
License: public-domain
@@ -24,7 +18,7 @@
Files: debian/*
Copyright: 2002 Moshe Zadka <moshez@debian.org>
- 2003-2010 Kenneth J. Pronovici <pronovic@debian.org>
+ 2003-2012 Kenneth J. Pronovici <pronovic@debian.org>
License:
Copying and distribution of these files, with or without modification, is
permitted in any medium without royalty provided the copyright notice and
diff -Nru epydoc-3.0.1/debian/watch epydoc-3.0.1+dfsg/debian/watch
--- epydoc-3.0.1/debian/watch 2011-03-02 08:58:31.000000000 -0600
+++ epydoc-3.0.1+dfsg/debian/watch 2012-11-10 10:17:28.000000000 -0600
@@ -1,3 +1,4 @@
# This watch file uses the qa.debian.org redirector so that SourceForge URLs work
version=3
+opts=dversionmangle=s/\+dfsg// \
http://sf.net/epydoc/epydoc-(.*)\.tar\.gz
diff -Nru epydoc-3.0.1/doc/pycon-epydoc.html epydoc-3.0.1+dfsg/doc/pycon-epydoc.html
--- epydoc-3.0.1/doc/pycon-epydoc.html 2008-01-30 08:13:59.000000000 -0600
+++ epydoc-3.0.1+dfsg/doc/pycon-epydoc.html 1969-12-31 18:00:00.000000000 -0600
@@ -1,103 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <title>Epydoc: PyCon 2004</title>
- <link rel="stylesheet" href="epydoc.css" type="text/css"/>
- </head>
-<body>
-<div class="body">
-<h1> Epydoc: PyCon 2004 </h1>
-
-<h2>Abstract</h2>
-
-<p> Epydoc is a tool for generating API documentation for Python
-modules, based on their docstrings. It supports several output
-formats (including HTML and PDF), and understands four different
-markup languages (Epytext, Javadoc, reStructuredText, and plaintext).
-A wide variety of <i>fields</i> can be used to supply specific
-information about individual objects, such as descriptions of function
-parameters, type signatures, and groupings of related objects. </p>
-
-<h2> Presentation and Paper </h2>
-
-<table class="tech" border="1" cellpadding="3" cellspacing="0">
- <tr>
- <th class="tech" width="25%">Video (Quicktime)</th>
- <th class="tech" width="25%">Audio (MP3)</th>
- <th class="tech" width="25%">Slides</th>
- <th class="tech" width="25%">Paper</th>
- </tr>
- <tr>
- <td class="tech">
- <a href="http://www.pycon.org/dc2004/talks/files/epydoc/pycon-epydoc-large.mov";
- >Large (Fast DSL)</a></td>
- <td class="tech">
- <a href="http://www.pycon.org/dc2004/talks/files/epydoc/pycon-epydoc-64kbps.mp3";
- >High Quality (64 kbps)</a></td>
- <td class="tech">
- <a href="epydoc-slides.pdf"
- >Acrobat (PDF)</a></td>
- <td class="tech">
- <a href="pycon-epydoc.pdf"
- >Acrobat (PDF)</a></td>
- </tr>
- <tr>
- <td class="tech">
- <a href="http://www.pycon.org/dc2004/talks/files/epydoc/pycon-epydoc.mov";
- >Medium (Slow DSL)</a></td>
- <td class="tech">
- <a href="http://www.pycon.org/dc2004/talks/files/epydoc/pycon-epydoc.mp3";
- >Low Quality (16 kbps)</a></td>
- <td class="tech">
- <a href="epydoc-slides.ppt"
- >Powerpoint (PPT)</a></td>
- <td class="tech">
- <a href="pycon-epydoc.ps"
- >PostScript (PS)</a></td>
- </tr>
- <tr>
- <td class="tech">
- <a href="http://www.pycon.org/dc2004/talks/files/epydoc/pycon-epydoc-small.mov";
- >Small (Modem)</a></td>
- <td class="tech"> </td>
- <td class="tech"> </td>
- <td class="tech"> </td>
- </tr>
-</table>
-<!--<br />-->
-
-<p> Copyright © 2004 Edward Loper. This work (in all its forms) is
-licensed under the Creative Commons <a
-href="http://creativecommons.org/licenses/by-nc-sa/1.0/";>Attribution-NonCommercial-ShareAlike</a>
-License. </p>
-
-</div>
-<table width="100%" class="navbox" cellpadding="1" cellspacing="0">
- <tr>
- <a class="nav" href="index.html">
- <td align="center" width="20%" class="nav">
- <a class="nav" href="index.html">
- Home</a></td></a>
- <a class="nav" href="installing.html">
- <td align="center" width="20%" class="nav">
- <a class="nav" href="installing.html">
- Installing Epydoc</a></td></a>
- <a class="nav" href="using.html">
- <td align="center" width="20%" class="nav">
- <a class="nav" href="using.html">
- Using Epydoc</a></td></a>
- <a class="nav" href="epytext.html">
- <td align="center" width="20%" class="nav">
- <a class="nav" href="epytext.html">
- Epytext</a></td></a>
- <td align="center" width="20%" class="nav">
-
- <A href="http://sourceforge.net/projects/epydoc";>
- <IMG src="sflogo.png"
- width="88" height="26" border="0" alt="SourceForge"
- align="top"/></A></td>
- </tr>
-</table>
-</body>
-</html>
-
Reply to: