[Python-modules-commits] r29694 - in packages/gamera/trunk/debian (11 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Tue Jul 8 15:02:27 UTC 2014
Date: Tuesday, July 8, 2014 @ 15:02:25
Author: danstender-guest
Revision: 29694
* New upstream release (3.4.1, Closes: #747548).
* Removed setup-no-import.diff (setup.py now provides --nowx switch,
added that to deb/rules.)
* Refreshed fix-typos.diff.
* deb/control:
+ Changed maintainer (Closes: #629177).
+ Changed b-d from libtiff4-dev to libtiff-dev (Closes: #736004).
+ Bumped version of python-all-dbg/dev to 2.6.6-3~.
+ Dropped b-d on python_support.
+ Bump standards version to 3.9.5 (no changes needed).
+ Relocated Vcs-* fields.
* Updated deb/copyright.
* deb/rules:
+ Added export lines for DH_VERBOSE and DEB_BUILD_OPTIONS.
+ Replaced dh_pysupport with dh_python2.
+ Removal of Sourceforge logo to prevent privacy-breach-logo.
* Added absolute path to icon in gamera-gui.menu.
* Added Keywords to deb/gamera-gui.desktop.
* Wrapped-and-sorted.
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/control
packages/gamera/trunk/debian/copyright
packages/gamera/trunk/debian/gamera-gui.desktop
packages/gamera/trunk/debian/gamera-gui.install
packages/gamera/trunk/debian/gamera-gui.menu
packages/gamera/trunk/debian/patches/fix-typos.diff
packages/gamera/trunk/debian/patches/series
packages/gamera/trunk/debian/python-gamera.install
packages/gamera/trunk/debian/rules
Deleted:
packages/gamera/trunk/debian/patches/setup-no-import-wx.diff
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/changelog 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,7 +1,28 @@
-gamera (3.4.0-1) UNRELEASED; urgency=low
+gamera (3.4.1-1) UNRELEASED; urgency=low
- * Changed maintainer (Closes: #629177).
- * New upstream release.
+ [ Daniel Stender ]
+ * New upstream release (3.4.1, Closes: #747548).
+ * Removed setup-no-import.diff (setup.py now provides --nowx switch,
+ added that to deb/rules.)
+ * Refreshed fix-typos.diff.
+ * deb/control:
+ + Changed maintainer (Closes: #629177).
+ + Changed b-d from libtiff4-dev to libtiff-dev (Closes: #736004).
+ + Bumped version of python-all-dbg/dev to 2.6.6-3~.
+ + Dropped b-d on python_support.
+ + Bump standards version to 3.9.5 (no changes needed).
+ + Relocated Vcs-* fields.
+ * Updated deb/copyright.
+ * deb/rules:
+ + Added export lines for DH_VERBOSE and DEB_BUILD_OPTIONS.
+ + Replaced dh_pysupport with dh_python2.
+ + Removal of Sourceforge logo to prevent privacy-breach-logo.
+ * Added absolute path to icon in gamera-gui.menu.
+ * Added Keywords to deb/gamera-gui.desktop.
+ * Wrapped-and-sorted.
+
+ [ Jakub Wilk ]
+ * New upstream release (3.4.0):
+ Drop pil-import.diff; applied upstream.
+ Drop use-system-galib.diff; no longer needed.
+ Refresh other patches.
@@ -9,9 +30,7 @@
+ Bump minimum required Python version to 2.5.
+ Add gamera/__compiletime_config__.py to debian/clean.
+ Update debian/copyright.
- * Bump standards version to 3.9.4 (no changes needed).
- * Add patch to fix spelling mistakes.
- (fix-typos.diff)
+ * Add patch to fix spelling mistakes (fix-typos.diff).
* Rewrite debian/rules without using dh.
+ Reduce minimum required debhelper version to 7.
* Install *.egg-info into the binary package.
@@ -19,7 +38,7 @@
* Set PYTHONHASHSEED=random in debian/rules.
* Use canonical URIs for Vcs-* fields.
- -- Daniel Stender <debian at danielstender.com> Thu, 26 Jun 2014 13:07:39 +0200
+ -- Daniel Stender <debian at danielstender.com> Tue, 08 Jul 2014 16:47:46 +0200
gamera (3.3.3-2) unstable; urgency=low
Modified: packages/gamera/trunk/debian/control
===================================================================
--- packages/gamera/trunk/debian/control 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/control 2014-07-08 15:02:25 UTC (rev 29694)
@@ -2,32 +2,43 @@
Section: python
Priority: optional
Maintainer: Daniel Stender <debian at danielstender.com>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/gamera/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/gamera/trunk/
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.15.7~),
- python-support (>= 0.90),
- python-all-dev (>= 2.5), python-all-dbg (>= 2.5),
- python-nose, procps, python-docutils, python-pygments,
- python-imaging, python-imaging-dbg,
- libtiff4-dev, libpng-dev,
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends:
+ debhelper (>= 7),
+ dpkg-dev (>= 1.15.7~),
+ libpng-dev,
+ libtiff-dev,
libvigraimpex-dev (>= 1.6.0-1~),
+ procps,
+ python-all-dbg (>= 2.6.6-3~),
+ python-all-dev (>= 2.6.6-3~),
+ python-docutils,
+ python-imaging,
+ python-imaging-dbg,
+ python-nose,
+ python-pygments
Build-Depends-Indep:
- python-numpy, python-wxgtk2.8,
- help2man, netpbm,
- python (>= 2.5), rdfind
+ help2man,
+ netpbm,
+ python (>= 2.5),
+ python-numpy,
+ python-wxgtk2.8,
+ rdfind
XS-Python-Version: >= 2.5
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://gamera.sourceforge.net/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/gamera/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/gamera/trunk/
Package: python-gamera
Architecture: any
Pre-Depends: dpkg (>= 1.15.6)
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
Replaces: gamera-gui (<< 3.2.3-2~)
-Recommends: python-wxgtk2.8, python-numpy, python-imaging
+Recommends: python-imaging, python-numpy, python-wxgtk2.8
Suggests: gamera-doc
-Built-Using: libvigraimpex (= ${vigra:Version})
+Built-Using: libvigraimpex (= ${vigra:Version})
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
@@ -42,10 +53,14 @@
Priority: extra
Architecture: any
Pre-Depends: dpkg (>= 1.15.6)
-Depends: python-gamera (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-gamera (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Recommends: python-dbg
-Suggests: python-wxgtk2.8-dbg, python-numpy-dbg, python-imaging-dbg
-Built-Using: libvigraimpex (= ${vigra:Version})
+Suggests: python-imaging-dbg, python-numpy-dbg, python-wxgtk2.8-dbg
+Built-Using: libvigraimpex (= ${vigra:Version})
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.
@@ -56,8 +71,11 @@
Package: python-gamera-dev
Architecture: all
Pre-Depends: dpkg (>= 1.15.6)
-Depends: python-dev, libvigraimpex-dev, ${misc:Depends}
-Recommends: python-all-dev, python-gamera (>= ${source:Version}), python-gamera (<= ${source:Version}.0~)
+Depends: libvigraimpex-dev, python-dev, ${misc:Depends}
+Recommends:
+ python-all-dev,
+ python-gamera (<= ${source:Version}.0~),
+ python-gamera (>= ${source: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.
@@ -68,8 +86,14 @@
Package: gamera-gui
Architecture: all
Pre-Depends: dpkg (>= 1.15.6)
-Depends: python, ${python:Depends}, python-gamera (>= ${source:Version}), python-gamera (<= ${source:Version}.0~), python-wxgtk2.8, ${misc:Depends}
-Recommends: python-matplotlib, python-docutils
+Depends:
+ python,
+ python-gamera (<= ${source:Version}.0~),
+ python-gamera (>= ${source:Version}),
+ python-wxgtk2.8,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends: python-docutils, python-matplotlib
Suggests: gamera-doc
Description: GUI for the Gamera framework
The Gamera framework is a Python library for building custom
@@ -82,7 +106,7 @@
Architecture: all
Pre-Depends: dpkg (>= 1.15.6)
Depends: ${misc:Depends}
-Suggests: python-gamera, gamera-gui
+Suggests: gamera-gui, python-gamera
Description: documentation for the Gamera framework
The Gamera framework is a Python library for building custom
applications for document analysis and recognition.
Modified: packages/gamera/trunk/debian/copyright
===================================================================
--- packages/gamera/trunk/debian/copyright 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/copyright 2014-07-08 15:02:25 UTC (rev 29694)
@@ -5,7 +5,7 @@
Files: *
Copyright:
- 2001-2012, Christoph Dalitz
+ 2001-2013, Christoph Dalitz
2001-2010, Michael Droettboom
2001-2010, Ichiro Fujinaga
2001-2010, Karl MacMillan
@@ -21,12 +21,14 @@
2007-2008, Colin Baumgarten
2009, Jonathan Koch
2010, Hasan Yildiz
- 2010-2011, Olivier Christen
+ 2010-2012, Olivier Christen
2010-2012, Tobias Bolten
- 2011, Christian Brandt
+ 2011-2013, Christian Brandt
2011, Andreas Leuschner
2012, Andrew Hankinson
2012, David Kolanus
+ 2013, Fabian Schmitt
+ 2013, Manuel Jeltsch
License: GPL-2+
Files: gamera/backport/textwrap.py
@@ -97,14 +99,14 @@
License: LGPLv2.1+
Files: src/eodev/gp/node_pool.h
-Copyright:
+Copyright:
1999-2000, Maarten Keijzer
License: other-2
Permission to copy, use, modify, sell and distribute this software is
granted provided this copyright notice appears in all copies. This software
is provided "as is" without express or implied warranty, and with no claim
as to its suitability for any purpose.
- .
+ .
Permission to modify the code and to distribute modified code is granted,
provided the above notices are retained, and a notice that the code was
modified is included with the above copyright notice.
@@ -130,19 +132,19 @@
License: CC-BY-SA-3.0
Files: debian/*
-Copyright: 2009-2011, Jakub Wilk <jwilk at debian.org>
+Copyright: 2009-2012, Jakub Wilk <jwilk at debian.org>
+ 2014, Daniel Stender <debian at danielstender.com>
License: GPL-2
Files: debian/dh_buildid
Copyright: 2011, Jakub Wilk <jwilk at debian.org>
License: Expat
-
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 as published by
the Free Software Foundation; version 2 dated June, 1991.
- .
+ .
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
@@ -156,7 +158,7 @@
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
- .
+ .
This program 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
@@ -667,4 +669,3 @@
not granted under this License, such additional rights are deemed to be
included in the License; this License is not intended to restrict the license
of any rights under applicable law.
-
Modified: packages/gamera/trunk/debian/gamera-gui.desktop
===================================================================
--- packages/gamera/trunk/debian/gamera-gui.desktop 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/gamera-gui.desktop 2014-07-08 15:02:25 UTC (rev 29694)
@@ -7,3 +7,4 @@
Exec=/usr/bin/gamera_gui %f
Terminal=false
Categories=Graphics;OCR;
+Keywords=document analysis;
Modified: packages/gamera/trunk/debian/gamera-gui.install
===================================================================
--- packages/gamera/trunk/debian/gamera-gui.install 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/gamera-gui.install 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,3 +1,3 @@
+debian/gamera-gui.desktop usr/share/applications/
+usr/bin/gamera_gui
usr/lib/python*/*-packages/gamera/gui/
-usr/bin/gamera_gui
-debian/gamera-gui.desktop usr/share/applications/
Modified: packages/gamera/trunk/debian/gamera-gui.menu
===================================================================
--- packages/gamera/trunk/debian/gamera-gui.menu 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/gamera-gui.menu 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,4 +1,4 @@
?package(gamera-gui):needs="X11" \
section="Applications/Graphics" \
- icon="gamera-gui.xpm" \
+ icon="/usr/share/pixmaps/gamera-gui.xpm" \
title="GUI for the Gamera framework" command="/usr/bin/gamera_gui"
Modified: packages/gamera/trunk/debian/patches/fix-typos.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-typos.diff 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/patches/fix-typos.diff 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,11 +1,11 @@
Description: fix spelling mistakes
Author: Jakub Wilk <jwilk at debian.org>
Forwarded: no
-Last-Update: 2013-03-06
+Last-Update: 2014-07-08
--- a/doc/src/ga_optimization.txt
+++ b/doc/src/ga_optimization.txt
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ Introduction
Feature Selection, Weighting and Genetic Algorithms
'''''''''''''''''''''''''''''''''''''''''''''''''''
@@ -14,18 +14,9 @@
out of a larger featureset to obtain the features which are suitable
for the best possible classification. Feature weighting is a generalization
of feature selection with real-valued weights between [0,1] instead of the
-@@ -81,7 +81,7 @@
-
- The used feature set can be modified with **Classifier -> Change feature set**.
- With the menu entries **Classifier -> Reset selections** and
--**Classifier -> Reset weights** it is possible to discard already choosen
-+**Classifier -> Reset weights** it is possible to discard already chosen
- optimizations.
-
- .. __: gamera_xml.html
--- a/gamera/gui/gaoptimizer/SettingsPanel.py
+++ b/gamera/gui/gaoptimizer/SettingsPanel.py
-@@ -301,7 +301,7 @@
+@@ -301,7 +301,7 @@ class SettingsPanel(wx.ScrolledWindow):
elif expertWidget.GetName() == "randomSelection":
selection.setRandomSelection()
else:
@@ -34,7 +25,7 @@
# Crossover GA settings
cross = knnga.GACrossover()
-@@ -323,10 +323,10 @@
+@@ -323,10 +323,10 @@ class SettingsPanel(wx.ScrolledWindow):
cross.setHypercubeCrossover(self.frame.classifier.num_features, 0.0, 1.0, \
self.crossoverPanel.hypercubeCrossoverAlpha.GetValue())
else:
@@ -47,7 +38,7 @@
# Mutation GA settings
muta = knnga.GAMutation()
-@@ -347,10 +347,10 @@
+@@ -347,10 +347,10 @@ class SettingsPanel(wx.ScrolledWindow):
self.mutationPanel.gaussMutationSigma.GetValue(), \
self.mutationPanel.gaussMutationPchance.GetValue())
else:
@@ -60,7 +51,7 @@
# Replacement GA settings
replacement = knnga.GAReplacement()
-@@ -364,7 +364,7 @@
+@@ -364,7 +364,7 @@ class SettingsPanel(wx.ScrolledWindow):
elif expertWidget.GetName() == "SSGAdetTournament":
replacement.setSSGAdetTournament(self.replacementPanel.ssgaDetTourTsize.GetValue())
else:
@@ -69,7 +60,7 @@
# Stop Criteria GA settings
stop = knnga.GAStopCriteria()
-@@ -382,10 +382,10 @@
+@@ -382,10 +382,10 @@ class SettingsPanel(wx.ScrolledWindow):
stop.setSteadyStateStop(self.stopCriteriaPanel.steadyContinueMin.GetValue(), \
self.stopCriteriaPanel.steadyContinueNoChange.GetValue())
else:
@@ -84,7 +75,7 @@
para = knnga.GAParallelization()
--- a/src/knngamodule.cpp
+++ b/src/knngamodule.cpp
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@ void init_GASelectionType(PyObject *d) {
"The ``GASelection`` constructor creates a new settings object "
"for the GA-optimization which specifies the used individuals selection method. "
"This object can later be used in an ``GAOptimization``-object. \n\n"
@@ -93,7 +84,7 @@
"override each other.";
PyType_Ready(&GASelectionType);
-@@ -556,9 +556,9 @@
+@@ -556,9 +556,9 @@ PyMethodDef GACrossover_methods[] = {
" the number of used features. Usually this value is set to "
"``classifier.num_features``.\n"
"double *min* (optional)\n"
@@ -105,7 +96,7 @@
"double *eta* (optional)\n"
" the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
},
-@@ -573,9 +573,9 @@
+@@ -573,9 +573,9 @@ PyMethodDef GACrossover_methods[] = {
" the number of used features. Usually this value is set to "
"``classifier.num_features``.\n"
"double *min* (optional)\n"
@@ -117,7 +108,7 @@
"double *alpha* (optional)\n"
" the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
},
-@@ -590,9 +590,9 @@
+@@ -590,9 +590,9 @@ PyMethodDef GACrossover_methods[] = {
" the number of used features. Usually this value is set to "
"``classifier.num_features``.\n"
"double *min* (optional)\n"
@@ -129,7 +120,7 @@
"double *alpha* (optional)\n"
" the amount of exploration OUTSIDE the parents as in BLX-alpha notation"
},
-@@ -811,7 +811,7 @@
+@@ -811,7 +811,7 @@ PyMethodDef GAMutation_methods[] = {
"individuals. This means that this operator only effects "
"feature selection.\n\n"
"double *rate* (optional)\n"
@@ -138,7 +129,7 @@
"bool *normalize* (optional)\n"
" if true ``rate/chromosomeSize`` is used"
},
-@@ -825,14 +825,14 @@
+@@ -825,14 +825,14 @@ PyMethodDef GAMutation_methods[] = {
" the number of used features. Usually this value is set to "
"``classifier.num_features``.\n"
"double *min*\n"
@@ -157,7 +148,7 @@
},
{ NULL }
};
-@@ -1136,7 +1136,7 @@
+@@ -1136,7 +1136,7 @@ void init_GAReplacementType(PyObject *d)
"The ``GAReplacement`` constructor creates a new settings object "
"for the GA-optimization which specifies the used replacement method. "
"This object can later be used in an ``GAOptimization``-object. \n\n"
@@ -167,8 +158,8 @@
PyType_Ready(&GAReplacementType);
--- a/src/eodev/utils/eoParser.cpp
-+++ b/src/eodev/utils/eoParser.cpp
-@@ -82,7 +82,7 @@
++++ b/eodev/utils/eoParser.cpp
+@@ -82,7 +82,7 @@ eoParser::eoParser ( unsigned _argc, cha
programDescription( _programDescription),
needHelpMessage( false ),
needHelp(false, "help", "Prints this message", 'h'),
@@ -179,7 +170,7 @@
// if we want command-line to have highest priority
--- a/gamera/plugins/image_conversion.py
+++ b/gamera/plugins/image_conversion.py
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ import image_utilities, _image_conversio
class to_rgb(PluginFunction):
"""
@@ -190,16 +181,16 @@
- for GREYSCALE and GREY16 images, R=G=B
--- a/INSTALL
+++ b/INSTALL
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@ Prerequisites
+ Fixes for common problems:
- The Python 2.6 binary from python.org has been built with
- a version of MS Visual Studio that causes problems when extensions
-- are compiled with Mingw32. The reason is an errenous
-+ are compiled with Mingw32. The reason is an erroneous
- file ``libmsvcr90.a`` coming with Mingw32. To fix it, you can
- recreate the file from the DLL ``msvcr90.dll`` that comes with
- Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
-@@ -156,7 +156,7 @@
+ - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
+- which is an errenous in some versions of Mingw32. To fix it, you can
++ which is an erroneous in some versions of Mingw32. To fix it, you can
+ recreate the file from the DLL ``msvcr90.dll`` that comes with
+ Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
+
+@@ -162,7 +162,7 @@ terminal and type::
python setup.py build
sudo python setup.py install
@@ -208,7 +199,7 @@
into Gamera under Linux and with gcc version > 4.2, because we could only
get it running in this environment. If you are sure that you have unbroken
OpenMP support on your system, you can compile Gamera with::
-@@ -169,8 +169,8 @@
+@@ -175,8 +175,8 @@ on your system for some reason, you can
python setup.py build --openmp=no
@@ -219,7 +210,7 @@
.. _without_root:
-@@ -189,7 +189,7 @@
+@@ -195,7 +195,7 @@ instructions (without using sudo)::
Alternatively, you can set up a local installation by hand.
Make a local python module directory somewhere that you have write
@@ -228,7 +219,7 @@
mkdir ~/python
-@@ -258,7 +258,7 @@
+@@ -276,7 +276,7 @@ To build Gamera, open a terminal and typ
python setup.py build
@@ -237,7 +228,7 @@
sudo pythonw setup.py install
-@@ -290,11 +290,11 @@
+@@ -308,11 +308,11 @@ to your search PATH, or install the scri
``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
@@ -252,7 +243,7 @@
__ without_root_
-@@ -354,7 +354,7 @@
+@@ -372,7 +372,7 @@ To build Gamera, open a X11 terminal and
python setup.py build
@@ -261,7 +252,7 @@
sudo python setup.py install
-@@ -367,11 +367,11 @@
+@@ -385,11 +385,11 @@ The scripts can be installed by::
default installed to
``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
@@ -278,36 +269,25 @@
--- a/doc/src/install.txt
+++ b/doc/src/install.txt
-@@ -39,7 +39,7 @@
- Fixes for common problems:
-
- - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
-- which is an errenous in some versions of Mingw32. To fix it, you can
-+ which is an erroneous in some versions of Mingw32. To fix it, you can
- recreate the file from the DLL ``msvcr90.dll`` that comes with
- Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
-
-@@ -162,7 +162,7 @@
+@@ -43,7 +43,7 @@ terminal and type::
python setup.py build
sudo python setup.py install
-By default, parallelization of the genetica algorithms is only compiled
-+By default, parallelization of the genetic algorithms is only compiled
++By default, parallelization of the genetical algorithms is only compiled
into Gamera under Linux and with gcc version > 4.2, because we could only
get it running in this environment. If you are sure that you have unbroken
OpenMP support on your system, you can compile Gamera with::
-@@ -175,8 +175,8 @@
+@@ -56,7 +56,7 @@ on your system for some reason, you can
python setup.py build --openmp=no
-Installing without root priviledges
-------------------------------------
+Installing without root privileges
-+----------------------------------
+ -----------------------------------
.. _without_root:
-
-@@ -195,7 +195,7 @@
+@@ -76,7 +76,7 @@ instructions (without using sudo)::
Alternatively, you can set up a local installation by hand.
Make a local python module directory somewhere that you have write
@@ -316,7 +296,7 @@
mkdir ~/python
-@@ -264,7 +264,7 @@
+@@ -157,7 +157,7 @@ To build Gamera, open a terminal and typ
python setup.py build
@@ -325,14 +305,13 @@
sudo pythonw setup.py install
-@@ -296,11 +296,11 @@
+@@ -189,11 +189,11 @@ to your search PATH, or install the scri
``/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/distutils/sysconfig.py``
-Installing without root priviledges
--```````````````````````````````````
+Installing without root privileges
-+``````````````````````````````````
+ ```````````````````````````````````
The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
@@ -340,7 +319,7 @@
__ without_root_
-@@ -360,7 +360,7 @@
+@@ -253,7 +253,7 @@ To build Gamera, open a X11 terminal and
python setup.py build
@@ -349,14 +328,13 @@
sudo python setup.py install
-@@ -373,11 +373,11 @@
+@@ -266,11 +266,11 @@ The scripts can be installed by::
default installed to
``/System/Library/Frameworks/Python.framework/Versions/2.3/bin``.
-Installing without root priviledges
--```````````````````````````````````
+Installing without root privileges
-+``````````````````````````````````
+ ```````````````````````````````````
The instructions for `installing without root (administrator)
-priviledges`__ can also be used on Mac OS-X.
@@ -364,9 +342,18 @@
__ without_root_
+@@ -399,7 +399,7 @@ in the Explorer, or from the DOS command
+ Fixes for common problems:
+
+ - The Python 2.6 binary from python.org requires ``libmsvcr90.a``,
+- which is an errenous in some versions of Mingw32. To fix it, you can
++ which is an erroneous in some versions of Mingw32. To fix it, you can
+ recreate the file from the DLL ``msvcr90.dll`` that comes with
+ Python 2.6 with pexports__ and *dlltool* (the latter is part of Mingw32)::
+
--- a/doc/src/kdtree.txt
+++ b/doc/src/kdtree.txt
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ Each kd-tree is represented by instances
Even though there are general kd-tree algorithms to add and remove
nodes dynamically (see [Bentley1975]_), the present implementation
does not support alteration of a once built tree. This has the
@@ -377,7 +364,7 @@
A ``KdTree`` has the following (read only) properties:
--- a/doc/src/plugins_custom_types.txt
+++ b/doc/src/plugins_custom_types.txt
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@ wrapper of the form:
self.property2 = mc.property2
# ...
@@ -388,7 +375,7 @@
args = Args([Int("arg1"), Real("arg2")])
--- a/gamera/knn.py
+++ b/gamera/knn.py
-@@ -458,7 +458,7 @@
+@@ -458,7 +458,7 @@ Set the selection vector elements by the
described in get_selections_by_features.
The dictionary must contain an entry for every feature of the currently
@@ -397,7 +384,7 @@
by *change_feature_set*. Example:
.. code:: Python
-@@ -499,7 +499,7 @@
+@@ -499,7 +499,7 @@ Set the selection vector elements for on
Set the weighing vector elements by the corresponding feature name.
The dictionary must contain an entry for every feature of the currently
@@ -408,7 +395,7 @@
.. code:: Python
--- a/src/knnga.cpp
+++ b/src/knnga.cpp
-@@ -558,7 +558,7 @@
+@@ -558,7 +558,7 @@ void GAOptimization<EOT>::StartCalculati
// adjust the individual size for the case of weighting with
// prior deselected features and build an index relation map
@@ -419,7 +406,7 @@
unsigned int indiIndex = 0;
--- a/src/pointobject.cpp
+++ b/src/pointobject.cpp
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ static PyGetSetDef point_getset[] = {
static PyMethodDef point_methods[] = {
{ (char *)"move", point_move, METH_VARARGS,
Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/patches/series 2014-07-08 15:02:25 UTC (rev 29694)
@@ -3,7 +3,6 @@
fix-paths.diff
use-system-vigra.diff
use-system-python-modules.diff
-setup-no-import-wx.diff
namespace-package.diff
nosetests.diff
trap-errors-from-pclose.diff
Deleted: packages/gamera/trunk/debian/patches/setup-no-import-wx.diff
===================================================================
--- packages/gamera/trunk/debian/patches/setup-no-import-wx.diff 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/patches/setup-no-import-wx.diff 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,26 +0,0 @@
-Description: don't hardcode Python or wx versions at build time
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2012-04-18
-
---- a/setup.py
-+++ b/setup.py
-@@ -219,15 +219,9 @@
- ##########################################
- # Here's the basic distutils stuff
-
--# read versions from compile computer
--pythonversion = "%d.%d" % (sys.version_info[0],sys.version_info[1])
--import wx
--wx_version_info = wx.__version__.split(".")
--wxversion = "%s.%s" % (wx_version_info[0],wx_version_info[1])
--description = ("This is the Gamera installer.\n" + \
-- "\tPlease ensure that Python " + pythonversion + \
-- " and wxPython " + wxversion + "\n" + \
-- "\tare installed before proceeding.")
-+description = ("This is the Gamera installer. " +
-+ "Please ensure that Python 2.4 and wxPython 2.6.x " +
-+ "(or later) are installed before proceeding.")
-
- includes = [(os.path.join(gamera_setup.include_path, path),
- glob.glob(os.path.join("include", os.path.join(path, ext))))
Modified: packages/gamera/trunk/debian/python-gamera.install
===================================================================
--- packages/gamera/trunk/debian/python-gamera.install 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/python-gamera.install 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,10 +1,10 @@
+usr/lib/python*/*-packages/*.egg-info
+usr/lib/python*/*-packages/gamera/*.py
+usr/lib/python*/*-packages/gamera/*[a-z][a-z].so
+usr/lib/python*/*-packages/gamera/backport/
usr/lib/python*/*-packages/gamera/gui/__init__.py
usr/lib/python*/*-packages/gamera/gui/has_gui.py
-usr/lib/python*/*-packages/gamera/backport/
+usr/lib/python*/*-packages/gamera/plugins/*.py
usr/lib/python*/*-packages/gamera/plugins/*[a-z][a-z].so
-usr/lib/python*/*-packages/gamera/plugins/*.py
+usr/lib/python*/*-packages/gamera/test/* usr/share/gamera/test/
usr/lib/python*/*-packages/gamera/toolkits/
-usr/lib/python*/*-packages/gamera/*[a-z][a-z].so
-usr/lib/python*/*-packages/gamera/*.py
-usr/lib/python*/*-packages/gamera/test/* usr/share/gamera/test/
-usr/lib/python*/*-packages/*.egg-info
Modified: packages/gamera/trunk/debian/rules
===================================================================
--- packages/gamera/trunk/debian/rules 2014-07-08 04:43:58 UTC (rev 29693)
+++ packages/gamera/trunk/debian/rules 2014-07-08 15:02:25 UTC (rev 29694)
@@ -1,4 +1,6 @@
#!/usr/bin/make -f
+#export DH_VERBOSE=1
+#export DEB_BUILD_OPTIONS=nocheck
export HOME = $(CURDIR)/build/
@@ -48,11 +50,11 @@
touch $(@)
build/build-stamp-python%: build/cruft-stamp
- python$(*) setup.py build
+ python$(*) setup.py build --nowx
touch $(@)
build/build-stamp-python%-dbg: build/cruft-stamp
- CFLAGS="$$CFLAGS_noopt" python$(*)-dbg setup.py build
+ CFLAGS="$$CFLAGS_noopt" python$(*)-dbg setup.py build --nowx
touch $(@)
.PHONY: build-indep
@@ -67,7 +69,7 @@
binary: binary-arch binary-indep
build/install-stamp: build/build-stamp
- $(call loop, $(python_all)) setup.py install --prefix=/usr --root=debian/tmp/
+ $(call loop, $(python_all)) setup.py install --prefix=/usr --root=debian/tmp/ --nowx
sed -i -e '1 s,^#!.*,#!/usr/bin/python,' debian/tmp/usr/bin/*
rm -rf debian/tmp/usr/lib/python*/*-packages/gamera/src/
rm -f debian/tmp/usr/bin/gamera_post_install.py
@@ -79,7 +81,7 @@
dh_install -a -X.pyc --fail-missing
dh_installdocs -a
dh_installchangelogs -a
- dh_pysupport -a
+ dh_python2 -a
dh_link -a
dh_compress -a
dh_fixperms -a
@@ -105,7 +107,7 @@
dh_installchangelogs -i
dh_installmenu -i
dh_installman -i
- dh_pysupport -i
+ dh_python2 -i
set -e; cd debian/python-gamera-dev/usr/include/; \
mv $(shell pyversions -d)/gamera .; \
rm -Rf python2.*/; \
@@ -133,9 +135,9 @@
build/doc-stamp: build/build-stamp
cd doc && PYTHONPATH=$(default_pythonpath) python gendoc.py
+ grep -rl sflogo doc/html/ | xargs sed -i 's/<img\ src="http:\/\/sflogo.*downloads"\ \/>/Sourceforge/'
touch $(@)
-
# clean target
# ============
More information about the Python-modules-commits
mailing list