Fix typos reported by codespell & spellintian

No user-visible change as it effects mostly code comments and
not a single error message, manpage or similar.

Reported-By: codespell & spellintian
Gbp-Dch: Ignore

12 files changed, 28 insertions, 16 deletions

diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index 6776f96ef..34621a2b8 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -34,7 +34,7 @@ namespace Configuration {							/*{{{*/
 	 *  in the Dir::Bin group.
 	 *
 	 *  \param Cached saves the result so we need to calculated it only once
-	 *                this parameter should ony be used for testing purposes.
+	 *                this parameter should only be used for testing purposes.
 	 *
 	 *  \return a vector of the compression types in the preferred usage order
 	 */
@@ -57,9 +57,9 @@ namespace Configuration {							/*{{{*/
 	 *
 	 *  \param All return all codes or only codes for languages we want to use
 	 *  \param Cached saves the result so we need to calculated it only once
-	 *                this parameter should ony be used for testing purposes.
+	 *                this parameter should only be used for testing purposes.
 	 *  \param Locale don't get the locale from the system but use this one instead
-	 *                this parameter should ony be used for testing purposes.
+	 *                this parameter should only be used for testing purposes.
 	 *
 	 *  \return a vector of (all) Language Codes in the preferred usage order
 	 */
@@ -77,7 +77,7 @@ namespace Configuration {							/*{{{*/
 	/** \brief Returns a vector of Architectures we support
 	 *
 	 *  \param Cached saves the result so we need to calculated it only once
-	 *                this parameter should ony be used for testing purposes.
+	 *                this parameter should only be used for testing purposes.
 	 *
 	 *  \return a vector of Architectures in preferred order
 	 */
@@ -108,7 +108,7 @@ namespace Configuration {							/*{{{*/
 	/** \brief Return a vector of Compressors supported for data.tar's
 	 *
 	 *  \param Cached saves the result so we need to calculated it only once
-	 *                this parameter should ony be used for testing purposes.
+	 *                this parameter should only be used for testing purposes.
 	 *
 	 *  \return a vector of Compressors
 	 */
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 157f6139e..b00fc7318 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -479,7 +479,7 @@ APT_IGNORE_DEPRECATED_POP
 		return FromTask(Cache, pattern, helper);
 	}
 
-	/** \brief returns all packages in the cache whose name matchs a given pattern
+	/** \brief returns all packages in the cache whose name matches a given pattern
 
 	    A simple helper responsible for executing a regular expression on all
 	    package names in the cache. Optional it prints a notice about the
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 7c016a5e7..510f2d3f0 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -413,7 +413,7 @@ bool pkgDepCache::CheckDep(DepIterator const &Dep,int const Type,PkgIterator &Re
 									/*}}}*/
 // DepCache::AddSizes - Add the packages sizes to the counters		/*{{{*/
 // ---------------------------------------------------------------------
-/* Call with Inverse = true to perform the inverse opration */
+/* Call with Inverse = true to perform the inverse operation */
 void pkgDepCache::AddSizes(const PkgIterator &Pkg, bool const Inverse)
 {
    StateCache &P = PkgState[Pkg->ID];
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 22693d2a2..ab0474fac 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -249,7 +249,7 @@ bool pkgInitConfig(Configuration &Cnf)
    return good;
 }
 									/*}}}*/
-// pkgInitSystem - Initialize the _system calss				/*{{{*/
+// pkgInitSystem - Initialize the _system class				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 670b5e2bd..a826f2853 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -12,7 +12,7 @@
 
    This is a modified version of Manoj's Routine B. It consists of four
    independent ordering algorithms that can be applied at for different
-   points in the ordering. By appling progressivly fewer ordering
+   points in the ordering. By applying progressivly fewer ordering
    operations it is possible to give each consideration it's own
    priority and create an order that satisfies the lowest applicable
    consideration.
@@ -562,7 +562,7 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
 // OrderList::VisitNode - Recursive ordering director			/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the core ordering routine. It calls the set dependency
-   consideration functions which then potentialy call this again. Finite
+   consideration functions which then potentially call this again. Finite
    depth is achieved through the colouring mechinism. */
 bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
 {
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index c4dc50a10..8b59c43de 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -133,7 +133,7 @@ class pkgTagSection
     * @param MaxLength is the size of valid data in the stream pointed to by Start
     * @param Restart if enabled internal state will be cleared, otherwise it is
     *  assumed that now more data is available in the stream and the parsing will
-    *  start were it encountered insufficent data the last time.
+    *  start were it encountered insufficient data the last time.
     *
     * @return \b true if section end was found, \b false otherwise.
     *  Beware that internal state will be inconsistent if \b false is returned!
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9b64e285e..39855e05a 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -13,7 +13,7 @@
       update - Resyncronize the package files from their sources
       upgrade - Smart-Download the newest versions of all packages
       dselect-upgrade - Follows dselect's changes to the Status: field
-                       and installes new and removes old packages
+                       and installs new and removes old packages
       dist-upgrade - Powerful upgrader designed to handle the issues with
                     a new distribution.
       install - Download and install a given package (by name, not by .deb)
diff --git a/debian/changelog b/debian/changelog
index ae7c3e941..ec759a31d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,7 +55,7 @@ apt (1.7.0~alpha1) experimental; urgency=medium
   * Extend apt build-dep pkg/release to switch dep as needed
   * Support release selector for volatile files as well
   * Start pkg records for deb files with dpkg output
-  * Deprectate buggy/incorrect Rls/PkgFile::IsOk methods
+  * Deprecate buggy/incorrect Rls/PkgFile::IsOk methods
   * Support --with-source in show & search commands
   * Support local files as arguments in show command (Closes: 883206)
   * Drop alternative URIs we got a hash-based fail from
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index 20903652a..1890c28d0 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -401,7 +401,7 @@ bool CacheDB::LoadContents(bool const &GenOnly)
    return true;
 }
 									/*}}}*/
-// CacheDB::GetHashes - Get the hashs					/*{{{*/
+// CacheDB::GetHashes - Get the hashes					/*{{{*/
 static std::string bytes2hex(uint8_t *bytes, size_t length) {
    char buf[3];
    std::string space;
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 61489f73a..dbc097af6 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -291,7 +291,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath,
 			unsigned long long &DeLinkBytes,
 			unsigned long long const &FileSize)
 {
-   // See if this isn't an internaly prefix'd file name.
+   // See if this isn't an internally prefix'd file name.
    if (InternalPrefix.empty() == false &&
        InternalPrefix.length() < FileName.length() && 
        stringcmp(FileName.begin(),FileName.begin() + InternalPrefix.length(),
diff --git a/prepare-release b/prepare-release
index d62212eff..3a5281f89 100755
--- a/prepare-release
+++ b/prepare-release
@@ -235,21 +235,33 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then
 		echo '### codespell in source directories:'
 		codespell --enable-colors $(find . -mindepth 1 -maxdepth 1 -type d \! -name '.git' \! -name 'doc' \! -name 'po' \! -name 'build' \! -name 'test') \
 			| grep -v -e '^.*debian/changelog.*Troup.*==>.*Troupe.*$' \
+				-e '^.*debian/changelog.*readd.*==>.*readd.*$' \
+				-e '^.*debian/changelog.*Tim.*==>.*Time.*$' \
 				-e '^.*apt-pkg/contrib/fileutl\.cc.*creat.*==>.*create.*$' \
+				-e '^.*apt-pkg/pkgcache\.h.*mmaped.*==>.*mapped.*$' \
+				-e '^.*apt-pkg/pkgcachegen\.cc.*mmaped.*==>.*mapped.*$' \
+				-e '^.*apt-pkg/contrib/mmap\.h.*mmaped.*==>.*mapped.*$' \
+				-e '^.*cmdline/apt-key\.in.*dashs.*==>.*dashes.*$' \
 				-e '^.*methods/aptmethod\.h.*creat.*==>.*create.*$' \
 				-e '^.*dselect/install.*ans.*==>.*and.*$' \
+				-e '^.*ftparchive/writer\.h.*Delink.*==>.*Unlink.*$' \
+				-e '^.*ftparchive/writer\.cc.*De[Ll]ink.*==>.*[Uu]nlink.*$' \
 			|| true
 		echo '### codespell in testcases:'
 		codespell --enable-colors $(find test -type f \! -name 'status-*' \! -name 'Packages-*' \! -name '*.deb' \! -name '*.sec' \! -name '*.pub' \! -name '*.db') \
 			| grep -v -e '^.*test/libapt/file-helpers\.cc.*creat.*==>.*create.*$' \
 				-e '^.*test/libapt/tagfile_test\.cc.*tyes.*==>.*types.*$' \
 				-e '^.*test/libapt/strutil_test\.cc.*Fiel.*==>.*Feel.*$' \
+				-e '^.*test/libapt/cdromfindpackages_test\.cc.*Signatur.*==>.*Signature.*$' \
 				-e '^.*test/integration/skip-bug-601016-description-translation.*Paket.*==>.*Packet.*$' \
 				-e '^.*test/integration/skip-bug-601016-description-translation.*Wege.*==>.*Wedge.*$' \
+				-e '^.*test/integration/skip-bug-601016-description-translation.*Methoden.*==>.*Methods.*$' \
+				-e '^.*test/integration/test-apt-update-not-modified.*readd.*==>.*readd.*$' \
 			|| true
 		echo '### codespell in documentation:'
 		codespell --enable-colors doc/*.xml doc/*.txt doc/*.dbk doc/*.ent doc/*.cmake.in doc/xml.add doc/po4a.conf doc/examples doc/po/apt-doc.pot \
 			po/apt-all.pot README.* COPYING \
+			| grep -v -e '^.*po/apt-all\.pot.*DeLink.*==>.*unlink.*$' \
 			|| true
 	fi
 	if is_available 'lintian' 'spellintian'; then
diff --git a/test/integration/test-apt-cli-list b/test/integration/test-apt-cli-list
index f87208a08..8928a4856 100755
--- a/test/integration/test-apt-cli-list
+++ b/test/integration/test-apt-cli-list
@@ -35,7 +35,7 @@ baz/unstable 2.0 all [upgradable from: 0.1]
 foobar/unstable 2.0 i386 [upgradable from: 1.0]" apt list --upgradable
 
 # FIXME: hm, hm - does it make sense to have this different? shouldn't
-#        we use "installed,upgradable" consitently?
+#        we use "installed,upgradable" consistently?
 testsuccessequal "Listing...
 bar/now 1.0 i386 [installed,local]
 baz/now 0.1 all [installed,upgradable to: 2.0]