* merged from the debian/sid bzr branch

* Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512)

* python/arfile.cc:
  - use APT::Configuration::getCompressionTypes() instead of duplicating
    the supported methods here
* tests/test_debfile.py:
  - add test for raise on unknown data.tar.xxx
* tests/test_aptsources_ports.py, tests/test_aptsources.py:
  - use tmpdir during the tests to fix test failure with apt from
    experimental
* Upload to unstable
* Increase Breaks for update-notifier to 0.99.3debian9
* utils/get_debian_mirrors.py: Adjust for new Alioth SCM urls
* debian/control: Standards-Version 3.9.2
* Fix Lintian overrides
* Fix spelling errors reported by Lintian (sep[a->e]rated, overrid[d]en)
* po/urd.po: Remove, ur.po is the correct file
* debian/source/format: Add, set it to "3.0 (native)"
* Fix get_changelog in Python 3 (Closes: #626532)
* apt/package.py: fix a few typos [formated->formatted] (Closes: #597054)
* doc/source/tutorials/contributing.rst: minor improvements (Closes: #625225)
  - one typo [2to => 2to3], one broken link [pep8.py link]
* Esperanto (Closes: #626430)

1 files changed, 1 insertions, 1 deletions

diff --git a/python/cdrom.cc b/python/cdrom.cc
index 7f89e9d3..6ac16d59 100644
--- a/python/cdrom.cc
+++ b/python/cdrom.cc
@@ -52,7 +52,7 @@ static PyObject *cdrom_add(PyObject *Self,PyObject *Args)
 static char *cdrom_ident_doc =
     "ident(progress: apt_pkg.CdromProgress) -> str\n\n"
     "Try to identify the CD-ROM and if successful return the hexadecimal\n"
-    "CDROM-ID (and a integer version suffix seperated by -) as a\n"
+    "CDROM-ID (and a integer version suffix separated by -) as a\n"
     "string. Otherwise, return None or raise an error.\n\n"
     "The ID is created by hashing all file and directory names on the\n"
     "CD-ROM and appending the version.";