diff options
| -rw-r--r-- | cmdline/apt-cdrom.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/apt-get.8.sgml | 2 | ||||
| -rw-r--r-- | doc/files.sgml | 6 | ||||
| -rw-r--r-- | doc/fr/sources.list.5.fr.sgml | 2 | ||||
| -rw-r--r-- | doc/guide.it.sgml | 14 | ||||
| -rw-r--r-- | doc/guide.sgml | 14 | ||||
| -rwxr-xr-x | dselect/setup | 2 |
8 files changed, 25 insertions, 23 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 8425966df..35430f575 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-cdrom.cc,v 1.42 2002/02/15 03:40:00 jgg Exp $ +// $Id: apt-cdrom.cc,v 1.43 2003/04/26 23:26:13 doogie Exp $ /* ###################################################################### APT CDROM - Tool for handling APT's CDROM database. @@ -175,7 +175,7 @@ bool DropBinaryArch(vector<string> &List) // Score - We compute a 'score' for a path /*{{{*/ // --------------------------------------------------------------------- /* Paths are scored based on how close they come to what I consider - normal. That is ones that have 'dist' 'stable' 'frozen' will score + normal. That is ones that have 'dist' 'stable' 'testing' will score higher than ones without. */ int Score(string Path) { @@ -184,7 +184,7 @@ int Score(string Path) Res += 29; if (Path.find("/binary-") != string::npos) Res += 20; - if (Path.find("frozen/") != string::npos) + if (Path.find("testing/") != string::npos) Res += 28; if (Path.find("unstable/") != string::npos) Res += 27; diff --git a/debian/changelog b/debian/changelog index 7a9f62e1f..bf142a728 100644 --- a/debian/changelog +++ b/debian/changelog @@ -102,6 +102,8 @@ apt (0.5.4.9) unstable; urgency=low * s/dpkg-preconfig/dpkg-preconfigure/ in examples/configure-index. Closes: #153734. * Fix some typos in the apt-get manual. Closes: #163932. + * Apply patch from bug, to change frozen to testing, and then do it + everywhere else. Closes: #165085. -- Adam Heath <doogie@debian.org> Sun, 02 Feb 2003 02:54:45 -0600 diff --git a/doc/apt-get.8.sgml b/doc/apt-get.8.sgml index a7991116c..73840e9dd 100644 --- a/doc/apt-get.8.sgml +++ b/doc/apt-get.8.sgml @@ -121,7 +121,7 @@ to select. This will cause that version to be located and selected for install. Alternatively a specific distribution can be selected by following the package name with a slash and the version of the - distribution or the Archive name (stable, frozen, unstable). + distribution or the Archive name (stable, testing, unstable). <para> Both of the version selection mechanisms can downgrade packages and must be used with care. diff --git a/doc/files.sgml b/doc/files.sgml index 0aa72e5c8..2293e204a 100644 --- a/doc/files.sgml +++ b/doc/files.sgml @@ -4,7 +4,7 @@ <title>APT Files</title> <author>Jason Gunthorpe <email>jgg@debian.org</email></author> -<version>$Id: files.sgml,v 1.11 2003/02/12 15:05:45 doogie Exp $</version> +<version>$Id: files.sgml,v 1.12 2003/04/26 23:26:13 doogie Exp $</version> <abstract> This document describes the complete implementation and format of the @@ -97,7 +97,7 @@ which indicates a standard debian archive with a dists dir. <p> The <em>deb</em> type is to be a typical two level debian distributions, dist/<var>distribution</var>/<var>component</var>. Typically distribution - is one of stable, unstable or frozen while component is one of main, + is one of stable, unstable or testing while component is one of main, contrib, non-free or non-us. The format for the deb line is as follows: <p> @@ -222,7 +222,7 @@ apply to. The new fields are as follows: <tag>X-TargetDist<item> The TargetDist item indicates which distribution versions are offered for - installation from. It should be stable, unstable or frozen. + installation from. It should be stable, unstable or testing. <tag>X-TargetVersion<item> The target version item is set if the user selects a specific version, it diff --git a/doc/fr/sources.list.5.fr.sgml b/doc/fr/sources.list.5.fr.sgml index 791beeed9..e2c48079c 100644 --- a/doc/fr/sources.list.5.fr.sgml +++ b/doc/fr/sources.list.5.fr.sgml @@ -44,7 +44,7 @@ ligne peut être un commentaire commençant par un caractère #. Le type <literal/deb/ décrit une archive Debian classique à deux niveaux, <filename>distribution/composant</>. <literal/distribution/ peut prendre l'une des valeurs suivantes : <literal/stable/, <literal/unstable/, ou -<literal/frozen/, et composant : <literal/main/, <literal/contrib/, +<literal/testing/, et composant : <literal/main/, <literal/contrib/, <literal/non-free/, ou <literal/non-us/. Le type <literal/deb-src/ décrit le code source pour une distribution Debian dans le même format que le type <literal/deb/. Une ligne <literal/deb-src/ est nécessaire pour récupérer les diff --git a/doc/guide.it.sgml b/doc/guide.it.sgml index 920705e95..2dc46e263 100644 --- a/doc/guide.it.sgml +++ b/doc/guide.it.sgml @@ -6,7 +6,7 @@ <author>Jason Gunthorpe <email>jgg@debian.org</email></author> <author>Traduzione di Eugenia Franzoni <email>eugenia@linuxcare.com</email> </author> -<version>$Id: guide.it.sgml,v 1.4 2003/02/12 15:05:46 doogie Exp $</version> +<version>$Id: guide.it.sgml,v 1.5 2003/04/26 23:26:13 doogie Exp $</version> <abstract> Guida per l'uso del gestore di pacchetti APT. @@ -127,7 +127,7 @@ sono disponibili. Lo si fa con <tt>apt-get update</>. Ad esempio, <example> # apt-get update Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages -Get http://llug.sep.bnl.gov/debian/ frozen/contrib Packages +Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages Reading Package Lists... Done Building Dependency Tree... Done </example> @@ -227,7 +227,7 @@ da scaricare. <example> Please give the distribution tag to get or a path to the package file ending in a /. The distribution - tags are typically something like: stable unstable frozen non-US + tags are typically something like: stable unstable testing non-US Distribution [stable]: </example> @@ -516,11 +516,11 @@ stampa una serie di messaggi di stato. <example> # apt-get update Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages -Get:2 http://llug.sep.bnl.gov/debian/ frozen/contrib Packages -Hit http://llug.sep.bnl.gov/debian/ frozen/main Packages +Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages +Hit http://llug.sep.bnl.gov/debian/ testing/main Packages Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages -Get:5 http://llug.sep.bnl.gov/debian/ frozen/non-free Packages -11% [5 frozen/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s +Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages +11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s </example> <p> diff --git a/doc/guide.sgml b/doc/guide.sgml index a5efd6d3e..1b7e1d8f3 100644 --- a/doc/guide.sgml +++ b/doc/guide.sgml @@ -4,7 +4,7 @@ <title>APT User's Guide</title> <author>Jason Gunthorpe <email>jgg@debian.org</email></author> -<version>$Id: guide.sgml,v 1.6 2003/02/12 15:05:46 doogie Exp $</version> +<version>$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $</version> <abstract> This document provides an overview of how to use the the APT package manager. @@ -110,7 +110,7 @@ available. This is done with <tt>apt-get update</>. For instance, <example> # apt-get update Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages -Get http://llug.sep.bnl.gov/debian/ frozen/contrib Packages +Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages Reading Package Lists... Done Building Dependency Tree... Done </example> @@ -206,7 +206,7 @@ get. <example> Please give the distribution tag to get or a path to the package file ending in a /. The distribution - tags are typically something like: stable unstable frozen non-US + tags are typically something like: stable unstable testing non-US Distribution [stable]: </example> @@ -482,11 +482,11 @@ status messages. <example> # apt-get update Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages -Get:2 http://llug.sep.bnl.gov/debian/ frozen/contrib Packages -Hit http://llug.sep.bnl.gov/debian/ frozen/main Packages +Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages +Hit http://llug.sep.bnl.gov/debian/ testing/main Packages Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages -Get:5 http://llug.sep.bnl.gov/debian/ frozen/non-free Packages -11% [5 frozen/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s +Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages +11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s </example> <p> diff --git a/dselect/setup b/dselect/setup index 8386d9000..4c56e01ea 100755 --- a/dselect/setup +++ b/dselect/setup @@ -30,7 +30,7 @@ my $boldoff=`setterm -bold off`; my @known_types = ('deb'); my @known_access = ('http', 'ftp', 'file'); -my @typical_distributions = ('stable', 'unstable', 'frozen', 'non-US'); +my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US'); my @typical_components = ('main', 'contrib', 'non-free'); my %known_access = map {($_,$_)} @known_access; |