Hi *,

while looking at rc bugs, I stumbled over this one and thought I can fix 
it. You can find a proposed NMU debdiff attached. It adds the needed 
bits to debian/copyright, stops installing antlr.py and adds a 
dependency on antlr.
However, I feel very uncomfortable with uploading it:
 1. the antrl dep pulls about 35MB new packages (mostly java stuff) and 
    needs about 80MB diskspace :/
 2. I have no real way to test the change. pyexcelerator still loads 
    fine and one can import the ExcelFormula(Parser) classes which needs 
    antlr, but the example code in 
    /u/s/d/python-excelerator/examples/parse-fmla.py outputs garbish 
    when one uncomments the print statements (it does the same with the 
    bundled antlr.py too).

Dear Debian Python people, do you have an oppinion on that?
Shipping an own antlr.py is imho an security issue, so we should try to 
avoid that in any case (or get another RC as soon this issue is 
"solved").

Kinds regards
Evgeni Golov
diff -u pyexcelerator-0.6.3a/debian/control pyexcelerator-0.6.3a/debian/control
--- pyexcelerator-0.6.3a/debian/control
+++ pyexcelerator-0.6.3a/debian/control
@@ -10,7 +10,7 @@
 
 Package: python-excelerator
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, antlr
 XB-Python-Version: ${python:Versions}
 Description: module for reading/writing Excel spreadsheet files
  pyExcelerator is a Python module that can generate Excel 97/2000/XP/2003
diff -u pyexcelerator-0.6.3a/debian/rules pyexcelerator-0.6.3a/debian/rules
--- pyexcelerator-0.6.3a/debian/rules
+++ pyexcelerator-0.6.3a/debian/rules
@@ -9,6 +9,8 @@
 DEB_INSTALL_CHANGELOGS_ALL = CHANGES.txt
 
 install/python-excelerator::
+       rm -f 
./debian/python-excelerator/usr/lib/python*/site-packages/pyExcelerator/antlr.py
+
        find ./debian/python-excelerator/usr/ \
                -name "*.py" | grep 'site-packages/pyExcelerator' | \
                xargs sed -i -e '1 s/^#\!.*python.*//'
diff -u pyexcelerator-0.6.3a/debian/changelog 
pyexcelerator-0.6.3a/debian/changelog
--- pyexcelerator-0.6.3a/debian/changelog
+++ pyexcelerator-0.6.3a/debian/changelog
@@ -1,3 +1,12 @@
+pyexcelerator (0.6.3a-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add license information of pyExcelerator/antlr.py to debian/copyright.
+  * Use antlr.py from the antlr package, instead of an own one.
+  * The above two: Closes: #510782.
+
+ -- Evgeni Golov <sarge...@die-welt.net>  Mon, 05 Jan 2009 09:47:00 +0100
+
 pyexcelerator (0.6.3a-3.1) unstable; urgency=low
 
   * NMU. Rebuild to move files to /usr/share/pyshared. Closes: #490487.
diff -u pyexcelerator-0.6.3a/debian/copyright 
pyexcelerator-0.6.3a/debian/copyright
--- pyexcelerator-0.6.3a/debian/copyright
+++ pyexcelerator-0.6.3a/debian/copyright
@@ -7,7 +7,7 @@
 
 Copyright: 2005 Roman V. Kiseliov
 
-License:
+License (for everything but pyExcelerator/antlr.py):
 
   Copyright (C) 2005 Roman V. Kiseliov
   All rights reserved.
@@ -48,4 +48,26 @@
   OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+License (for pyExcelerator/antlr.py):
+  Copyright 1989-2006 Terence Parr <pa...@jguru.com>,
+            2004      Wolfgang Haefelinger
+
+  We reserve no legal rights to the ANTLR--it is fully in the public
+  domain. An individual or company may do whatever they wish with source
+  code distributed with ANTLR or the code generated by ANTLR, including
+  the incorporation of ANTLR, or its output, into commercial software.
+
+  We encourage users to develop software with ANTLR. However, we do ask
+  that credit is given to us for developing ANTLR. By "credit", we mean
+  that if you use ANTLR or incorporate any source code into one of your
+  programs (commercial product, research project, or otherwise) that you
+  acknowledge this fact somewhere in the documentation, research report,
+  etc... If you like ANTLR and have developed a nice tool with the output,
+  please mention that you developed it using ANTLR. In addition, we ask
+  that the headers remain intact in our source code. As long as these
+  guidelines are kept, we expect to continue enhancing this system and
+  expect to make other tools available as they are completed.
+
+
 The Debian packaging is (C) 2006, Kevin Coyner <kcoy...@debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Attachment: signature.asc
Description: Digital signature

Reply via email to