|
From: Bernhard H. <bh...@in...> - 2006-02-12 01:21:59
|
Daniel Baumann <dan...@pa...> writes: > Bernhard Reiter wrote: >> I'll take it that you also will be the maintainer? > > Yep. Great! > There are some things to do, first this (unfixed) ugly warning when > bytecompiling skencil: > > ---snipp--- > /usr/lib/skencil/Plugins/Filters/Lib/drawfile.py:1295: FutureWarning: > hex/oct constants > sys.maxint will return positive values in Python 2.4 > and up > self.x2 = 0x80000000 > /usr/lib/skencil/Plugins/Filters/Lib/drawfile.py:1296: FutureWarning: > hex/oct constants > sys.maxint will return positive values in Python 2.4 > and up > self.y2 = 0x80000000 > ---snapp--- I've fixed that in SVN now. As it turned out, there were a few other places in the drawfile code that broke in Python 2.4. I've hopefully fixed those as well. > Third, there are some manpages (see the attachments) in the Debian > package, but not in upstream. I didn't check so far if they are > uptodate, however would be nice if you can merge them too. They should be added to SVN, I think. I'll try to get around to that next week. What's their license, btw? > ...and last: skencil does breake FHS, architecture dependent (binaries) > should be placed in /usr/lib/skencil, independent files (scripts) should > be in /usr/share/skencil. I'm not exactly sure what you mean by scripts in this regard. Should all *.py and *.pyc files be under /usr/share/ and the *.so files under /usr/lib/? That doesn't seem like a good idea. > Btw, you may want to renamed the remaining > leftovers from sketch to skencil, i.e. /usr/lib/skencil/Sketch. That's on my plan for 0.7 at some point. I don't want to do it for 0.6, though. It would break plugins, for instance. About the patches: [01-shellbang.dpatch] Practically all scripts are patched to change the interpreter: > @@ -1,4 +1,4 @@ > -#! /usr/bin/env python > +#!/usr/bin/python Well, putting that into the original sources won't really make things better as /usr/bin/python is not necessarily the right python version. I've changed setup.py in SVN now to always replace the #! line with the path to the python interpreter used to run setup.py which is most likely the right python version. With that the patch should not be necessary anymore. [02-userguide.dpatch] > --- skencil-0.6.17.orig/Doc/usersguide-4.html 2004-01-11 23:06:49.000000000 +0000 > +++ skencil-0.6.17/Doc/usersguide-4.html 2006-01-22 10:32:47.032610984 +0000 > @@ -73,7 +73,7 @@ > <P>By default (as of version 0.6.2) the font-path consists of the > directories <CODE>Resources/Fontmetrics</CODE> (relative to where Skencil is > installed), <CODE>/usr/X11R6/lib/X11/fonts/Type1</CODE> and > -<CODE>/usr/share/ghostscript/fonts</CODE>.</P> > +<CODE>/usr/share/ghostscript/fonts</CODE> [<CODE>/usr/lib/ghostscript/fonts</CODE> on Debian systems].</P> Is that change still correct for current debian versions? [03-python-reportlab.dpatch] > -import reportlab.pdfgen.canvas > > +from Sketch.warn import USER, warn_tb > + > +try: > + import reportlab.pdfgen.canvas > +except ImportError: > + warn_tb(USER, "ReportLab has to be installed to use the PDF export filter.\n" > + "On Debian systems, install the 'python-reportlab' package.") > + raise The message is quite debian specific, so it doesn't make much sense to put it into the Skencil sources as is. [04-python-xml.dpatch] > - warn_tb(USER, "The Python xml package has to be installed for the svg " > - "import filter.\n" > - "See the README for more information.") > + warn_tb(USER, "Python xml has to be installed to use the SVG import filter.\n" > + "On Debian systems, install the 'python-xml' package.") Same as for 03-python-reportlab.dpatch. Too debian specific to apply. [05-translation-de.dpatch] Applied. Thanks. ]06-directories.dpatch] > diff -Naur skencil-0.6.17.orig/setup.py skencil-0.6.17/setup.py > --- skencil-0.6.17.orig/setup.py 2005-03-12 22:16:31.000000000 +0000 > +++ skencil-0.6.17/setup.py 2006-01-22 11:46:21.448517760 +0000 > @@ -421,7 +421,7 @@ > self.executable = os.path.join(self.exec_prefix, 'bin') > if not self.library: > self.library = os.path.join(self.prefix, 'lib', > - progname + '-' + version) > + progname) > I've added a new command line option to setup.py in the 0.6 branch, --libdir, which you can use to provide a different name when running setup.py install. This patch shouldn't be necessary anymore then. [man pages] Bernhard -- Intevation GmbH http://intevation.de/ Skencil http://skencil.org/ Thuban http://thuban.intevation.org/ |