[Python-modules-commits] [gamera] 15/20: change version to 3.4.2+git20160808.1725654-1 (UNRELEASED) Update source to latest Git snapshot.
Daniel Stender
stender at moszumanska.debian.org
Mon Aug 8 08:55:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
stender pushed a commit to branch master
in repository gamera.
commit 1ab346af34f82a73c08245f276d2cf83d467447e
Merge: caeab75 2736933
Author: Daniel Stender <stender at debian.org>
Date: Mon Aug 8 10:08:35 2016 +0200
change version to 3.4.2+git20160808.1725654-1 (UNRELEASED)
Update source to latest Git snapshot.
ACKNOWLEDGEMENTS | 1 +
CHANGES | 3 +--
README | 6 +++---
debian/.git-dpm | 6 +++---
debian/changelog | 6 ++++++
debian/patches/0001-constant-seed-for-docs.patch | 2 +-
debian/patches/0002-fix-typos.patch | 4 ++--
debian/patches/0003-trap-errors-from-pclose.patch | 2 +-
debian/patches/0004-nosetests.patch | 2 +-
debian/patches/0005-namespace-package.patch | 2 +-
debian/patches/0006-use-system-python-modules.patch | 2 +-
debian/patches/0007-use-system-vigra.patch | 2 +-
debian/patches/0008-fix-paths.patch | 2 +-
debian/patches/0009-gendoc-draw-text.patch | 2 +-
debian/patches/0010-gendoc-use-wxversion.patch | 2 +-
debian/patches/0011-gendoc-no-sflogo.patch | 2 +-
debian/patches/0012-docs-no-modified-timestamp.patch | 8 ++++----
doc/src/html4css1.css | 4 ++--
doc/src/training_tutorial.txt | 2 +-
doc/src/writing_toolkits.txt | 4 ++--
gamera/backport/textwrap.py | 2 +-
gamera/gendoc.py | 15 ++++++++-------
gamera/gui/gui.py | 8 ++++----
gamera/gui/gui_util.py | 9 ++++-----
gamera/knn_editing.py | 2 +-
gamera/plugins/corelation.py | 2 +-
gamera/plugins/deformation.py | 2 +-
include/gameramodule.hpp | 12 ++++++------
include/plugins/binarization.hpp | 2 +-
include/plugins/misc_filters.hpp | 4 +---
include/plugins/threshold.hpp | 2 +-
include/rle_data.hpp | 2 ++
src/graph/graph_structure.cpp | 2 +-
src/imageobject.cpp | 2 +-
src/kdtreemodule.cpp | 2 +-
src/knngamodule.cpp | 6 +++---
src/libtiff/t4.h | 2 +-
src/libtiff/tif_fax3.h | 2 +-
38 files changed, 74 insertions(+), 68 deletions(-)
diff --cc debian/.git-dpm
index 2af5ba3,0000000..6ab3b76
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 937ab5a19d0f9e465cd9b7b0ca2af349aa5733db
- 937ab5a19d0f9e465cd9b7b0ca2af349aa5733db
- 3a53a90968c621d21b36c02a65d74009520f1184
++273693392948feefb2cb51460d56396d0ba275a9
++273693392948feefb2cb51460d56396d0ba275a9
++32c140a3e0078d08c0bd1b55db6f484a306d5d7d
+32c140a3e0078d08c0bd1b55db6f484a306d5d7d
+gamera_3.4.2+git20160808.1725654.orig.tar.bz2
+91d7f43c6ff05049731131771ef5cead80b15689
+4619576
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index f77dc96,0000000..c1d4613
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,434 -1,0 +1,440 @@@
++gamera (3.4.2+git20160808.1725654-1) UNRELEASED; urgency=medium
++
++ * Update source to latest Git snapshot.
++
++ -- Daniel Stender <stender at debian.org> Mon, 08 Aug 2016 10:08:36 +0200
++
+gamera (3.4.2+svn1454-1) unstable; urgency=medium
+
+ * Update source to SVN r1454.
+ * deb/control: bumped Standards-Version to 3.9.8 (no changes needed).
+
+ -- Daniel Stender <stender at debian.org> Tue, 26 Apr 2016 20:35:54 +0200
+
+gamera (3.4.2+svn1445-1) unstable; urgency=medium
+
+ * Update source to SVN r1445:
+ + dropped 0013-update-pil-plugin.patch (applied upstream).
+ * deb/control:
+ + updated maintainer email address.
+ + bumped standards to 3.9.7 (no changes needed).
+ + use HTTPS for Vcs-Git.
+ + removed Testsuite field (deprecated).
+ * deb/copyright: updated, cosmetics.
+ * deb/rules: added BINDNOW to linker flags.
+
+ -- Daniel Stender <stender at debian.org> Sat, 19 Mar 2016 22:31:20 +0100
+
+gamera (3.4.2+svn1437-2) unstable; urgency=medium
+
+ * Added update-pil-plugin.diff (Closes: #806747).
+ * deb/control:
+ + depend on python-pil instead of python-imaging.
+ * deb/rules:
+ + dropped removal of non-deterministic djvu_threshold_plugin_00.png
+ (there's some trigger for multiple non-determinisms in documentation
+ images which haven't been found yet, #785529 reopened).
+ * deb/tests/control:
+ + added depends against python-pil{,-dbg}.
+ + added depends against procps.
+ + reduced line breaks.
+ * Dropped deb/gamera-gui.menu (CTTE #74573).
+
+ -- Daniel Stender <debian at danielstender.com> Tue, 01 Dec 2015 09:07:51 +0100
+
+gamera (3.4.2+svn1437-1) unstable; urgency=medium
+
+ * Updated source to SVN r1437 (Closes: #793967).
+ * deb/rules: just strip non-deterministic djvu_threshold_plugin_00.png
+ for now (Closes: #785529).
+
+ -- Daniel Stender <debian at danielstender.com> Tue, 15 Sep 2015 16:05:11 +0200
+
+gamera (3.4.2+svn1435-1) unstable; urgency=medium
+
+ * Updated source to SVN r1435 (Closes: #785548)
+
+ -- Daniel Stender <debian at danielstender.com> Fri, 05 Jun 2015 16:22:56 +0200
+
+gamera (3.4.2+svn1431-1) unstable; urgency=medium
+
+ * Updated source to SVN r1431 (Closes: #763440, #784795).
+
+ -- Daniel Stender <debian at danielstender.com> Thu, 14 May 2015 12:22:43 +0200
+
+gamera (3.4.2-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Added constant-seed-for-docs.diff to make build reproducible
+ by using constant seed for generation of example/documentation
+ images (Closes: #775228).
+ * Added docs-no-modified-timestamp.diff (Closes: #784680).
+ * deb/control:
+ + added dh-python to build-deps.
+ + updated Vcs fields (moved to git).
+ * deb/copyright: updated.
+ * deb/patches:
+ + fix-typos.diff: corrected path error.
+ + dropped avoid_mktemp.diff, gendoc-version-parsing.diff, suppress-
+ wxdebug-assertion-messages.diff, wxpython3.0-transition.diff (applied
+ upstream).
+ + added gendoc-no-sflogo.diff (dropped sflogo removal from deb/rules).
+ * Added deb/gbp.conf.
+
+ -- Daniel Stender <debian at danielstender.com> Fri, 08 May 2015 14:16:58 +0200
+
+gamera (3.4.1+svn1423-4) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Specified patches Forwarded fields according to DEP-3.
+
+ -- Daniel Stender <debian at danielstender.com> Mon, 08 Dec 2014 01:18:36 +0100
+
+gamera (3.4.1+svn1423-3) experimental; urgency=medium
+
+ * Build dbg on arm64 with different optimization (Closes: #766740).
+ * Some patches toggled forwarded.
+
+ -- Daniel Stender <debian at danielstender.com> Thu, 20 Nov 2014 13:54:10 +0100
+
+gamera (3.4.1+svn1423-2) unstable; urgency=medium
+
+ * Added gendoc-version-parsing.diff (Closes: #767158).
+
+ -- Daniel Stender <debian at danielstender.com> Wed, 12 Nov 2014 09:45:13 +0100
+
+gamera (3.4.1+svn1423-1) unstable; urgency=medium
+
+ * Updated source to SVN rev. 1423.
+ * deb/rules: changed optimizations (Closes: #757168, thanks to Jakub Wilk).
+ * deb/control:
+ + bumped standards to 3.9.6 (no changes needed).
+ + added XS-Testsuite (Closes: #692661, dropped override).
+ + bumped dep of docs on main packages from Suggests to Recommends.
+ * deb/copyright:
+ + removed license for debian/dh_buildid (dropped in previous package).
+ + updated some license short names.
+ * deb/tests/control: removed no-build-needed (non-standard feature).
+ * Corrected bug URL in suppress-wxdebug-assertion-messages.diff.
+ * wrap-and-sort -a -s.
+
+ -- Daniel Stender <debian at danielstender.com> Wed, 08 Oct 2014 14:00:38 +0200
+
+gamera (3.4.1+svn1422-1) unstable; urgency=medium
+
+ * Updated source to SVN rev. 1422 (added doc/src/ to
+ --extend-diff-ignore in deb/sources/options).
+ * bumped python-wxgtk dependencies to 3.0 (Closes: #757208):
+ + updated gendoc-use-wxversion.diff and gendoc-draw-text.diff.
+ + added wxpython3.0-transition.diff.
+ + added suppress-wxdebug-assertion-messages.diff (Closes: #758578).
+ + bumped deps in deb/control.
+ * bumped debhelper level to 9:
+ + changed deb/compat, updated version in d/control.
+ + removed deb/dh_buildid (obsolete).
+ * deb/rules: added -X.txt to dh_compress for docs package (and adjusted
+ .docs-base accordingly).
+
+ -- Daniel Stender <debian at danielstender.com> Tue, 26 Aug 2014 10:00:02 +0200
+
+gamera (3.4.1-1) unstable; urgency=medium
+
+ [ 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.)
+ * Added avoid_mktemp.diff to fix CVE-2014-1937 (Closes: #737324).
+ * Refreshed fix-typos.diff.
+ * deb/control:
+ + Changed maintainer (Closes: #629177).
+ + Changed b-d from libtiff4-dev to libtiff-dev (Closes: #736004).
+ + Removed unnecessary build-dep versions.
+ + Dropped b-d on python_support.
+ + Changed XS-Python-Version to X-Python-Version.
+ + Bump standards version to 3.9.5 (no changes needed).
+ + Relocated Vcs-* fields.
+ + Shortened some short description lines.
+ * Updated deb/copyright, sorted holders, padded, removed trailing commas.
+ * 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.
+ * Added override for inconsistent-testsuite-field (Closes: #692661 wontfix).
+ * 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.
+ + Drop libga-dev from Build-Depends; no longer needed.
+ + Bump minimum required Python version to 2.5.
+ + Add gamera/__compiletime_config__.py to debian/clean.
+ + Update debian/copyright.
+ * 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.
+ * Override HOME, so that ~/.matplotlib/ directory is not left behind.
+ * Set PYTHONHASHSEED=random in debian/rules.
+ * Use canonical URIs for Vcs-* fields.
+
+ -- Daniel Stender <debian at danielstender.com> Fri, 25 Jul 2014 20:59:16 +0200
+
+gamera (3.3.3-2) unstable; urgency=low
+
+ * DEP-8 tests: use $ADTTMP.
+ * Use rdfind instead of fdupes (closes: #678254).
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 04 Jul 2012 16:50:39 +0200
+
+gamera (3.3.3-1) unstable; urgency=low
+
+ * New upstream release.
+ + Drop graphmodule-fix-type-mismatch.diff; applied upstream.
+ + Drop gcc-4.7-compat.diff; applied upstream.
+ + Refresh other patches.
+ * Improve DEP-8 tests:
+ + Redirect nosetests output from stderr to stdout.
+ + Copy tests to a temporary directory; remove rw-build-tree restriction.
+ + Rename them, so that they match binary package names.
+ * Fix compatibility with PIL ≥ 1.2.
+ (pil-import.diff)
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 06 Jun 2012 19:37:21 +0200
+
+gamera (3.3.2-3) unstable; urgency=low
+
+ * Update patch headers.
+ * Set manpage helper executable permissions directly in .debian.tar instead
+ of changing it at build time.
+ * Build -dbg extension modules without optimization.
+ * Bump standards version to 3.9.3.
+ + Update debian/copyright URI.
+ * Build-depend on libpng-dev instead of libpng12-dev (closes: #662340).
+ Thanks to Nobuhiro Iwamatsu for the bug report.
+ * Port the test suite to nose (closes: #664670).
+ + Add patch to fix some incompatibilities.
+ (nosetests.diff)
+ + Build-depend on python-nose instead of python-py.
+ + Update the patch running script.
+ * Cherry-pick upstream patch to fix compatibility with GCC 4.7.
+ (gcc-4.7-compat.diff)
+ * Update the copyright file.
+ * When running tests:
+ + Set sys.path directly in debian/run-tests.py rather than in debian/rules
+ via PYTHONPATH.
+ + Use xargs to iterate over all Python versions.
+ * Run tests in override_dh_auto_test rather than in override_dh_auto_build.
+ * Trap errors from pclose(3) in the test suite.
+ (trap-errors-from-pclose.diff)
+ * Build-depend on procps, as ps(1) is needed for the test suite.
+ * Add DEP-8 tests.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 18 Apr 2012 21:23:21 +0200
+
+gamera (3.3.2-2) unstable; urgency=low
+
+ * Use dpkg-buildflags to set CPPFLAGS.
+ * Move detached debugging symbols to /usr/lib/debug/.build-id/ (using a
+ dedicated dh_buildid script).
+ * Add pre-dependency on dpkg >= 1.15.6 (for data.tar.xz support).
+ * Drop preinst/postrm scripts that were needed to fix #603602.
+ * Create namespace package ‘gamera.toolkit’. This allows
+ python-gamera.toolkit.* packages, both those using dh_python2 and those
+ using python-support, to be co-importable. (namespace-package.diff)
+ * Fix type mismatch in graph initialization code (hopefully closes: #650520;
+ graphmodule-fix-type-mismatch.diff).
+ * Add Built-Using fields to python-gamera and python-gamera-dbg.
+
+ -- Jakub Wilk <jwilk at debian.org> Thu, 08 Dec 2011 01:08:04 +0100
+
+gamera (3.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Export PYTHONWARNINGS=d in debian/rules to enable all warnings in Python
+ code.
+
+ -- Jakub Wilk <jwilk at debian.org> Fri, 23 Sep 2011 20:13:36 +0200
+
+gamera (3.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Drop fix-ftbfs-gcc4.6.diff, applied upstream.
+ * Demote Recommends of the documentation package to Suggests.
+ * Update debian/copyright to the latest DEP-5 version.
+ * Compress binary packages with xz.
+
+ -- Jakub Wilk <jwilk at debian.org> Fri, 26 Aug 2011 02:56:11 +0200
+
+gamera (3.3.0-2) unstable; urgency=low
+
+ * Remove python-stats from Build-Depends (closes: #627726).
+ * Eliminate files with duplicate contents from the documentation package
+ using fdupes and a dedicated script.
+ + Update debian/rules accordingly.
+ + Add fdupes and python (>= 2.5) to Build-Depends-Indep.
+ * Update debian/copyright.
+
+ -- Jakub Wilk <jwilk at debian.org> Thu, 26 May 2011 00:58:45 +0200
+
+gamera (3.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh patches.
+ + Update copyright information.
+ * Use the embedded copy of python-stats again; see bug #620159.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 04 May 2011 15:35:32 +0200
+
+gamera (3.2.7-3) unstable; urgency=low
+
+ * Move python-stats from Build-Depends to Build-Depends-Indep.
+
+ -- Jakub Wilk <jwilk at debian.org> Sat, 30 Apr 2011 16:57:33 +0200
+
+gamera (3.2.7-2) unstable; urgency=low
+
+ * Remove io.py, stats.py and pstat.py from the binary package.
+ (Build-)depend on python-stats instead.
+ * Build-depend on python-py (rather than python-codespeak-lib).
+ * Bump standards version to 3.9.2 (no changes needed).
+ * Add a missing include to fix FTBFS with GCC 4.6 (fix-ftbfs-gcc4.6.diff,
+ LP: #770886).
+
+ -- Jakub Wilk <jwilk at debian.org> Sat, 30 Apr 2011 13:14:37 +0200
+
+gamera (3.2.7-1) unstable; urgency=low
+
+ * New upstream release.
+ + Drop fix-memory-leak-to-raw-string.diff, applied upstream.
+ + Refresh other patches.
+ + Don't hardcode Python or wx versions at build time.
+ (setup-no-import-wx.diff)
+ * Strip file extension from icon name in the desktop file (closes: #609570).
+ Thanks to Daniel Stender for the bug report.
+ * Overhaul debian/rules.
+ * Update debian/copyright to the latest DEP-5 version.
+ * Include full text of CC-BY-SA-3.0 in debian/copyright.
+ * Use dpkg-buildflags to set CFLAGS and LDFLAGS.
+ + Build depend on dpkg-dev (>= 1.15.7).
+ * Update patch headers.
+
+ -- Jakub Wilk <jwilk at debian.org> Fri, 11 Mar 2011 20:40:45 +0100
+
+gamera (3.2.6-3) unstable; urgency=low
+
+ * Remove /usr/include/python2.X/gamera in preinst; otherwise dpkg wouldn't
+ replace directories with symlinks or vice-versa (closes: #603602).
+ * Make all /usr/include/python2.X/gamera symlinks to /usr/include/gamera, so
+ that the preinst script could be dropped post-Squeeze.
+
+ -- Jakub Wilk <jwilk at debian.org> Mon, 22 Nov 2010 17:31:24 +0100
+
+gamera (3.2.6-2) unstable; urgency=low
+
+ * Bump standards version to 3.9.1 (no changes needed).
+ * Update patch headers.
+ * Fix memory leak in the _to_raw_string() method (closes: #601597).
+ (fix-memory-leak-to-raw-string.diff)
+
+ -- Jakub Wilk <jwilk at debian.org> Sat, 13 Nov 2010 15:19:41 +0100
+
+gamera (3.2.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + Refresh patches.
+ + Update debian/copyright.
+ * Fix FTBFS with nostrip build option.
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 08 Jun 2010 22:39:54 +0200
+
+gamera (3.2.5-1) unstable; urgency=low
+
+ * New upstream release:
+ + Drop fix-unaligned-access.diff, tiff-support-64bit.diff,
+ png-support-libpng.diff; all applied upstream.
+ + Refresh the remaining patches.
+ + Update debian/copyright.
+ * Let gamera-dbg only recommend (instead of depending on) python-dbg, as the
+ package can be useful even without the latter.
+ * Move other *-dbg packages from gamera-dbg's Recommends: to Suggests:, as
+ it's unlikely they will be helpful in debugging problems with Gamera.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 14 Apr 2010 17:35:50 +0200
+
+gamera (3.2.4-2) unstable; urgency=medium
+
+ * Fix two RC bugs affecting testing (hence urgency=medium):
+ * Link _png_support.so with libpng on all Unix architectures (closes:
+ #570809). (png-support-libpng.diff)
+ * Fix unaligned memory access in the generated C code (closes: #570953).
+ (fix-unaligned-access.diff)
+ * Really remove upstream-applied patches from the source package.
+ * Replace patch fixing TIFF export with the one applied upstream.
+ * Make gamera-gui recommend python-docutils, as it's needed to display
+ context help.
+ * Update debian/copyright.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 24 Feb 2010 16:47:16 +0100
+
+gamera (3.2.4-1) unstable; urgency=low
+
+ * New upstream release (closes: #569820).
+ + Enabling “auto-move to next unclassified glyph” no longer triggers
+ IndexError exceptions (closes: #555160).
+ + Drop gui-classifier-glyphs-pane.diff, gui-help-typo.diff,
+ gendoc-source-path.diff, callbackset-unpickle.diff: all applied
+ upstream.
+ + Refresh use-system-modules.diff.
+ * Run tests at build time.
+ + Build-depend on python-codespeak-lib, python-imaging,
+ python-imaging-dbg, python-docutils and python-pygments.
+ + Clean tests/tmp/* files.
+ * Fix TIFF export on 64-bit machines (closes: #570559).
+
+ -- Jakub Wilk <jwilk at debian.org> Sun, 21 Feb 2010 11:45:14 +0100
+
+gamera (3.2.3-2) unstable; urgency=low
+
+ * Provide detached symbols in the *-dbg package.
+ * Switch to source format 3.0 (quilt).
+ * Make python-gamera-dev “Architecture: all”.
+ * Add stricter internel dependencies between python-gamera and
+ python-gamera-dev/gamera-gui.
+ * Update debian/copyright in accordance to the latest DEP-5 version.
+ * Use “XSPV: >= 2.4”, as recent Python Policy frowns on “XSPV: all”.
+ * Move the gamera.gui.has_gui module to the python-gamera package.
+ * Add Debian menu entry.
+ * Add freedesktop.org desktop entry.
+ * Cherry-pick fixes from the upstream VCS:
+ - Work around python-docutils bug, which broke documentation generation
+ (closes: #563139). (gendoc-source-path.diff)
+ - Make gamera.util.CallbackSet objects unpicklable (closes: #555089).
+ - The sets module is deprecated in Python 2.6. Use set objects, rather than
+ sets.Set objects (updated use-system-modules.diff).
+ - Fix a typo in the gamera_gui help text (gui-help-typo.diff).
+ - Fix display of classifier glyphs when adding glyphs to the classifier
+ (closes: #555203).
+ * Bump standards version to 3.8.4 (no changes needed).
+ * Update my e-mail address.
+ * Update dates in debian/copyright.
+
+ -- Jakub Wilk <jwilk at debian.org> Sun, 31 Jan 2010 17:54:45 +0100
+
+gamera (3.2.3-1) unstable; 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).
+ * Use a prebuilt image for the draw_text plugin documentation example if
+ X server is not available (gendoc-draw-text.diff).
+
+ -- Jakub Wilk <ubanus at users.sf.net> Fri, 09 Oct 2009 21:18:01 +0200
diff --cc debian/patches/0001-constant-seed-for-docs.patch
index 89821f5,0000000..e70887e
mode 100644,000000..100644
--- a/debian/patches/0001-constant-seed-for-docs.patch
+++ b/debian/patches/0001-constant-seed-for-docs.patch
@@@ -1,96 -1,0 +1,96 @@@
- From 12f29f9aafb7f4c458410b86ededb0f324bd5a17 Mon Sep 17 00:00:00 2001
++From 3a711c7300b04e122717945b5556cd931cfa4050 Mon Sep 17 00:00:00 2001
+From: Reiner Herrmann <reiner at reiner-h.de>
+Date: Sat, 17 Oct 2015 18:38:46 +0200
+Subject: constant-seed-for-docs
+
+ Use constant seed for example images. Importing random will seed the prng
+ with the current system time, which will produce different example images
+ on every build. To make the build reproducible, use a constant seed value.
+ Author: Reiner Herrmann <reiner at reiner-h.de>
+ Bug: https://bugs.debian.org/775228
+ Forwarded: no
+---
+ gamera/plugins/draw.py | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/gamera/plugins/draw.py b/gamera/plugins/draw.py
+index 006d1f6..39ce1ab 100644
+--- a/gamera/plugins/draw.py
++++ b/gamera/plugins/draw.py
+@@ -61,8 +61,9 @@ class draw_marker(PluginFunction):
+ author = "Michael Droettboom"
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ points = [(randint(0, 100), randint(0, 100)) for x in range(4)]
+ image.draw_bezier(*tuple(list(points) + [RGBPixel(255, 0, 0), 0.1]))
+@@ -106,8 +107,9 @@ class draw_line(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ for i in range(10):
+ image.draw_line((randint(0, 100), randint(0, 100)),
+@@ -160,8 +162,9 @@ class draw_hollow_rect(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ for i in range(10):
+ image.draw_hollow_rect((randint(0, 100), randint(0, 100)),
+@@ -199,8 +202,9 @@ class draw_filled_rect(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ for i in range(10):
+ image.draw_filled_rect((randint(0, 100), randint(0, 100)),
+@@ -244,8 +248,9 @@ class draw_bezier(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ for i in range(10):
+ image.draw_bezier((randint(0, 100), randint(0, 100)),
+@@ -292,8 +297,9 @@ class draw_circle(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(100, 100), RGB, DENSE)
+ for i in range(10):
+ image.draw_circle((randint(0, 100), randint(0, 100)),
+@@ -447,8 +453,9 @@ class draw_text(PluginFunction):
+ __call__ = staticmethod(__call__)
+
+ def __doc_example1__(images):
+- from random import randint
++ from random import randint, seed
+ from gamera.core import Image, Dim
++ seed(0)
+ image = Image((0, 0), Dim(320, 300), RGB, DENSE)
+
+ # These are some various Unicode encoded names of different
diff --cc debian/patches/0002-fix-typos.patch
index b8b0ec9,0000000..a8315f0
mode 100644,000000..100644
--- a/debian/patches/0002-fix-typos.patch
+++ b/debian/patches/0002-fix-typos.patch
@@@ -1,458 -1,0 +1,458 @@@
- From 3e4b420c401cf28d125721e1312e28c42effaa75 Mon Sep 17 00:00:00 2001
++From f1182446b5ca02bc3de85546a6219dd71b4d1fe2 Mon Sep 17 00:00:00 2001
+From: Jakub Wilk <jwilk at debian.org>
+Date: Sat, 17 Oct 2015 18:40:27 +0200
+Subject: fix-typos
+
+ fix spelling mistakes
+ Forwarded: no
+---
+ INSTALL | 26 +++++++++++++-------------
+ doc/src/ga_optimization.txt | 2 +-
+ doc/src/install.txt | 20 ++++++++++----------
+ doc/src/kdtree.txt | 2 +-
+ doc/src/plugins_custom_types.txt | 2 +-
+ gamera/gui/gaoptimizer/SettingsPanel.py | 16 ++++++++--------
+ gamera/knn.py | 4 ++--
+ gamera/plugins/image_conversion.py | 2 +-
+ src/eodev/utils/eoParser.cpp | 2 +-
+ src/knnga.cpp | 2 +-
+ src/knngamodule.cpp | 26 +++++++++++++-------------
+ src/pointobject.cpp | 2 +-
+ 12 files changed, 53 insertions(+), 53 deletions(-)
+
+diff --git a/INSTALL b/INSTALL
+index 5cf45de..fd2db9c 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -39,7 +39,7 @@ Prerequisites
+ 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 @@ 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
+ 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 @@ on your system for some reason, you can switch it off with::
+ python setup.py build --openmp=no
+
+
+-Installing without root priviledges
+------------------------------------
++Installing without root privileges
++----------------------------------
+
+ .. _without_root:
+
+@@ -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
+-priviledges (such as your home directory)::
++privileges (such as your home directory)::
+
+ mkdir ~/python
+
+@@ -276,7 +276,7 @@ To build Gamera, open a terminal and type::
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo pythonw setup.py install
+
+@@ -308,11 +308,11 @@ to your search PATH, or install the scripts to ``/usr/bin`` with::
+ ``/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.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+@@ -372,7 +372,7 @@ To build Gamera, open a X11 terminal and type::
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo python setup.py install
+
+@@ -385,11 +385,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.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+diff --git a/doc/src/ga_optimization.txt b/doc/src/ga_optimization.txt
+index 31a47b3..8b55d8f 100644
+--- a/doc/src/ga_optimization.txt
++++ b/doc/src/ga_optimization.txt
+@@ -8,7 +8,7 @@ Introduction
+ Feature Selection, Weighting and Genetic Algorithms
+ '''''''''''''''''''''''''''''''''''''''''''''''''''
+
+-Feature selection is the techique of selecting a subset of good features
++Feature selection is the technique of selecting a subset of good features
+ 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
+diff --git a/doc/src/install.txt b/doc/src/install.txt
+index 40a248c..7dbf87e 100644
+--- a/doc/src/install.txt
++++ b/doc/src/install.txt
+@@ -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 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::
+@@ -56,7 +56,7 @@ on your system for some reason, you can switch it off with::
+ python setup.py build --openmp=no
+
+
+-Installing without root priviledges
++Installing without root privileges
+ -----------------------------------
+
+ .. _without_root:
+@@ -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
+-priviledges (such as your home directory)::
++privileges (such as your home directory)::
+
+ mkdir ~/python
+
+@@ -157,7 +157,7 @@ To build Gamera, open a terminal and type::
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo pythonw setup.py install
+
+@@ -194,11 +194,11 @@ to your search PATH, or install the scripts to ``/usr/bin`` with::
+ ``/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.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+@@ -258,7 +258,7 @@ To build Gamera, open a X11 terminal and type::
+
+ python setup.py build
+
+-and then to install (you'll need to have admin priviledges)::
++and then to install (you'll need to have admin privileges)::
+
+ sudo python setup.py install
+
+@@ -271,11 +271,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.
++privileges`__ can also be used on Mac OS-X.
+
+ __ without_root_
+
+@@ -404,7 +404,7 @@ in the Explorer, or from the DOS command prompt with::
+ 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)::
+
+diff --git a/doc/src/kdtree.txt b/doc/src/kdtree.txt
+index 500998a..84e2f75 100644
+--- a/doc/src/kdtree.txt
++++ b/doc/src/kdtree.txt
+@@ -132,7 +132,7 @@ Each kd-tree is represented by instances of the ``KdTree`` class.
+ 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
+-consequence that tree nodes must be passed to the contructor of
++consequence that tree nodes must be passed to the constructor of
+ ``KdTree``.
+
+ A ``KdTree`` has the following (read only) properties:
+diff --git a/doc/src/plugins_custom_types.txt b/doc/src/plugins_custom_types.txt
+index ed0e146..a2a27d5 100644
+--- a/doc/src/plugins_custom_types.txt
++++ b/doc/src/plugins_custom_types.txt
+@@ -226,7 +226,7 @@ wrapper of the form:
+ self.property2 = mc.property2
+ # ...
+
+- # the plugin implementing the actual contructor of MyClass
++ # the plugin implementing the actual constructor of MyClass
+ class create_myclass(PluginFunction):
+ self_type = None
+ args = Args([Int("arg1"), Real("arg2")])
+diff --git a/gamera/gui/gaoptimizer/SettingsPanel.py b/gamera/gui/gaoptimizer/SettingsPanel.py
+index 13b1ac5..7d8a70b 100644
+--- a/gamera/gui/gaoptimizer/SettingsPanel.py
++++ b/gamera/gui/gaoptimizer/SettingsPanel.py
+@@ -301,7 +301,7 @@ class SettingsPanel(wx.ScrolledWindow):
+ elif expertWidget.GetName() == "randomSelection":
+ selection.setRandomSelection()
+ else:
+- raise RuntimeError("Unknown selection method choosen")
++ raise RuntimeError("Unknown selection method chosen")
+
+ # Crossover GA settings
+ cross = knnga.GACrossover()
+@@ -323,10 +323,10 @@ class SettingsPanel(wx.ScrolledWindow):
+ cross.setHypercubeCrossover(self.frame.classifier.num_features, 0.0, 1.0, \
+ self.crossoverPanel.hypercubeCrossoverAlpha.GetValue())
+ else:
+- raise RuntimeError("Unknown crossover method choosen")
++ raise RuntimeError("Unknown crossover method chosen")
+ crossOpSet = True
+ if not crossOpSet:
+- raise RuntimeError("At least one crossover operator must be choosen")
++ raise RuntimeError("At least one crossover operator must be chosen")
+
+ # Mutation GA settings
+ muta = knnga.GAMutation()
+@@ -347,10 +347,10 @@ class SettingsPanel(wx.ScrolledWindow):
+ self.mutationPanel.gaussMutationSigma.GetValue(), \
+ self.mutationPanel.gaussMutationPchance.GetValue())
+ else:
+- raise RuntimeError("Unknown mutation method choosen")
++ raise RuntimeError("Unknown mutation method chosen")
+ mutOpSet = True
+ if not mutOpSet:
+- raise RuntimeError("At least one mutation operator must be choosen")
++ raise RuntimeError("At least one mutation operator must be chosen")
+
+ # Replacement GA settings
+ replacement = knnga.GAReplacement()
+@@ -364,7 +364,7 @@ class SettingsPanel(wx.ScrolledWindow):
+ elif expertWidget.GetName() == "SSGAdetTournament":
+ replacement.setSSGAdetTournament(self.replacementPanel.ssgaDetTourTsize.GetValue())
+ else:
+- raise RuntimeError("Unknown replacement method choosen")
++ raise RuntimeError("Unknown replacement method chosen")
+
+ # Stop Criteria GA settings
+ stop = knnga.GAStopCriteria()
+@@ -382,10 +382,10 @@ class SettingsPanel(wx.ScrolledWindow):
+ stop.setSteadyStateStop(self.stopCriteriaPanel.steadyContinueMin.GetValue(), \
+ self.stopCriteriaPanel.steadyContinueNoChange.GetValue())
+ else:
+- raise RuntimeError("Unknown stop criteria choosen")
++ raise RuntimeError("Unknown stop criteria chosen")
+ stopCritSet = True
+ if not stopCritSet:
+- raise RuntimeError("At least one stop criteria must be choosen")
++ raise RuntimeError("At least one stop criteria must be chosen")
+
+ # Parallelization GA settings
+ para = knnga.GAParallelization()
+diff --git a/gamera/knn.py b/gamera/knn.py
+index 53d7b1a..9f148e3 100644
+--- a/gamera/knn.py
++++ b/gamera/knn.py
+@@ -458,7 +458,7 @@ Set the selection vector elements by the corresponding feature name.
+ described in get_selections_by_features.
+
+ The dictionary must contain an entry for every feature of the currently
+-active feature set, that has been set in the contructor of the classifier or
++active feature set, that has been set in the constructor of the classifier or
+ by *change_feature_set*. Example:
+
+ .. code:: Python
+@@ -499,7 +499,7 @@ Set the selection vector elements for one specific feature.
+
+ Set the weighing vector elements by the corresponding feature name.
+ The dictionary must contain an entry for every feature of the currently
+-active feature set, that has been set in the contructor of the classifier or
++active feature set, that has been set in the constructor of the classifier or
+ by *change_feature_set*. Example:
+
+ .. code:: Python
+diff --git a/gamera/plugins/image_conversion.py b/gamera/plugins/image_conversion.py
+index a1ecbe4..5a8b745 100644
+--- a/gamera/plugins/image_conversion.py
++++ b/gamera/plugins/image_conversion.py
+@@ -23,7 +23,7 @@ import image_utilities, _image_conversion
+
+ class to_rgb(PluginFunction):
+ """
+- Converts the given image to an RGB image according to teh following rules:
++ Converts the given image to an RGB image according to the following rules:
+
+ - for ONEBIT images, 0 is mapped to (255,255,255) and everything else to (0,0,0)
+ - for GREYSCALE and GREY16 images, R=G=B
+diff --git a/src/eodev/utils/eoParser.cpp b/src/eodev/utils/eoParser.cpp
+index cc306bf..d2ee5c2 100644
+--- a/src/eodev/utils/eoParser.cpp
++++ b/src/eodev/utils/eoParser.cpp
+@@ -82,7 +82,7 @@ eoParser::eoParser ( unsigned _argc, char **_argv , string _programDescription,
+ programDescription( _programDescription),
+ needHelpMessage( false ),
+ needHelp(false, "help", "Prints this message", 'h'),
+- stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unkown param entered", '\0')
++ stopOnUnknownParam(true, "stopOnUnknownParam", "Stop if unknown param entered", '\0')
+ {
+ // need to process the param file first
+ // if we want command-line to have highest priority
+diff --git a/src/knnga.cpp b/src/knnga.cpp
+index 8efaadd..775dc5c 100644
+--- a/src/knnga.cpp
++++ b/src/knnga.cpp
+@@ -558,7 +558,7 @@ void GAOptimization<EOT>::StartCalculation() {
+
+ // adjust the individual size for the case of weighting with
+ // prior deselected features and build an index relation map
+- // for futher index mapping
++ // for further index mapping
+ unsigned int indiLength = (unsigned int)this->knn->num_features;
+ std::map<unsigned int, unsigned int> indexRelation;
+ unsigned int indiIndex = 0;
+diff --git a/src/knngamodule.cpp b/src/knngamodule.cpp
- index 26b6200..c508529 100644
++index 2fb5b87..b69ab5d 100644
+--- a/src/knngamodule.cpp
++++ b/src/knngamodule.cpp
+@@ -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"
+- "Only one selection method can be choosen. Multiple settings will "
++ "Only one selection method can be chosen. Multiple settings will "
+ "override each other.";
+
+ PyType_Ready(&GASelectionType);
+@@ -556,9 +556,9 @@ PyMethodDef GACrossover_methods[] = {
+ " the number of used features. Usually this value is set to "
+ "``classifier.num_features``.\n"
... 789 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gamera.git
More information about the Python-modules-commits
mailing list