Fix several typos

This effectively merges branch 'typofixes-vlajos-20150807' of github.com:vlajos/apt
with the following commit:

commit 13cacb3e2e2352ba701e769fc889e3344fabbf7e
Author: Veres Lajos <vlajos@gmail.com>
Date:   Sun Aug 9 00:12:53 2015 +0100

    typofix - https://github.com/vlajos/misspell_fixer

It has been rebased for a better commit message.

diff --git a/apt-inst/extract.cc b/apt-inst/extract.cc
index 026182c186ab5181f8dee410a85f8685abbf2da4..5d42adf87821bb4b120fbc035622ce2aacb67c5d 100644 (file)
--- a/apt-inst/extract.cc
+++ b/apt-inst/extract.cc
@@ -279,7 +279,7 @@ bool pkgExtract::Aborted()
    map_ptrloc *Last = &FLPkg->Files;
    
    /* Loop over all files, restore those that have been unpacked from their
    map_ptrloc *Last = &FLPkg->Files;
    
    /* Loop over all files, restore those that have been unpacked from their

-      dpkg-tmp entires */
+      dpkg-tmp entries */

    while (Files.end() == false)
    {
       // Locate the hash bucket for the node and locate its group head
    while (Files.end() == false)
    {
       // Locate the hash bucket for the node and locate its group head

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ad40f8974e74541924bde8320ea19a50db02886a..2cf6b60a89b95726d9870b794b7d9ea3e2422df6 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -52,7 +52,7 @@
 
 using namespace std;
 
 
 using namespace std;
 

-static void printHashSumComparision(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/
+static void printHashSumComparison(std::string const &URI, HashStringList const &Expected, HashStringList const &Actual) /*{{{*/

 {
    if (_config->FindB("Debug::Acquire::HashSumMismatch", false) == false)
       return;
 {
    if (_config->FindB("Debug::Acquire::HashSumMismatch", false) == false)
       return;


@@ -1821,7 +1821,7 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string const &IndexDiffFile) /*{{{*/
       if (Debug == true)
       {
         std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;
       if (Debug == true)
       {
         std::clog << "pkgAcqDiffIndex: " << IndexDiffFile << ": Index has different hashes than parser, probably older, so fail pdiffing" << std::endl;

-         printHashSumComparision(CurrentPackagesFile, ServerHashes, TargetFileHashes);
+         printHashSumComparison(CurrentPackagesFile, ServerHashes, TargetFileHashes);

       }
       return false;
    }
       }
       return false;
    }

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 1a9d5aefd68bbda4beca7ad39c7717e987416739..5b0d8fb2997ed29c01c85976517c0bbfaa0a20bf 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -75,8 +75,8 @@ class pkgSimulate : public pkgPackageManager                          /*{{{*/
    Policy iPolicy;
    pkgDepCache Sim;
    pkgDepCache::ActionGroup group;
    Policy iPolicy;
    pkgDepCache Sim;
    pkgDepCache::ActionGroup group;

-   
-   // The Actuall installation implementation
+
+   // The Actual installation implementation

    virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
    virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
    virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;
    virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
    virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
    virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 5613459e73a657d9b63e8609c302be08b0933be4..d83d05f9e3c356b5f41045f2cdc99dbf73502eba 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -367,7 +367,7 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // ReduceSourceList - Takes the path list and reduces it               /*{{{*/
 // ---------------------------------------------------------------------

-/* This takes the list of source list expressed entires and collects
+/* This takes the list of source list expressed entries and collects

    similar ones to form a single entry for each dist */
 void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)
 {
    similar ones to form a single entry for each dist */
 void pkgCdrom::ReduceSourcelist(string /*CD*/,vector<string> &List)
 {


@@ -451,7 +451,7 @@ bool pkgCdrom::WriteDatabase(Configuration &Cnf)
 // WriteSourceList - Write an updated sourcelist                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This reads the old source list and copies it into the new one. It 
 // WriteSourceList - Write an updated sourcelist                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This reads the old source list and copies it into the new one. It 

-   appends the new CDROM entires just after the first block of comments.
+   appends the new CDROM entries just after the first block of comments.

    This places them first in the file. It also removes any old entries
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
    This places them first in the file. It also removes any old entries
    that were the same. */
 bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 242a78449a661487e2d8527d5729836b387a5e93..d388cbda3a4dd6f7f62f7ec13f9db391a82f075d 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1217,7 +1217,7 @@ vector<string> StringSplit(std::string const &s, std::string const &sep,
    vector<string> split;
    size_t start, pos;
 
    vector<string> split;
    size_t start, pos;
 

-   // no seperator given, this is bogus
+   // no separator given, this is bogus

    if(sep.size() == 0)
       return split;
 
    if(sep.size() == 0)
       return split;
 

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index c5c8e2382a54952a8ecf43575846eeb2ebf2d6fa..ef117267814d7ef4bcbc54e500a4b3bcc8e5174d 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -93,7 +93,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
  *
  * \param input The input string.
  *
  *
  * \param input The input string.
  *

- * \param sep The seperator to use.
+ * \param sep The separator to use.

  *
  * \param maxsplit (optional) The maximum amount of splitting that
  * should be done .
  *
  * \param maxsplit (optional) The maximum amount of splitting that
  * should be done .

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 1afcb65273419a6ecc3f3cba57ceda14491fed07..03b096ad6cb34bb606a8d39aad33568d19b77bd1 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1588,7 +1588,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
       // Check for an error code.
       if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
       {
       // Check for an error code.
       if (WIFEXITED(Status) == 0 || WEXITSTATUS(Status) != 0)
       {

-        // if it was set to "keep-dpkg-runing" then we won't return
+        // if it was set to "keep-dpkg-running" then we won't return

         // here but keep the loop going and just report it as a error
         // for later
         bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);
         // here but keep the loop going and just report it as a error
         // for later
         bool const stopOnError = _config->FindB("Dpkg::StopOnError",true);

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ff6e16c7124dcbcaef72589949ff69a11c83cf10..408a373344f0beb7108e6787b46785390fd2ed15 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -119,7 +119,7 @@ class pkgDPkgPM : public pkgPackageManager
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
 
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
 

-   // The Actuall installation implementation
+   // The Actual installation implementation

    virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
    virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
    virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;
    virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
    virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
    virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 9cbb3fbd2373c1963ad871787c3328ace880f150..d75980e5eb5785cbc487f8450befa4917f2edd53 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -6,7 +6,7 @@
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim
    Package Manager - Abstacts the package manager
 
    More work is needed in the area of transitioning provides, ie exim

-   replacing smail. This can cause interesing side effects.
+   replacing smail. This can cause interesting side effects.

 
    Other cases involving conflicts+replaces should be tested. 
    
 
    Other cases involving conflicts+replaces should be tested. 
    


@@ -136,7 +136,7 @@ bool pkgPackageManager::FixMissing()
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the
 // PM::ImmediateAdd - Add the immediate flag recursivly                        /*{{{*/
 // ---------------------------------------------------------------------
 /* This adds the immediate flag to the pkg and recursively to the

-   dependendies 
+   dependencies

  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {
  */
 void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned const int &Depth)
 {


@@ -189,7 +189,7 @@ bool pkgPackageManager::CreateOrderList()
       if (I->VersionList == 0)
         continue;
       
       if (I->VersionList == 0)
         continue;
       

-      // Mark the package and its dependends for immediate configuration
+      // Mark the package and its dependents for immediate configuration

       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {
       if ((((I->Flags & pkgCache::Flag::Essential) == pkgCache::Flag::Essential) &&
          NoImmConfigure == false) || ImmConfigureAll)
       {

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 503f856570320bae49821d42103a9f60c378ea2b..159b5e00e5c1dfec1a1a62bf902e4f74d4728739 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -500,7 +500,7 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
    
    if (S->CurrentState == pkgCache::State::UnPacked ||
        S->CurrentState == pkgCache::State::HalfConfigured)
    
    if (S->CurrentState == pkgCache::State::UnPacked ||
        S->CurrentState == pkgCache::State::HalfConfigured)

-      // we leave triggers alone complettely. dpkg deals with
+      // we leave triggers alone completely. dpkg deals with

       // them in a hard-to-predict manner and if they get 
       // resolved by dpkg before apt run dpkg --configure on 
       // the TriggersPending package dpkg returns a error
       // them in a hard-to-predict manner and if they get 
       // resolved by dpkg before apt run dpkg --configure on 
       // the TriggersPending package dpkg returns a error


@@ -802,7 +802,7 @@ bool pkgCache::DepIterator::IsImplicit() const
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

-// ostream operator to handle string representation of a dependecy     /*{{{*/
+// ostream operator to handle string representation of a dependency    /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)
 // ---------------------------------------------------------------------
 /* */
 std::ostream& operator<<(std::ostream& out, pkgCache::DepIterator D)

diff --git a/debian/changelog b/debian/changelog
index f309b4a14092e68edaf73eb853602cfc5c60d45f..5d1b66ece20646a6fd44a576ddcd78b70f486e87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1965,7 +1965,7 @@ apt (0.9.13~exp1) experimental; urgency=low
   * Improve the API for APT::Upgrade::Upgrade()
   * Re-add "Calculating upgrade..." message
   * move upgrade releated code into upgrade.{cc,h}
   * Improve the API for APT::Upgrade::Upgrade()
   * Re-add "Calculating upgrade..." message
   * move upgrade releated code into upgrade.{cc,h}

-  * Move ListUpdate/AquireUpdate into update.{cc,h}
+  * Move ListUpdate/AcquireUpdate into update.{cc,h}

   * Add new apt-pkg/install-progress.h with APT::Progress::PackageManager
     progress reporting classes
   * Move the status-fd progress reporting out of the pkgDPkgPM class
   * Add new apt-pkg/install-progress.h with APT::Progress::PackageManager
     progress reporting classes
   * Move the status-fd progress reporting out of the pkgDPkgPM class


@@ -3282,7 +3282,7 @@ apt (0.8.16~exp13) experimental; urgency=low
   * methods/http{s,}.cc:
     - if a file without an extension is requested send an 'Accept: text/*'
       header to avoid that the server chooses unsupported compressed files
   * methods/http{s,}.cc:
     - if a file without an extension is requested send an 'Accept: text/*'
       header to avoid that the server chooses unsupported compressed files

-      in a content-negotation attempt (Closes: #657560)
+      in a content-negotiation attempt (Closes: #657560)

     - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
   * apt-pkg/aptconfiguration.cc:
     - chroot if needed before calling dpkg --print-foreign-architectures
     - remove the arbitrary MAXLEN limit for response lines (Closes: #658346)
   * apt-pkg/aptconfiguration.cc:
     - chroot if needed before calling dpkg --print-foreign-architectures


@@ -5502,7 +5502,7 @@ apt (0.7.26~exp3) experimental; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
     - fix backgrounding when dpkg runs (closes: #486222)
   * cmdline/apt-mark:
   * apt-pkg/deb/dpkgpm.cc:
     - fix backgrounding when dpkg runs (closes: #486222)
   * cmdline/apt-mark:

-    - show error on incorrect aguments (LP: #517917), thanks to
+    - show error on incorrect arguments (LP: #517917), thanks to

       Torsten Spindler
   * cmdline/apt-get.cc:
     - if apt-get source foo=version or foo/distro can not be found,
       Torsten Spindler
   * cmdline/apt-get.cc:
     - if apt-get source foo=version or foo/distro can not be found,


@@ -5789,7 +5789,7 @@ apt (0.7.25) unstable; urgency=low
     - add build-dependency on autotools-dev
     - bump policy to 3.8.3 as we have no outdated manpages anymore
   * debian/NEWS:
     - add build-dependency on autotools-dev
     - bump policy to 3.8.3 as we have no outdated manpages anymore
   * debian/NEWS:

-    - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
+    - fix a typo in 0.7.24: Already -> Already (Closes: #557674)

   * ftparchive/writer.{cc,h}:
     - add APT::FTPArchive::LongDescription to be able to disable them
   * apt-pkg/deb/debsrcrecords.cc:
   * ftparchive/writer.{cc,h}:
     - add APT::FTPArchive::LongDescription to be able to disable them
   * apt-pkg/deb/debsrcrecords.cc:


@@ -6484,7 +6484,7 @@ apt (0.7.15~exp3) experimental; urgency=low
 
   [ Michael Vogt ]
   * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:
 
   [ Michael Vogt ]
   * apt-pkg/packagemanager.cc, apt-pkg/deb/dpkgpm.cc:

-    - move the state file writting into the Go() implementation
+    - move the state file writing into the Go() implementation

       of dpkgpm (closes: #498799)
   * apt-pkg/algorithms.cc:
     - fix simulation performance drop (thanks to Ferenc Wagner
       of dpkgpm (closes: #498799)
   * apt-pkg/algorithms.cc:
     - fix simulation performance drop (thanks to Ferenc Wagner


@@ -7517,7 +7517,7 @@ apt (0.6.42.2) unstable; urgency=high
  
 apt (0.6.42.1) unstable; urgency=low
 
  
 apt (0.6.42.1) unstable; urgency=low
 

-  * fix a incorrect example in the apt_prefrences man page
+  * fix a incorrect example in the apt_preferences man page

     (thanks to Filipus Klutiero, closes: #282918)
   * apt-pkg/pkgrecords.cc:
     - revert patch from last version, it causes trouble on alpha 
     (thanks to Filipus Klutiero, closes: #282918)
   * apt-pkg/pkgrecords.cc:
     - revert patch from last version, it causes trouble on alpha 


@@ -7684,7 +7684,7 @@ apt (0.6.36) experimental; urgency=low
       added "Acquire::BrokenProxy" that will force apt to always 
       re-get the Release.gpg file (for broken proxies)
     - debian/apt.cron.daily:
       added "Acquire::BrokenProxy" that will force apt to always 
       re-get the Release.gpg file (for broken proxies)
     - debian/apt.cron.daily:

-      MinAge is defaulting to 2 days now to prevent over-aggresive removal 
+      MinAge is defaulting to 2 days now to prevent over-aggressive removal

     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  
     - apt-pkg/cdrom.cc:
       honor "Acquire::gpgv::Options" when verifying the signature (Ubuntu #8496)
  


@@ -8734,7 +8734,7 @@ apt (0.5.5) unstable; urgency=low
     ignore roots umask for these files. Closes: #108801
   * Support larger config spaces. Closes: #111914
   * 'apt-get update' no longer does 'Building Dependency Tree'.
     ignore roots umask for these files. Closes: #108801
   * Support larger config spaces. Closes: #111914
   * 'apt-get update' no longer does 'Building Dependency Tree'.

-  * When matching regexs allways print a message. Change regex activation
+  * When matching regexs always print a message. Change regex activation

     charset. Closes: #147817
   * Don't die if lines in sources.list are too long. Closes: #146846
   * Show file name on apt-extracttemplate error messges. Closes: #151835
     charset. Closes: #147817
   * Don't die if lines in sources.list are too long. Closes: #146846
   * Show file name on apt-extracttemplate error messges. Closes: #151835


@@ -8780,7 +8780,7 @@ apt (0.5.5) unstable; urgency=low
   * When installing build-deps, make sure the new version will
     satisfy build requirements. Closes: #178121
   * Split offline and guide documentation into apt-doc.  This was done so
   * When installing build-deps, make sure the new version will
     satisfy build requirements. Closes: #178121
   * Split offline and guide documentation into apt-doc.  This was done so

-    that binary-arch builds do not require documention deps.  Note, that 
+    that binary-arch builds do not require documentation deps.  Note, that

     apt-doc is not installed on upgrades.
   * Use doc-base, instead of dhelp directly.  Closes: #110389
   * Change http message 'Waiting for file' to 'Waiting for headers'.
     apt-doc is not installed on upgrades.
   * Use doc-base, instead of dhelp directly.  Closes: #110389
   * Change http message 'Waiting for file' to 'Waiting for headers'.


@@ -9021,7 +9021,7 @@ apt (0.3.19) frozen unstable; urgency=low
   * Typo in Algorithms.cc. Closes: #63577
   * Evil dotty function in apt-cache for generating dependency graphs
     with the as-yet-unpackaged GraphVis.
   * Typo in Algorithms.cc. Closes: #63577
   * Evil dotty function in apt-cache for generating dependency graphs
     with the as-yet-unpackaged GraphVis.

-  * Appears to have been fixed in Janurary.. Closes: #57981
+  * Appears to have been fixed in January.. Closes: #57981

   * New config.guess/sub for the new archs. Closes: #60874
   * Fixed error reporting for certain kinds of resolution failures.
     Closes: #61327
   * New config.guess/sub for the new archs. Closes: #60874
   * Fixed error reporting for certain kinds of resolution failures.
     Closes: #61327


@@ -9428,7 +9428,7 @@ apt (0.0.9) experimental; urgency=low
 
   * Added ftp support.
   * Various other less visible bug fixes.
 
   * Added ftp support.
   * Various other less visible bug fixes.

-  * Fixed problem with segfault when apt-get invoked in a non-existant
+  * Fixed problem with segfault when apt-get invoked in a non-existent

     directory (Bug #21863)
   * Bumped policy to 2.4.1
 
     directory (Bug #21863)
   * Bumped policy to 2.4.1
 

diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt
index b94dc666e8ed996077aa206c4bb863d2bf97af07..58e7b30cf212563841b4e2a35f202259cdf4162a 100644 (file)
--- a/doc/libapt-pkg2_to_3.txt
+++ b/doc/libapt-pkg2_to_3.txt
@@ -27,11 +27,11 @@ source will continue to function, but perhaps at reduced functionality.
   include the trailing \n.
 * GenCaches::SelectFile accepts a site parameter now too.
 * Global version compare functions are gone. If you 
   include the trailing \n.
 * GenCaches::SelectFile accepts a site parameter now too.
 * Global version compare functions are gone. If you 

-    #define APT_COMPATABILITY 1
+    #define APT_COMPATIBILITY 1

   They will come back as they were before. Code should be updated to 
   reference the compare functions to the VersioningSystem (VS) referenced
   by the Cache or _system structures.
   They will come back as they were before. Code should be updated to 
   reference the compare functions to the VersioningSystem (VS) referenced
   by the Cache or _system structures.

-* Initialization is now two stage (define APT_COMPATABILITY..) The first
+* Initialization is now two stage (define APT_COMPATIBILITY..) The first

   stage, pkgInitConfig is called before commandline parsing, and
   pkgInitSystem is called after. This gives the user the oppertunity to
   override default settings from the config files before startup has been
   stage, pkgInitConfig is called before commandline parsing, and
   pkgInitSystem is called after. This gives the user the oppertunity to
   override default settings from the config files before startup has been

diff --git a/test/integration/Packages-bug-591882-conkeror b/test/integration/Packages-bug-591882-conkeror
index 05eac89878b024038d75fe388f868b846da901a4..555e8559dc4276cb076d126ec944c89f1d67c2f8 100644 (file)
--- a/test/integration/Packages-bug-591882-conkeror
+++ b/test/integration/Packages-bug-591882-conkeror
@@ -1685,7 +1685,7 @@ Conflicts: ttf-dejavu (<< 2.20-1)
 Filename: pool/main/t/ttf-dejavu/ttf-dejavu-core_2.31-1_all.deb
 Size: 1451418
 MD5Sum: d3d8850ec0ef68d9b7655545ce0b2b22
 Filename: pool/main/t/ttf-dejavu/ttf-dejavu-core_2.31-1_all.deb
 Size: 1451418
 MD5Sum: d3d8850ec0ef68d9b7655545ce0b2b22

-Description: Vera font family derivate with additional characters
+Description: Vera font family derivative with additional characters

 
 Package: ucf
 Priority: standard
 
 Package: ucf
 Priority: standard

diff --git a/test/integration/status-bug-591882-conkeror b/test/integration/status-bug-591882-conkeror
index 658114d4a607b3662f46659f9d75e33bb73c4a27..f05ac812ba3862d57899feaf6e613b5611e9d326 100644 (file)
--- a/test/integration/status-bug-591882-conkeror
+++ b/test/integration/status-bug-591882-conkeror
@@ -1256,7 +1256,7 @@ Version: 2.25-3
 Replaces: ttf-dejavu (<< 2.20-1)
 Depends: defoma
 Conflicts: ttf-dejavu (<< 2.20-1)
 Replaces: ttf-dejavu (<< 2.20-1)
 Depends: defoma
 Conflicts: ttf-dejavu (<< 2.20-1)

-Description: Vera font family derivate with additional characters
+Description: Vera font family derivative with additional characters

 
 Package: ttf-dejavu-extra
 Status: install ok installed
 
 Package: ttf-dejavu-extra
 Status: install ok installed


@@ -1270,7 +1270,7 @@ Version: 2.25-3
 Replaces: ttf-dejavu (<< 2.20-1)
 Depends: defoma, ttf-dejavu-core
 Conflicts: ttf-dejavu (<< 2.20-1)
 Replaces: ttf-dejavu (<< 2.20-1)
 Depends: defoma, ttf-dejavu-core
 Conflicts: ttf-dejavu (<< 2.20-1)

-Description: Vera font family derivate with additional characters
+Description: Vera font family derivative with additional characters

 
 Package: ttf-dejavu
 Status: install ok installed
 
 Package: ttf-dejavu
 Status: install ok installed

diff --git a/test/integration/status-ubuntu-bug-614993 b/test/integration/status-ubuntu-bug-614993
index c2f3d5010b5ce718ba410dda5fd3efb032323224..99de51d123202e36c4cc1ed089328e11e0a2a9cf 100644 (file)
--- a/test/integration/status-ubuntu-bug-614993
+++ b/test/integration/status-ubuntu-bug-614993
@@ -4672,7 +4672,7 @@ Source: ttf-dejavu
 Version: 2.30-2
 Replaces: ttf-dejavu (<< 2.20-1)
 Conflicts: ttf-dejavu (<< 2.20-1)
 Version: 2.30-2
 Replaces: ttf-dejavu (<< 2.20-1)
 Conflicts: ttf-dejavu (<< 2.20-1)

-Description: Vera font family derivate with additional characters
+Description: Vera font family derivative with additional characters

  DejaVu provides an expanded version of the Vera font family aiming for
  quality and broader Unicode coverage while retaining the original Vera
  style. DejaVu currently works towards conformance with the Multilingual
  DejaVu provides an expanded version of the Vera font family aiming for
  quality and broader Unicode coverage while retaining the original Vera
  style. DejaVu currently works towards conformance with the Multilingual


@@ -4871,7 +4871,7 @@ Depends: libc6 (>= 2.7), zlib1g (>= 1:1.1.4)
 Suggests: pciutils
 Description: Generic PCI access library for X
  Provides functionality for X to access the PCI bus and devices
 Suggests: pciutils
 Description: Generic PCI access library for X
  Provides functionality for X to access the PCI bus and devices

- in a platform-independant way.
+ in a platform-independent way.

 Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 
 Package: libc-bin
 Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 
 Package: libc-bin

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index b18bd4b622c6c3ab803d91c2124a0888c16a632c..4804b0ae60146c56588d7cc5034e92e87b063647 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -225,7 +225,7 @@ test_from_release_gpg_to_unsigned
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 
 msgmsg "test_cve_2012_0214"
 test_cve_2012_0214
 

-# ensure InRelase can not be subverted
+# ensure InRelease can not be subverted

 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease
 
 msgmsg "test_subvert_inrelease"
 test_subvert_inrelease
 

diff --git a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
index 6ea0345e123c4999040ca86306391110654f6e71..533cf771fba085e9ba0eae22f3dab94106de2e3a 100755 (executable)
--- a/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
+++ b/test/integration/test-bug-617690-allow-unauthenticated-makes-all-untrusted
@@ -17,7 +17,7 @@ testfileexists() {
 }
 
 testfilemissing() {
 }
 
 testfilemissing() {

-       msgtest 'Test for non-existance of file' "$1"
+       msgtest 'Test for non-existence of file' "$1"

        test -e "$1" && msgfail || msgpass
        rm -f "$1"
 }
        test -e "$1" && msgfail || msgpass
        rm -f "$1"
 }

diff --git a/test/integration/test-sourceslist-arch-plusminus-options b/test/integration/test-sourceslist-arch-plusminus-options
index dbefff87beb06b8968a6d3f8f65f274e5886ecef..0ce4aa9f1c35f9a6bd5023f263f415c1c9e33025 100755 (executable)
--- a/test/integration/test-sourceslist-arch-plusminus-options
+++ b/test/integration/test-sourceslist-arch-plusminus-options
@@ -73,7 +73,7 @@ echo 'deb [arch-=mips,hurd-powerpc,i386] http://example.org/debian stable rocks'
 testbinaries 'arch-=foreign,unknown,foreign' 'amd64' 'armel' 'armhf' 'mipsel' 'all'
 
 echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testbinaries 'arch-=foreign,unknown,foreign' 'amd64' 'armel' 'armhf' 'mipsel' 'all'
 
 echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list

-testbinaries 'substract from a arch-set' 'i386' 'all'
+testbinaries 'subtract from a arch-set' 'i386' 'all'

 
 echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testbinaries 'useless subtract from a arch-set' 'i386' 'all'
 
 echo 'deb [arch=mips,i386 arch-=mips] http://example.org/debian stable rocks' > rootdir/etc/apt/sources.list
 testbinaries 'useless subtract from a arch-set' 'i386' 'all'