From 0cc89c97a0bed8aa29f65ee0aa1e14ca9b0f2bd4 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sat, 5 Oct 2013 13:30:00 +0200
Subject: [PATCH] Replace mentions of old package name.

---
 debian/changelog                   |  1 +
 debian/control                     | 12 ++++++------
 debian/copyright                   |  6 +++---
 debian/python-skimage-doc.doc-base |  8 ++++----
 debian/skivi.1                     |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 729d4e46..c8752680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 skimage (0.9.0-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #693523).
+  * Replace mentions of old package name.
 
  -- Stefan van der Walt <stefan@sun.ac.za>  Sat, 05 Oct 2013 13:21:19 +0200
 
diff --git a/debian/control b/debian/control
index 2449bba4..6881ef45 100644
--- a/debian/control
+++ b/debian/control
@@ -16,9 +16,9 @@ Build-Depends: debhelper (>= 7.0.50),
                python-support
 Standards-Version: 3.9.4
 XS-Python-Version: >= 2.6
-Homepage: http://scikits-image.org
-Vcs-Browser: https://github.com/scikits-image/scikits-image
-Vcs-Git: git://github.com/scikits-image/scikits-image.git
+Homepage: http://scikit-image.org
+Vcs-Browser: https://github.com/scikit-image/scikit-image
+Vcs-Git: git://github.com/scikit-image/scikit-image.git
 
 Package: python-skimage
 Architecture: all
@@ -31,7 +31,7 @@ Provides: ${python:Provides}
 Recommends: python-nose, python-matplotlib (>= 1.0), python-imaging, python-qt4
 Suggests: python-skimage-doc, python-opencv
 Description: Python modules for image processing
- scikits-image is a collection of image processing algorithms for
+ scikit-image is a collection of image processing algorithms for
  Python.  It performs tasks such as image loading, filtering,
  morphology, segmentation, color conversions, and transformations.
 
@@ -40,7 +40,7 @@ Architecture: all
 Section: doc
 Depends: ${misc:Depends}, libjs-jquery
 Suggests: python-skimage
-Description: Documentation and examples for scikits-image
+Description: Documentation and examples for scikit-image
  This package contains documentation and example scripts for
  python-skimage.
 
@@ -50,6 +50,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-numpy
 Recommends: python-skimage
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
-Description: Optimized low-level algorithms for scikits-image
+Description: Optimized low-level algorithms for scikit-image
  This is an add-on package for python-skimage. It provides
  optimized, low-level implementations of algorithms.
diff --git a/debian/copyright b/debian/copyright
index 039fce1f..621c0107 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: scikits-image
+Upstream-Name: scikit-image
 Upstream-Contact: Stéfan van der Walt <stefan@sun.ac.za>
-Source: http://github.com/scikits-image/scikits-image
+Source: http://github.com/scikit-image/scikit-image
 
 Files: *
-Copyright: 2009-2013, the scikits-image team
+Copyright: 2009-2013, the scikit-image team
 License: BSD-3
 
 Files: doc/sphinxext/docscrape.py doc/sphinxext/docscrape_sphinx.py
diff --git a/debian/python-skimage-doc.doc-base b/debian/python-skimage-doc.doc-base
index c4edf62b..5abe301a 100644
--- a/debian/python-skimage-doc.doc-base
+++ b/debian/python-skimage-doc.doc-base
@@ -1,7 +1,7 @@
-Document: scikits-image
-Title: scikits-image User Manual
-Author: scikits-image developers
-Abstract: This manual describes features of scikits-image, provides
+Document: scikit-image
+Title: scikit-image User Manual
+Author: scikit-image developers
+Abstract: This manual describes features of scikit-image, provides
  examples, API reference, and a user guide.
 Section: Science/Data Analysis
 
diff --git a/debian/skivi.1 b/debian/skivi.1
index 802134ef..e4fc6cd9 100644
--- a/debian/skivi.1
+++ b/debian/skivi.1
@@ -17,12 +17,12 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-skivi \- a scikits-image viewer
+skivi \- a scikit-image viewer
 .SH SYNOPSIS
 .B skivi
 .I "filename"
 .SH DESCRIPTION
-An image viewer built on the scikits-image QT display plugin, that allows
+An image viewer built on the scikit-image QT display plugin, that allows
 adjusting color balance, exposure, etc.
 
 \fBskivi\fP is a convenience wrapper around the following code:
@@ -36,5 +36,5 @@ adjusting color balance, exposure, etc.
   io.imshow(image, fancy=True)
 .fi
 .SH AUTHOR
-The scikits-image team: http://skimage.org
+The scikit-image team: http://scikit-image.org