Yaroslav Halchenko 6c9cfc53da Merge commit '8a06a2277366d01c5e7e25d3ded0f04ba9aa0b85' into debian ...

* commit '8a06a2277366d01c5e7e25d3ded0f04ba9aa0b85': (1124 commits)
  Development guidelines moved.
  Replace mentions of old package name.
  New upstream release.
  DOC: fix indent
  PEP8
  PEP8: fix indentation
  DOC: add missing import
  DOC: no import numpy in doc
  MAINT: matplotlib is in requierements.txt
  MAINT: unused import
  PEP8: comparison
  Fix deprecated function name in example
  Improve example of warp function to show all available options
  Add support for matrix as inverse_map
  Add note about internal usage of transformation matrix
  Only clip for ndimage.map_coordinates case
  Misc doc string fixes
  Remove call to deprecated is_gray function
  Fix dtype bug in perimeter
  Raise error for non 2-D images
  ...

Conflicts:
	debian/changelog
	debian/control

2013-11-22 15:14:34 -05:00

..

patches

fix navbar links in documentation

2013-06-10 21:21:46 +02:00

source

Merge branch 'yarik_debian' into debian

2012-05-02 23:23:43 -07:00

tests

add python3 packages

2013-06-10 22:57:10 +02:00

changelog

Merge commit '8a06a2277366d01c5e7e25d3ded0f04ba9aa0b85' into debian

2013-11-22 15:14:34 -05:00

compat

add python3 packages

2013-06-10 22:57:10 +02:00

control

Merge commit '8a06a2277366d01c5e7e25d3ded0f04ba9aa0b85' into debian

2013-11-22 15:14:34 -05:00

copyright

Replace mentions of old package name.

2013-10-05 13:34:39 +02:00

gbp.conf

PKG: rudimentary gbp.conf to ease building with git-buildpackage

2012-05-03 21:41:28 -04:00

python3-skimage-lib.install

add python3 packages

2013-06-10 22:57:10 +02:00

python3-skimage.install

add python3 packages

2013-06-10 22:57:10 +02:00

python-skimage-doc.doc-base

Replace mentions of old package name.

2013-10-05 13:34:39 +02:00

python-skimage-doc.docs

PKG: Move any handing of docs under if_nodoc, no need for custom mv if there is .docs

2012-05-03 21:41:28 -04:00

python-skimage-doc.links

PKG: fixed forgotten scikits.statsmodels reference ;-)

2012-05-03 21:41:28 -04:00

python-skimage-lib.install

add python3 packages

2013-06-10 22:57:10 +02:00

python-skimage.install

add python3 packages

2013-06-10 22:57:10 +02:00

python-skimage.manpages

PKG: actually install the pre-crafted manpage

2012-05-03 21:41:28 -04:00

rules

Merge commit '8a06a2277366d01c5e7e25d3ded0f04ba9aa0b85' into debian

2013-11-22 15:14:34 -05:00

skivi.1

Replace mentions of old package name.

2013-10-05 13:34:39 +02:00

watch

fixed up watch for rename of the project

2012-12-01 22:13:07 -05:00