Bug fixes

Author: jgg
Date: 2000-02-11 03:37:45 GMT
Bug fixes

diff --git a/debian/changelog b/debian/changelog
index 4683f09b301891b7094c94d7b81c603bb97a0dd1..54d04451ab654fb35eadf77326d79f1bd25150d1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 apt (0.3.17.1) unstable; urgency=low
   
-  * Changes in the postinst script. Closes: #56855
-  * Fixed bashism. Closes: #57216
+  * Changes in the postinst script. Closes: #56855, #57237
+  * Fixed bashism. Closes: #57216, #57335
+  * Doc updates. Closes: #57772, #57069, #57331
   
  -- Ben Gertzfield <che@debian.org>  Fri, 14 Jan 2000 08:04:15 -0800
 

diff --git a/debian/control b/debian/control
index 606f2a97185f437894ba00a609604fc1b97c14e8..1740f9414227f7aa19edc428c2ad90fc5d660d93 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Description: Advanced front-end for dpkg
  .
  APT features complete installation ordering, multiple source capability
  and several other unique features, see the Users Guide in 
- /usr/doc/apt/users-guide.txt.gz
+ /usr/doc/apt/guide.txt.gz
 
 Package: libapt-pkg-dev
 Architecture: any

diff --git a/doc/apt-get.8.yo b/doc/apt-get.8.yo
index d46eb9bcba4a4827283e296e4d968baf5b04ca08..4983b25816b5edc7cb24f1b9fbf1bd278f364f0f 100644 (file)
--- a/doc/apt-get.8.yo
+++ b/doc/apt-get.8.yo
@@ -139,14 +139,15 @@ Configuration Item: bf(APT::Get::Download-Only).
 
 dit(bf(-f, --fix-broken))
 Fix; attempt to correct a system with broken dependencies in            
-place. This option may be used alone or in conjunction with any of the  
-command actions, and is sometimes necessary when running APT for the    
-first time; APT itself does not allow broken package dependencies to    
-exist on a system. It is possible that a system's dependency structure  
-can be so corrupt as to require manual intervention (which usually
-means using dselect or dpkg --remove to eliminate some of the offending 
-packages). Use of this option together with -m may produce an error in
-some situations. Configuration Item: bf(APT::Get::Fix-Broken).
+place. This option, when used with install/remove, can omit any packages
+to permit APT to deduce a likely soltion. Any Package that are specified
+must completly correct the problem. The option is sometimes necessary when 
+running APT for the first time; APT itself does not allow broken package 
+dependencies to exist on a system. It is possible that a system's 
+dependency structure can be so corrupt as to require manual intervention 
+(which usually means using dselect or dpkg --remove to eliminate some of 
+the offending packages). Use of this option together with -m may produce an 
+error in some situations. Configuration Item: bf(APT::Get::Fix-Broken).
 
 dit(bf(-h, --help))
 Help; display a helpful usage message and exits.

diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 996de3a4246dad9ebcee3bcac0b405a2d3e5cd7b..6b5ba857530a832d6e255ff8e3fc69c94b2cc24f 100644 (file)
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -33,7 +33,9 @@ with newlines placed to make
 it more readable. Lists can be created by opening a scope an including a 
 single word enclosed in quotes followed by a semicolon. 
 In general the sample configuration file in
-em(/usr/doc/apt/examples/apt.conf) is a good guide for how it should look.
+em(/usr/doc/apt/examples/apt.conf) and
+em(/usr/doc/apt/examples/configure-index) 
+is a good guide for how it should look.
 
 All of the APT tools take a -o option which allows an arbitary configuration 
 directive to be specified on the command line. The syntax is a full option
@@ -141,7 +143,7 @@ standard form of em(ftp://[[user][:pass]@]host[:port]/) and is overriden
 by the ftp_proxy environment variable. To use a ftp proxy you will have to
 set the ftp::ProxyLogin script in the configuration file. This entry 
 specifies the commands to send to tell the proxy server what to connect
-to. Please see em(/usr/doc/apt/examples/apt.conf) for an example of how 
+to. Please see em(/usr/doc/apt/examples/configure-index) for an example of how 
 to do this. The subsitution variables available are $(PROXY_USER),
 $(PROXY_PASS), $(SITE_USER), $(SITE_PASS), $(SITE), and $(SITE_PORT). 
 Each is taken from it's respective URI component.
@@ -254,8 +256,8 @@ invokation. bf(Debug::IdentCdrom) will disable the inclusion of statfs
 data in CDROM IDs.
 
 manpagesection(EXAMPLES)
-bf(/usr/doc/apt/examples/apt.conf) contains a sample configuration file
-showing the default values for all possible options.
+bf(/usr/doc/apt/examples/configure-index.gz) contains a sample configuration 
+file showing the default values for all possible options.
 
 manpagesection(FILES)
 /etc/apt/apt.conf

diff --git a/dselect/install b/dselect/install
index b9bbc73545c997f93e023cd7c683dc250fa2987e..8ac3523bdb4194303a3a945bd9a86de6f868c3dd 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -28,7 +28,7 @@ yesno() {
                defp="[y/N]" def=n
        fi
        while :;do
-               echo -n "$1 $defp" 1>&3
+               echo -n "$1 $defp " 1>&3
                read ans
                case $ans in
                        Y|y|N|n)        break;;