[Python-modules-commits] r9677 - in packages/gamera/trunk (28 files)
jwilk-guest at users.alioth.debian.org
jwilk-guest at users.alioth.debian.org
Fri Sep 4 19:01:41 UTC 2009
Date: Friday, September 4, 2009 @ 19:01:24
Author: jwilk-guest
Revision: 9677
[svn-inject] Applying Debian modifications to trunk
Added:
packages/gamera/trunk/debian/
packages/gamera/trunk/debian/README.source
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/clean
packages/gamera/trunk/debian/compat
packages/gamera/trunk/debian/control
packages/gamera/trunk/debian/copyright
packages/gamera/trunk/debian/docs
packages/gamera/trunk/debian/gamera-doc.doc-base
packages/gamera/trunk/debian/gamera-doc.docs
packages/gamera/trunk/debian/gamera-doc.links
packages/gamera/trunk/debian/gamera-gui.install
packages/gamera/trunk/debian/gamera-gui.manpages
packages/gamera/trunk/debian/manpage-helper-1
packages/gamera/trunk/debian/manpage-helper-2
packages/gamera/trunk/debian/patches/
packages/gamera/trunk/debian/patches/fix-paths.diff
packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff
packages/gamera/trunk/debian/patches/series
packages/gamera/trunk/debian/patches/use-system-galib.diff
packages/gamera/trunk/debian/patches/use-system-python-modules.diff
packages/gamera/trunk/debian/patches/use-system-vigra.diff
packages/gamera/trunk/debian/python-gamera-dbg.install
packages/gamera/trunk/debian/python-gamera-dev.install
packages/gamera/trunk/debian/python-gamera-doc.examples
packages/gamera/trunk/debian/python-gamera.install
packages/gamera/trunk/debian/rules
packages/gamera/trunk/debian/watch
Property changes on: packages/gamera/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/gamera/trunk/debian/README.source
===================================================================
--- packages/gamera/trunk/debian/README.source (rev 0)
+++ packages/gamera/trunk/debian/README.source 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,9 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build. Please see:
+
+ /usr/share/doc/quilt/README.source
+
+for more information on how to apply the patches, modify patches, or
+remove a patch.
+
Added: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog (rev 0)
+++ packages/gamera/trunk/debian/changelog 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,12 @@
+gamera (3.2.0+svn1154-1) UNRELEASED; urgency=low
+
+ * Initial release (closes: #269527).
+ * Don't use an embedded copy of the GAlib library (use-system-galib.diff).
+ * Don't use an embedded copy of the VIGRA library (use-system-vigra.diff).
+ * Don't use embedded copies of standard Python modules
+ (use-system-python-modules.diff).
+ * Make plugin/toolkit/test paths compatible with python-support. Fix the
+ documentation generator to look for test files in the build directory.
+ (fix-paths.diff).
+
+ -- Jakub Wilk <ubanus at users.sf.net> Wed, 02 Sep 2009 11:59:03 +0200
Added: packages/gamera/trunk/debian/clean
===================================================================
--- packages/gamera/trunk/debian/clean (rev 0)
+++ packages/gamera/trunk/debian/clean 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,35 @@
+doc/html/*.css
+doc/html/*.html
+doc/src/analysis.txt
+doc/src/binarization.txt
+doc/src/classes.txt
+doc/src/classification.txt
+doc/src/color.txt
+doc/src/combine.txt
+doc/src/conversion.txt
+doc/src/convolution.txt
+doc/src/corelation.txt
+doc/src/deformations.txt
+doc/src/displaying.txt
+doc/src/draw.txt
+doc/src/edge.txt
+doc/src/externallibraries.txt
+doc/src/features.txt
+doc/src/file.txt
+doc/src/filter.txt
+doc/src/gamera.core.*.txt
+doc/src/list.txt
+doc/src/morphology.txt
+doc/src/pagesegmentation.txt
+doc/src/plugins.txt
+doc/src/relational.txt
+doc/src/runlength.txt
+doc/src/segmentation.txt
+doc/src/shearing.txt
+doc/src/thresholding.txt
+doc/src/utility.txt
+doc/src/xml.txt
+doc/stamp
+gamera/__version__.py
+gamera/plugins/_*.cpp
+gamera_gui
Added: packages/gamera/trunk/debian/compat
===================================================================
--- packages/gamera/trunk/debian/compat (rev 0)
+++ packages/gamera/trunk/debian/compat 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+7
Added: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control (rev 0)
+++ packages/gamera/trunk/debian/control 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,78 @@
+Source: gamera
+Section: python
+Priority: optional
+Maintainer: Jakub Wilk <ubanus at users.sf.net>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/gamera/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/gamera/trunk/
+Build-Depends: debhelper (>= 7.3.5~), quilt (>= 0.46-7~),
+ python-support (>= 0.90), python-all-dev, python-all-dbg,
+ libtiff4-dev, libpng12-dev,
+ libvigraimpex-dev (>= 1.6.0-1~),
+ libga-dev
+Build-Depends-Indep:
+ python-docutils, python-pygments, python-numpy, python-imaging, python-wxgtk2.8,
+ help2man,
+ xvfb, xauth, xfonts-base
+Standards-Version: 3.8.3
+Homepage: http://gamera.sourceforge.net/
+XS-Python-Version: 2.5
+
+Package: python-gamera
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: python-wxgtk2.8, python-numpy, python-imaging
+Suggests: gamera-doc
+Description: framework for building document analysis applications
+ The Gamera framework is a Python library for building custom
+ applications for document analysis and recognition. Additionally, it
+ allows for custom extensions.
+ .
+ Gamera can be used for a wide variety of tasks, from building complete
+ image recognition systems down to implementing and evaluating
+ particular algorithms for image processing or document layout analysis.
+
+Package: python-gamera-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: python-gamera (= ${binary:Version}), ${python:Depends}, python-dbg, ${shlibs:Depends}, ${misc:Depends}
+Recommends: python-wxgtk2.8, python-numpy-dbg, python-imaging-dbg
+Description: framework for building document analysis applications (debug symbols)
+ The Gamera framework is a Python library for building custom
+ applications for document analysis and recognition.
+ .
+ This package contains Gamera extension modules built for the Python
+ debug interpreter.
+
+Package: python-gamera-dev
+Architecture: any
+Depends: python-dev, libvigraimpex-dev, ${misc:Depends}
+Recommends: python-all-dev, python-gamera (= ${binary:Version})
+Description: framework for building document analysis applications (header files)
+ The Gamera framework is a Python library for building custom
+ applications for document analysis and recognition.
+ .
+ This package contains header files that might be required to build
+ extra C/C++ extension modules for Gamera.
+
+Package: gamera-gui
+Architecture: all
+Depends: python, ${python:Depends}, python-gamera (>= ${binary:Version}), python-wxgtk2.8, ${misc:Depends}
+Suggests: gamera-doc
+Description: GUI for the Gamera framework
+ The Gamera framework is a Python library for building custom
+ applications for document analysis and recognition.
+ .
+ This package contains GUI for Gamera.
+
+Package: gamera-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: python-gamera, gamera-gui
+Description: documentation for the Gamera framework
+ The Gamera framework is a Python library for building custom
+ applications for document analysis and recognition.
+ .
+ This package contains documentation for Gamera.
Added: packages/gamera/trunk/debian/copyright
===================================================================
--- packages/gamera/trunk/debian/copyright (rev 0)
+++ packages/gamera/trunk/debian/copyright 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,293 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
+Name: gamera
+Maintainer: Michael Droettboom, Christoph Dalitz
+Source: http://gamera.sourceforge.net/
+
+Files: gamera/*, include/*, src/*, misc/*, gamera_post_install.py
+Copyright:
+ 2001-2009, Christoph Dalitz
+ 2001-2009, Michael Droettboom
+ 2001-2009, Ichiro Fujinaga
+ 2001-2009, Karl MacMillan
+ 2002-2005, Robert Ferguson
+License: GPL-2+
+
+Files: gamera/plugins/binarization.py
+Copyright:
+ 2005, John Ashley Burgoyne
+ 2005, Ichiro Fujinaga
+License: GPL-2+
+
+Files: gamera/plugins/*_io.py
+Copyright:
+ 2005, Alex Cobb
+ 2009, Robert Butz
+License: GPL-2+
+
+Files: gamera/knn_editing.py, gamera/gui/knn_editing_display.py
+Copyright:
+ 2007-2008, Colin Baumgarten
+License: GPL-2+
+
+Files: gamera/plugins/pagesegmentation.py
+Copyright:
+ 2007, Rene Baston
+ 2007, Christoph Dalitz
+ 2007, Maria Elhachimi
+ 2007, Stefan Ruloff
+ 2007, Ilya Stoyanov
+License: GPL-2+
+
+Files: gamera/backport/textwrap.py
+Copyright:
+ 1999-2001, Gregory P. Ward
+ 2002-2003, Python Software Foundation
+License: PSF-2
+
+Files: gamera/backport/ConfigParser.py, gamera/backport/sets.py
+License: PSF-2
+
+Files: gamera/backport/optparse.py
+Copyright:
+ 2001-2003, Gregory P. Ward.
+License: BSD
+
+Files: gamera/stats.py, gamera/pstat.py, gamera/io.py
+Copyright:
+ 1999-2007, Gary Strangman
+License: Expat
+
+Files: include/vigra/*, include/vigra_iterators.hpp
+Copyright:
+ 1998-2006, Ullrich Köthe
+ 1998-2005, Hans Meine
+ 2001-2002, Gunnar Kedenburg
+ 2003, Christian-Dennis Rahn
+ 2003-2004, Gunnar Kedenburg
+License: Expat
+
+Files: include/boost_limits.hpp
+Copyright: 1997, Silicon Graphics Computer Systems, Inc.
+License: other
+ Permission to use, copy, modify, distribute and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that the
+ above copyright notice appear in all copies and that both that copyright notice
+ and this permission notice appear in supporting documentation. Silicon Graphics
+ makes no representations about the suitability of this software for any
+ purpose. It is provided "as is" without express or implied warranty.
+
+Files: src/ga/*
+Copyright:
+ 1995-1996, Massachusetts Institute of Technology
+ 1996-1999, Matthew Wall
+License: other
+ 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 use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ 1. You may copy and distribute the source code and/or
+ library/executable code for GAlib in any medium provided that you
+ conspicuously and appropriately give credit to the author and keep
+ intact all copyright and disclaimer notices in the library.
+ .
+ 2. Any publications of work based upon experiments that use GAlib must
+ include a suitable acknowledgement of GAlib. A suggested
+ acknowledgement is: "The software for this work used the GAlib genetic
+ algorithm package, written by Matthew Wall at the Massachusetts
+ Institute of Technology."
+ .
+ 3. The author of GAlib and MIT assume absolutely no responsibility for
+ the use or misuse of GAlib. In no event shall the author of GAlib or
+ MIT be liable for any damages resulting from use or performance of
+ GAlib.
+
+Files: examples/*
+License: public domain
+
+Files: gamera/pixmaps/img2py.py, gamera/pixmaps/img2img.py
+Copyright: 2002, Total Control Software
+License: wxWindows-3
+
+Files: gamera/mac/buildpkg.py
+Copyright: 2002, Dinu C. Gherman
+License: FreeBSD
+
+Files: debian/*
+Copyright: 2009, Jakub Wilk <ubanus at users.sf.net>
+License: GPL-2
+
+
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
+
+License: wxWindows-3
+ Copyright (c) 1998 Julian Smart, Robert Roebling et al
+ .
+ Everyone is permitted to copy and distribute verbatim copies
+ of this licence document, but changing it is not allowed.
+ .
+ WXWINDOWS LIBRARY LICENCE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public Licence as published by
+ the Free Software Foundation; either version 2 of the Licence, or (at
+ your option) any later version.
+ .
+ This library 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 Library
+ General Public Licence for more details.
+ .
+ You should have received a copy of the GNU Library General Public Licence
+ along with this software, usually in a file named COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
+ EXCEPTION NOTICE
+ .
+ 1. As a special exception, the copyright holders of this library give
+ permission for additional uses of the text contained in this release of
+ the library as licenced under the wxWindows Library Licence, applying
+ either version 3 of the Licence, or (at your option) any later version of
+ the Licence as published by the copyright holders of version 3 of the
+ Licence document.
+ .
+ 2. The exception is that you may use, copy, link, modify and distribute
+ under the user's own terms, binary object code versions of works based
+ on the Library.
+ .
+ 3. If you copy code from files distributed under the terms of the GNU
+ General Public Licence or the GNU Library General Public Licence into a
+ copy of this library, as this licence permits, the exception does not
+ apply to the code that you add in this way. To avoid misleading anyone as
+ to the status of such modified files, you must delete this exception
+ notice from such code and/or adjust the licensing conditions notice
+ accordingly.
+ .
+ 4. If you write modifications of your own for this library, it is your
+ choice whether to permit this exception to apply to your modifications.
+ If you do not wish that, you must delete the exception notice from such
+ code and/or adjust the licensing conditions notice accordingly.
+
+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 use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER 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: PSF-2
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide license
+ to reproduce, analyze, test, perform and/or display publicly, prepare
+ derivative works, distribute, and otherwise use Python alone or in any
+ derivative version, provided, however, that PSF's License Agreement and
+ PSF's notice of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004
+ Python Software Foundation; All Rights Reserved" are retained in Python
+ alone or in any derivative version prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on or
+ incorporates Python or any part thereof, and wants to make the
+ derivative work available to others as provided herein, then Licensee
+ hereby agrees to include in any such work a brief summary of the
+ changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS" basis. PSF
+ MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
+ EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY
+ REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
+ PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY
+ THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR
+ ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT
+ OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY
+ DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee. This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee agrees to
+ be bound by the terms and conditions of this License Agreement.
+
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the author nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN 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.
+
+License: FreeBSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT “AS IS†AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN 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.
Added: packages/gamera/trunk/debian/docs
===================================================================
--- packages/gamera/trunk/debian/docs (rev 0)
+++ packages/gamera/trunk/debian/docs 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+README
Added: packages/gamera/trunk/debian/gamera-doc.doc-base
===================================================================
--- packages/gamera/trunk/debian/gamera-doc.doc-base (rev 0)
+++ packages/gamera/trunk/debian/gamera-doc.doc-base 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,12 @@
+Document: gamera-3-documentation
+Title: Gamera 3.x documentation
+Author: Michael Droettboom, Christoph Dalitz
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/gamera-doc/html/index.html
+Files: /usr/share/doc/gamera-doc/html/*.html
+
+Format: Text
+Index: /usr/share/doc/gamera-doc/rst/index.txt
+Files: /usr/share/doc/gamera-doc/rst/*.txt
Added: packages/gamera/trunk/debian/gamera-doc.docs
===================================================================
--- packages/gamera/trunk/debian/gamera-doc.docs (rev 0)
+++ packages/gamera/trunk/debian/gamera-doc.docs 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,2 @@
+doc/html/
+doc/src/
Added: packages/gamera/trunk/debian/gamera-doc.links
===================================================================
--- packages/gamera/trunk/debian/gamera-doc.links (rev 0)
+++ packages/gamera/trunk/debian/gamera-doc.links 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+usr/share/doc/gamera-doc/src usr/share/doc/gamera-doc/rst
Added: packages/gamera/trunk/debian/gamera-gui.install
===================================================================
--- packages/gamera/trunk/debian/gamera-gui.install (rev 0)
+++ packages/gamera/trunk/debian/gamera-gui.install 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,2 @@
+usr/lib/python*/site-packages/gamera/gui/
+usr/bin/gamera_gui
Added: packages/gamera/trunk/debian/gamera-gui.manpages
===================================================================
--- packages/gamera/trunk/debian/gamera-gui.manpages (rev 0)
+++ packages/gamera/trunk/debian/gamera-gui.manpages 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+doc/manpage/*.1
Added: packages/gamera/trunk/debian/manpage-helper-1
===================================================================
--- packages/gamera/trunk/debian/manpage-helper-1 (rev 0)
+++ packages/gamera/trunk/debian/manpage-helper-1 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,5 @@
+import sys
+import gamera.gui.gui
+import gamera.config
+
+gamera.config.config.parse_args(sys.argv[1:])
Added: packages/gamera/trunk/debian/manpage-helper-2
===================================================================
--- packages/gamera/trunk/debian/manpage-helper-2 (rev 0)
+++ packages/gamera/trunk/debian/manpage-helper-2 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec python ./manpage-helper-1 "$@" \
+| sed -e 's/^usage/Usage/; s/^options/Options/; s/manpage-helper-1/gamera_gui/g'
Added: packages/gamera/trunk/debian/patches/fix-paths.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-paths.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/fix-paths.diff 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,53 @@
+Description: Make plugin/toolkit/test paths compatible with python-support.
+ Fix documentation generator to look for test files in the build directory.
+
+Index: gamera-3.2.0+svn1154/doc/gendoc.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/doc/gendoc.py 2009-09-04 20:20:45.000000000 +0200
++++ gamera-3.2.0+svn1154/doc/gendoc.py 2009-09-04 20:21:22.000000000 +0200
+@@ -5,6 +5,12 @@
+ import wxversion
+ wxversion.select(["2.8", "2.6", "2.5", "2.4"])
+
++import sys
++import os
++import gamera.paths
++
++gamera.paths.test = os.path.join(os.path.dirname(__file__), '..', 'gamera', 'test')
++
+ if __name__ == "__main__":
+ core.init_gamera()
+ gendoc.gendoc(classes=[
+Index: gamera-3.2.0+svn1154/gamera/paths.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/gamera/paths.py 2009-09-04 19:30:06.000000000 +0200
++++ gamera-3.2.0+svn1154/gamera/paths.py 2009-09-04 20:20:48.000000000 +0200
+@@ -22,11 +22,7 @@
+ from __future__ import generators
+ import os, sys, dircache, glob, imp # Python standard library
+
+-if 1:
+- def dummy():
+- pass
+-
+-lib = os.path.dirname(os.path.realpath(dummy.func_code.co_filename))
++lib = os.path.dirname(__file__)
+ lib_gui = os.path.realpath(os.path.join(lib, "gui"))
+ # Figure out if we are in the source directory or installed
+ plugins = os.path.realpath(os.path.join(lib, "plugins"))
+@@ -34,11 +30,13 @@
+ sys.path.append(plugins)
+ plugins_src = ""
+ toolkits = os.path.realpath(os.path.join(lib, "toolkits"))
+-test = os.path.realpath(os.path.join(lib, "test"))
+-test_results = os.path.realpath(os.path.join(lib, "test/results"))
++test = '/usr/share/gamera/test/'
++test_results = os.path.join(test, 'results')
+
+ def get_toolkit_names(dir):
+ toolkits = []
++ if not os.path.exists(dir):
++ return toolkits
+ listing = dircache.listdir(dir)
+ dircache.annotate(dir, listing)
+ for toolkit in listing:
Added: packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/gendoc-use-wxversion.diff 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,18 @@
+Description: Make the documentation generator prefer wxPython 2.8 over other versions.
+ This patch is intended to alleviate Debian bug #451104.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: gamera-3.2.0+svn1154/doc/gendoc.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/doc/gendoc.py 2009-09-04 19:26:39.000000000 +0200
++++ gamera-3.2.0+svn1154/doc/gendoc.py 2009-09-04 19:26:45.000000000 +0200
+@@ -2,6 +2,9 @@
+
+ from gamera import core, gendoc
+
++import wxversion
++wxversion.select(["2.8", "2.6", "2.5", "2.4"])
++
+ if __name__ == "__main__":
+ core.init_gamera()
+ gendoc.gendoc(classes=[
Added: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series (rev 0)
+++ packages/gamera/trunk/debian/patches/series 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,5 @@
+gendoc-use-wxversion.diff
+fix-paths.diff
+use-system-galib.diff
+use-system-vigra.diff
+use-system-python-modules.diff
Added: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,66 @@
+Description: Don't use an embedded copy of the GAlib library.
+ See also Debian bug #544693.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: gamera-3.2.0+svn1154/gamera/gamera_setup.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/gamera/gamera_setup.py 2009-09-04 19:26:39.000000000 +0200
++++ gamera-3.2.0+svn1154/gamera/gamera_setup.py 2009-09-04 19:26:56.000000000 +0200
+@@ -83,7 +83,7 @@
+ elif sys.platform == 'darwin':
+ extras['extra_link_args'] = ['-F/System/Library/Frameworks/']
+ elif '--compiler=mingw32' in sys.argv or not sys.platform == 'win32':
+- extras['libraries'] = ['stdc++'] # Not for intel compiler
++ extras['libraries'] = ['stdc++', 'ga'] # Not for intel compiler
+
+ # Check that we are running a recent enough version of Python.
+ # This depends on the platform.
+Index: gamera-3.2.0+svn1154/setup.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/setup.py 2009-09-04 19:26:39.000000000 +0200
++++ gamera-3.2.0+svn1154/setup.py 2009-09-04 19:26:56.000000000 +0200
+@@ -121,8 +121,7 @@
+ ########################################
+ # Non-plugin extensions
+
+-ga_files = glob.glob("src/ga/*.cpp")
+-ga_files.append("src/knncoremodule.cpp")
++ga_files = ["src/knncoremodule.cpp"]
+ graph_files = glob.glob("src/graph/*.cpp")
+ kdtree_files = glob.glob("src/kdtree/*.cpp")
+
+@@ -145,7 +144,7 @@
+ **gamera_setup.extras
+ ),
+ Extension("gamera.knncore", ga_files,
+- include_dirs=["include", "src/ga", "src"],
++ include_dirs=["include", "src"],
+ **gamera_setup.extras),
+ Extension("gamera.graph", graph_files,
+ include_dirs=["include", "src", "src/graph"],
+Index: gamera-3.2.0+svn1154/src/knncoremodule.cpp
+===================================================================
+--- gamera-3.2.0+svn1154.orig/src/knncoremodule.cpp 2009-09-04 19:26:39.000000000 +0200
++++ gamera-3.2.0+svn1154/src/knncoremodule.cpp 2009-09-04 19:26:56.000000000 +0200
+@@ -34,10 +34,11 @@
+ #include <assert.h>
+ #include <stdio.h>
+ // for ga optimization
++#include <ga/gaconfig.h>
++#undef GALIB_USE_COMP_OPERATOR_TEMPLATES
+ #include <ga/ga.h>
+ #include <ga/GASimpleGA.h>
+ #include <ga/GA1DArrayGenome.h>
+-#include <ga/GA1DArrayGenome.cpp>
+ // for rand
+ #include <stdlib.h>
+ #include <time.h>
+@@ -1498,7 +1499,7 @@
+ GA1DArrayGenome<double> & genome = (GA1DArrayGenome<double> &)g;
+ KnnObject* knn = (KnnObject*)genome.userData();
+
+- std::pair<int,int> ans = leave_one_out(knn, std::numeric_limits<int>::max(), genome());
++ std::pair<int,int> ans = leave_one_out(knn, std::numeric_limits<int>::max(), static_cast<double*>(genome));
+
+ return (float)ans.first / ans.second;
+ }
Added: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,38 @@
+Description: Don't use embedded copies of standard Python modules.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: gamera-3.2.0+svn1154/gamera/plugin.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/gamera/plugin.py 2009-09-04 19:26:37.000000000 +0200
++++ gamera-3.2.0+svn1154/gamera/plugin.py 2009-09-04 19:27:03.000000000 +0200
+@@ -23,7 +23,7 @@
+ from gamera import paths
+ from gamera import util
+ import new, os, os.path, imp, inspect, sys, copy
+-from gamera.backport import sets
++import sets
+ from types import *
+ from enums import *
+
+Index: gamera-3.2.0+svn1154/gamera/util.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/gamera/util.py 2009-09-04 19:26:37.000000000 +0200
++++ gamera-3.2.0+svn1154/gamera/util.py 2009-09-04 19:27:03.000000000 +0200
+@@ -27,7 +27,8 @@
+ from gamera.enums import *
+ from gamera.gui import has_gui
+ from gamera.config import config
+-from gamera.backport import sets, textwrap
++import sets
++import textwrap
+
+ config.add_option(
+ "-p", "--progress-bar", action="store_true",
+@@ -571,7 +572,6 @@
+ def get_file_extensions(mode):
+ from gamera import plugin
+ import os.path
+- from gamera.backport import sets
+ methods = plugin.methods_flat_category("File")
+ methods = [y for x, y in methods if x.startswith(mode) and not x.endswith("image")]
+
Added: packages/gamera/trunk/debian/patches/use-system-vigra.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-vigra.diff (rev 0)
+++ packages/gamera/trunk/debian/patches/use-system-vigra.diff 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,17 @@
+Description: Don't use an embedded copy of the VIGRA library.
+Author: Jakub Wilk <ubanus at users.sf.net>
+
+Index: gamera-3.2.0+svn1154/setup.py
+===================================================================
+--- gamera-3.2.0+svn1154.orig/setup.py 2009-09-04 19:26:56.000000000 +0200
++++ gamera-3.2.0+svn1154/setup.py 2009-09-04 19:27:00.000000000 +0200
+@@ -165,8 +165,7 @@
+ glob.glob(os.path.join("include", os.path.join(path, ext))))
+ for path, ext in
+ ("", "*.hpp"),
+- ("plugins", "*.hpp"),
+- ("vigra", "*.hxx")]
++ ("plugins", "*.hpp")]
+
+ packages = ['gamera', 'gamera.gui', 'gamera.plugins', 'gamera.toolkits',
+ 'gamera.backport']
Added: packages/gamera/trunk/debian/python-gamera-dbg.install
===================================================================
--- packages/gamera/trunk/debian/python-gamera-dbg.install (rev 0)
+++ packages/gamera/trunk/debian/python-gamera-dbg.install 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,2 @@
+usr/lib/python*/site-packages/gamera/*/*_d.so
+usr/lib/python*/site-packages/gamera/*_d.so
Added: packages/gamera/trunk/debian/python-gamera-dev.install
===================================================================
--- packages/gamera/trunk/debian/python-gamera-dev.install (rev 0)
+++ packages/gamera/trunk/debian/python-gamera-dev.install 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+usr/include/python*/gamera/*.hpp
Added: packages/gamera/trunk/debian/python-gamera-doc.examples
===================================================================
--- packages/gamera/trunk/debian/python-gamera-doc.examples (rev 0)
+++ packages/gamera/trunk/debian/python-gamera-doc.examples 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1 @@
+examples/*
Added: packages/gamera/trunk/debian/python-gamera.install
===================================================================
--- packages/gamera/trunk/debian/python-gamera.install (rev 0)
+++ packages/gamera/trunk/debian/python-gamera.install 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,7 @@
+usr/lib/python*/site-packages/gamera/backport/config.py
+usr/lib/python*/site-packages/gamera/plugins/*[a-z][a-z].so
+usr/lib/python*/site-packages/gamera/plugins/*.py
+usr/lib/python*/site-packages/gamera/toolkits/
+usr/lib/python*/site-packages/gamera/*[a-z][a-z].so
+usr/lib/python*/site-packages/gamera/*.py
+usr/lib/python*/site-packages/gamera/test/* usr/share/gamera/test/
Added: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules (rev 0)
+++ packages/gamera/trunk/debian/rules 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,84 @@
+#!/usr/bin/make -f
+
+export DH_OPTIONS = --with=quilt
+
+ENSURE_XSERVER = $(shell [ -z "$$DISPLAY" ] && echo xvfb-run)
+PYTHONPATH = $(wildcard $(CURDIR)/build/lib.*-$(shell pyversions -dv))
+VERSION = $(shell dpkg-parsechangelog | grep ^Version | cut -d ' ' -f 2)
+
+.PHONY: build
+build: build-arch build-indep
+
+.PHONY: build-arch
+build-arch: build/stamp
+
+build/stamp:
+ rm -Rf include/zlib*/ src/zlib*/ src/libpng*/ src/libtiff*/
+ rm -Rf include/vigra/
+ rm -Rf src/ga/
+ dh build -s
+ touch $(@)
+
+.PHONY: build-indep
+build-indep: doc/stamp
+
+doc/manpage/gamera_gui.1: build/stamp
+ mkdir -p doc/manpage/
+ ln -sf $(CURDIR)/debian/manpage-helper-1 doc/manpage/
+ ln -sf $(CURDIR)/debian/manpage-helper-2 doc/manpage/gamera_gui
+ chmod +x doc/manpage/gamera_gui
+ cd doc/manpage/ && PYTHONPATH=$(PYTHONPATH) help2man --version-string=$(VERSION) --name='GUI for the Gamera framework' --no-info ./gamera_gui > gamera_gui.1
+
+doc/stamp: build/stamp doc/manpage/gamera_gui.1
+ cd doc && PYTHONPATH=$(PYTHONPATH) $(ENSURE_XSERVER) python gendoc.py
+ touch $(@)
+
+.PHONY: clean
+clean:
+ dh clean
+ rm -Rf doc/html/images/
+ rm -Rf doc/manpage/
+ rm -Rf build/
+ find . -type f -name '*.py[co]' -delete
+
+.PHONY: install
+install: install-arch install-indep
+
+.PHONY: install-arch
+install-arch: build-arch
+ dh install -s --before dh_link
+ for version in $(shell pyversions -r); do \
+ for suffix in "" _d; do \
+ if [ $$version$$suffix != $(shell pyversions -d) ]; then \
+ dir=debian/python-gamera-dev/usr/include/$$version$$suffix/gamera; \
+ rm -Rf $$dir; \
+ ln -sf ../$(shell pyversions -d)/gamera $$dir; \
+ fi \
+ done; \
+ done
+ dh install -s --remaining
+
+.PHONY: install-indep
+install-indep: build-indep
+ dh install -i
+ sed -i -e '1 s|.*|#!/usr/bin/python|' debian/gamera-gui/usr/bin/gamera_gui
+
+.PHONY: binary
+binary: install
+ dh binary
+
+.PHONY: binary-arch
+binary-arch: install-arch
+ dh binary-arch
+
+.PHONY: binary-indep
+binary-indep: install-indep
+ dh binary-indep
+
+.PHONY: patch unpatch
+patch unpatch:
+ dh_quilt_$(@)
+
+.NOTPARALLEL:
+
+# vim:ts=4 sw=4 noet
Property changes on: packages/gamera/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/gamera/trunk/debian/watch
===================================================================
--- packages/gamera/trunk/debian/watch (rev 0)
+++ packages/gamera/trunk/debian/watch 2009-09-04 19:01:24 UTC (rev 9677)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/gamera/gamera-([0-9.]+)[.]tar[.]gz
More information about the Python-modules-commits
mailing list