Spelling errors and other fixes

Author: jgg
Date: 2002-03-20 05:51:52 GMT
Spelling errors and other fixes

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index e15f9d48d02fbdad14e96bf271b9cdf825c755f3..c82964d182f8bddd1346dfa4375c852e23b33bca 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-cache.cc,v 1.56 2002/02/15 03:40:00 jgg Exp $
+// $Id: apt-cache.cc,v 1.57 2002/03/20 05:51:52 jgg Exp $

 /* ######################################################################
    
    apt-cache - Manages the cache files
 /* ######################################################################
    
    apt-cache - Manages the cache files


@@ -1260,6 +1260,7 @@ bool ShowHelp(CommandLine &Cmd)
     _("Usage: apt-cache [options] command\n"
       "       apt-cache [options] add file1 [file1 ...]\n"
       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
     _("Usage: apt-cache [options] command\n"
       "       apt-cache [options] add file1 [file1 ...]\n"
       "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"

+      "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"

       "\n"
       "apt-cache is a low-level tool used to manipulate APT's binary\n"
       "cache files, and query information from them\n"
       "\n"
       "apt-cache is a low-level tool used to manipulate APT's binary\n"
       "cache files, and query information from them\n"


@@ -1268,6 +1269,7 @@ bool ShowHelp(CommandLine &Cmd)
       "   add - Add an package file to the source cache\n"
       "   gencaches - Build both the package and source cache\n"
       "   showpkg - Show some general information for a single package\n"
       "   add - Add an package file to the source cache\n"
       "   gencaches - Build both the package and source cache\n"
       "   showpkg - Show some general information for a single package\n"

+      "   showsrc - Show source records\n"

       "   stats - Show some basic statistics\n"
       "   dump - Show the entire file in a terse form\n"
       "   dumpavail - Print an available file to stdout\n"
       "   stats - Show some basic statistics\n"
       "   dump - Show the entire file in a terse form\n"
       "   dumpavail - Print an available file to stdout\n"

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 5bfe95d6a10a0307ea2904b16c9d142ef675196b..98461051e62c16957f670849ee6f6ae7ea07b5b5 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.114 2002/02/15 03:40:00 jgg Exp $
+// $Id: apt-get.cc,v 1.115 2002/03/20 05:51:52 jgg Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -512,7 +512,7 @@ void Stats(ostream &out,pkgDepCache &Dep)
    if (Downgrade != 0)
       ioprintf(out,_("%lu downgraded, "),Downgrade);
 
    if (Downgrade != 0)
       ioprintf(out,_("%lu downgraded, "),Downgrade);
 

-   ioprintf(out,_("%lu to remove and %lu  not upgraded.\n"),
+   ioprintf(out,_("%lu to remove and %lu not upgraded.\n"),

            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)
            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)

diff --git a/debian/changelog b/debian/changelog
index 86ed31ca999a079340fdd3654b15e644ad6ee381..b54c39b050770c7489841244403063e822998499 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,14 @@ apt (0.5.5) unstable; urgency=low
   * LD_LIBRARY_PATH thing. Closes: #109430
   * /usr/doc reference in postinst. Closes: #126189
   * Doc updates. Closes: #120689
   * LD_LIBRARY_PATH thing. Closes: #109430
   * /usr/doc reference in postinst. Closes: #126189
   * Doc updates. Closes: #120689

-  * Possible apt-cache segfault. Closes: #120311, #118431, #117915
-  
+  * Possible apt-cache segfault. Closes: #120311, #118431, #117915, #135295,
+          #131062
+  * Print special message for EAI_AGAIN. Closes: #131397
+  * libapt-pkg-dev needs to bring in the apt-inst library if linking
+    is to work. Closes: #133943
+  * Typos, Doc Stuff. Closes: #132772, #129970, #123642, #114892, #113786,
+         #109591, #105920, #103678
+

  -- Randolph Chung <tausq@debian.org>  Tue,  4 Dec 2001 23:26:42 -0800
 
 apt (0.5.4) unstable; urgency=low
  -- Randolph Chung <tausq@debian.org>  Tue,  4 Dec 2001 23:26:42 -0800
 
 apt (0.5.4) unstable; urgency=low

diff --git a/debian/control b/debian/control
index c906cdd329170f9427e9226d38c43d3ab6efd703..cd246f8016213f17b0916964e7e6368065711c62 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,12 +26,12 @@ Description: Advanced front-end for dpkg
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional

-Depends: ${libapt-pkg:provides}
+Depends: ${libapt-pkg:provides}, ${libapt-inst:provides}

 Section: devel
 Section: devel

-Description: Development files for APT's libapt-pkg
- This package contains the header files and static libraries for
+Description: Development files for APT's libapt-pkg and libapt-inst
+ This package contains the header files and libraries for

  developing with APT's libapt-pkg Debian package manipulation
  developing with APT's libapt-pkg Debian package manipulation

- library.
+ library and the libapt-inst deb/tar/ar library.

 
 Package: libapt-pkg-doc
 Architecture: all
 
 Package: libapt-pkg-doc
 Architecture: all

diff --git a/doc/apt-cache.8.sgml b/doc/apt-cache.8.sgml
index 2ed4c84b85739857337c87f481893c7e7b63a6fb..b037def467eee1c56b7e08633f9c71a004b4e3f8 100644 (file)
--- a/doc/apt-cache.8.sgml
+++ b/doc/apt-cache.8.sgml
@@ -31,6 +31,7 @@
          <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
          <arg>gencaches</>
          <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
          <arg>gencaches</>
          <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>

+         <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>

          <arg>stats</>
          <arg>dump</>
          <arg>dumpavail</>
          <arg>stats</>
          <arg>dump</>
          <arg>dumpavail</>


@@ -60,7 +61,8 @@
    <VariableList>
      <VarListEntry><Term>add</Term>
      <ListItem><Para>
    <VariableList>
      <VarListEntry><Term>add</Term>
      <ListItem><Para>

-     <literal/add/ adds the names package index files to the package cache.
+     <literal/add/ adds the named package index files to the package cache.
+     This is for debugging only.

      </VarListEntry>
      
      <VarListEntry><Term>gencaches</Term>
      </VarListEntry>
      
      <VarListEntry><Term>gencaches</Term>


@@ -170,6 +172,14 @@ Reverse Provides:
      </itemizedlist>
      </VarListEntry>
      
      </itemizedlist>
      </VarListEntry>
      

+     <VarListEntry><Term>showsrc</Term>
+     <ListItem><Para>
+     <literal/showsrc/ displays all the source package records that match
+     the given package names. All versions are shown, as well as all 
+     records that declare the name to be a Binary.
+     named packages.
+     </VarListEntry>
+     

      <VarListEntry><Term>dump</Term>
      <ListItem><Para>
      <literal/dump/ shows a short listing of every package in the cache. It is 
      <VarListEntry><Term>dump</Term>
      <ListItem><Para>
      <literal/dump/ shows a short listing of every package in the cache. It is 

diff --git a/doc/apt.conf.5.sgml b/doc/apt.conf.5.sgml
index 9ff286aeb2d60d6cce3d155f4b9288c11c67a327..3d824b4101474aca48c7da89e297541c5b1bf170 100644 (file)
--- a/doc/apt.conf.5.sgml
+++ b/doc/apt.conf.5.sgml
@@ -188,7 +188,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      will override all settings.
      <para>
      Three settings are provided for cache control with HTTP/1.1 complient 
      will override all settings.
      <para>
      Three settings are provided for cache control with HTTP/1.1 complient 

-     proxy caches. <literal/No-Cache/ tells the proxy to not used its cached 
+     proxy caches. <literal/No-Cache/ tells the proxy to not use its cached 

      response under any circumstances, <literal/Max-Age/ is sent only for 
      index files and tells the cache to refresh its object if it is older than 
      the given number of seconds. Debian updates its index files daily so the 
      response under any circumstances, <literal/Max-Age/ is sent only for 
      index files and tells the cache to refresh its object if it is older than 
      the given number of seconds. Debian updates its index files daily so the 

diff --git a/doc/apt.ent b/doc/apt.ent
index 9be902a2a57da9bf1ed816414610cd0d3edaefe2..c691f64c04c22b45b1b7265c6b31ee2f1a948d91 100644 (file)
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -116,7 +116,7 @@
      
      <VarListEntry><term><option/-v/</><term><option/--version/</>
      <ListItem><Para>
      
      <VarListEntry><term><option/-v/</><term><option/--version/</>
      <ListItem><Para>

-     Show the program verison.
+     Show the program version.

      </VarListEntry>
 
      <VarListEntry><term><option/-c/</><term><option/--config-file/</>
      </VarListEntry>
 
      <VarListEntry><term><option/-c/</><term><option/--config-file/</>

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 66bdb87ac0f534f32d112487ccab1b434221803d..7d768dbf30059e9e3a1b6f4f68d063e8673f029a 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,4 +1,4 @@
-// $Id: configure-index,v 1.4 2001/12/05 07:22:40 tausq Exp $
+// $Id: configure-index,v 1.5 2002/03/20 05:51:52 jgg Exp $

 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file. Most of the options have sane default values, unless
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is a completely
    valid file. Most of the options have sane default values, unless


@@ -198,7 +198,7 @@ DPkg
    FlushSTDIN "true";
 }
 
    FlushSTDIN "true";
 }
 

-/* Options you can set to see some debugging text They corrispond to names
+/* Options you can set to see some debugging text They correspond to names

    of classes in the source code */
 Debug 
 {
    of classes in the source code */
 Debug 
 {

diff --git a/doc/sources.list.5.sgml b/doc/sources.list.5.sgml
index d630e12fd1baff7ba45140ceaa1b3ba21a3c3062..46b6e26aec7df088ac2fe4bd8681c02765482b30 100644 (file)
--- a/doc/sources.list.5.sgml
+++ b/doc/sources.list.5.sgml
@@ -62,7 +62,7 @@
    <para>
    <literal/distribution/ may also contain a variable, <literal/$(ARCH)/,
    which expands to the Debian architecture (i386, m68k, powerpc, ...)
    <para>
    <literal/distribution/ may also contain a variable, <literal/$(ARCH)/,
    which expands to the Debian architecture (i386, m68k, powerpc, ...)

-   used on the system. This permits archiecture-independent
+   used on the system. This permits architecture-independent

    <filename/sources.list/ files to be used. In general this is only of 
    interest when specifying an exact path, <literal/APT/ will automatically 
    generate a URI with the current architecture otherwise.
    <filename/sources.list/ files to be used. In general this is only of 
    interest when specifying an exact path, <literal/APT/ will automatically 
    generate a URI with the current architecture otherwise.