Change frozen to testing everywhere.

Author: doogie
Date: 2003-04-26 23:26:13 GMT
Change frozen to testing everywhere.

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 8425966dfd95202685c50704d528007159ca6697..35430f57566c0956f199dc7b94fbf7c4ecd42f88 100644 (file)
--- 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 7a9f62e1f2a28cc77be2eae48e65e2c28ae6dc35..bf142a7280ebb0627037afc5435b9e20646225d1 100644 (file)
--- 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 a7991116c7dba5e21132577395b99e44f317f5d8..73840e9dd1613a49a23dc1264286dc46e601a8b5 100644 (file)
--- 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 0aa72e5c844ed28b37d9fb9ccf9bdcc1259e1066..2293e204af70d0b76e663af9b35a6b26525b22f2 100644 (file)
--- 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 791beeed9cc4fc4ca776debc7bac249ee787418b..e2c48079cbdbf4e4e718f7d26a8a26f86407c545 100644 (file)
--- a/doc/fr/sources.list.5.fr.sgml
+++ b/doc/fr/sources.list.5.fr.sgml
@@ -44,7 +44,7 @@ ligne peut 
 Le type <literal/deb/ décrit une archive Debian classique à deux niveaux,
 <filename>distribution/composant</>. <literal/distribution/ peut prendre
 l'une des valeurs suivantes&nbsp;: <literal/stable/, <literal/unstable/, ou 
-<literal/frozen/, et composant&nbsp;: <literal/main/, <literal/contrib/, 
+<literal/testing/, et composant&nbsp;: <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 920705e95bd01f7a5d43f2e57564f14d2b6939c9..2dc46e2637a165bb45d891d2b3b3b86b7e30fc48 100644 (file)
--- 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 a5efd6d3e084e73d0d50fe9921e7e3e14bb80b85..1b7e1d8f344039de3f3def986dbcbe148736ff89 100644 (file)
--- 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 8386d9000ccb8509b099c54d30c00c75808bf96f..4c56e01ea6877e15857ba5c4daf7fee2e315e347 100755 (executable)
--- 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;