From d8b3cbb61d93228ec984befefa1abfb16555f12a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 19 Mar 2010 12:36:20 +0100 Subject: modify and clarify the comments for the translation placeholders a bit and as it was only a comment change unfuzzy the translations. --- doc/apt.ent | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'doc/apt.ent') diff --git a/doc/apt.ent b/doc/apt.ent index c23d906e2..19da4429e 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -367,9 +367,11 @@ "> + - + in a shipped manpage newer/modified paragraphs will maybe appear in english in + the generated manpage. This sentence is therefore here to tell the reader that this + is not a mistake by the translator - obviously the target is that at least for stable + releases this sentence is not needed. :) --> Date: Sat, 24 Apr 2010 09:39:46 +0200 Subject: * doc/apt.ent: - Add a note about APT_CONFIG in the -c description (Closes: #578267) --- debian/changelog | 2 ++ doc/apt.ent | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'doc/apt.ent') diff --git a/debian/changelog b/debian/changelog index 7ef1fb2a7..2e786c68f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ apt (0.7.26~exp4) experimental; urgency=low * cmdline/apt-cache.cc: - align Installed and Candidate Version in policy so they can be compared easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657) + * doc/apt.ent: + - Add a note about APT_CONFIG in the -c description (Closes: #578267) [ Jari Aalto ] * cmdline/apt-get.cc: diff --git a/doc/apt.ent b/doc/apt.ent index 19da4429e..c463f7811 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -261,7 +261,9 @@ Configuration File; Specify a configuration file to use. The program will read the default configuration file and then this - configuration file. See &apt-conf; for syntax information. + configuration file. If configuration settings need to be set before the + default configuration files are parsed specify a file with the APT_CONFIG + environment variable. See &apt-conf; for syntax information. -- cgit v1.2.3-70-g09d2 From e1dd65c9f1274621142a20148f23dbd074ac33af Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 13 May 2010 17:39:21 +0200 Subject: * doc/apt.ent - add entities for the current oldstable/stable/testing codenames * doc/sources.list.5.xml: - use stable-codename instead of stable in the examples (Closes: #531492) * doc/apt_preferences.5.xml: - adapt some examples here to use current codenames as well --- debian/changelog | 6 ++++++ doc/apt-ftparchive.1.xml | 2 +- doc/apt.conf.5.xml | 5 +++-- doc/apt.ent | 4 ++++ doc/apt_preferences.5.xml | 20 ++++++++++---------- doc/sources.list.5.xml | 8 ++++---- 6 files changed, 28 insertions(+), 17 deletions(-) (limited to 'doc/apt.ent') diff --git a/debian/changelog b/debian/changelog index 8a6424ebc..0902e79c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,12 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - remove the keyrings count limit by using vector magic * contrib/mmap.cc: - clarify "MMap reached size limit" error message, thanks Ivan Masár! + * doc/apt.ent + - add entities for the current oldstable/stable/testing codenames + * doc/sources.list.5.xml: + - use stable-codename instead of stable in the examples (Closes: #531492) + * doc/apt_preferences.5.xml: + - adapt some examples here to use current codenames as well [ Jari Aalto ] * debian/rules: diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 5bf47f32a..a3ac45bd3 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -363,7 +363,7 @@ The Tree section takes a scope tag which sets the $(DIST) variable and defines the root of the tree (the path is prefixed by ArchiveDir). - Typically this is a setting such as dists/woody. + Typically this is a setting such as dists/&stable-codename;. All of the settings defined in the TreeDefault section can be use in a Tree section as well as three new variables. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index c13ad4867..fe005e0f1 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -150,8 +150,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; Default-Release - Default release to install packages from if more than one - version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;. + Default release to install packages from if more than one + version available. Contains release name, codename or release version. Examples: 'stable', 'testing', + 'unstable', '&stable-codename;', '&testing-codename;', '4.0', '5.0*'. See also &apt-preferences;. Ignore-Hold diff --git a/doc/apt.ent b/doc/apt.ent index c463f7811..be769e232 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -392,3 +392,7 @@ This is done on purpose, to avoid losing content when the translation is lagging behind the original content. "> + + + + diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 77b7776e8..5f8f9fded 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -218,11 +218,11 @@ Pin-Priority: 50 The following record assigns a high priority to all package versions -belonging to any distribution whose Codename is "squeeze". +belonging to any distribution whose Codename is "&testing-codename;". Package: * -Pin: release n=squeeze +Pin: release n=&testing-codename; Pin-Priority: 900 @@ -355,7 +355,7 @@ APT priorities: The Release file is normally found in the directory .../dists/dist-name: for example, .../dists/stable/Release, -or .../dists/woody/Release. +or .../dists/&stable-codename;/Release. It consists of a single multi-line record which applies to all of the packages in the directory tree below its parent. Unlike the Packages file, nearly all of the lines in a Release @@ -383,14 +383,14 @@ Pin: release a=stable the Codename: line names the codename to which all the packages in the directory tree belong. For example, the line -"Codename: squeeze" +"Codename: &testing-codename;" specifies that all of the packages in the directory tree below the parent of the Release file belong to a version named -squeeze. Specifying this value in the APT preferences file +&testing-codename;. Specifying this value in the APT preferences file would require the line: -Pin: release n=squeeze +Pin: release n=&testing-codename; @@ -590,9 +590,9 @@ the example configurations above. Explanation: Uninstall or do not install any Debian-originated package versions -Explanation: other than those in the distribution codenamed with squeeze or sid +Explanation: other than those in the distribution codenamed with &testing-codename; or sid Package: * -Pin: release n=squeeze +Pin: release n=&testing-codename; Pin-Priority: 900 Explanation: Debian unstable is always codenamed with sid @@ -608,7 +608,7 @@ Pin-Priority: -10 With a suitable &sources-list; file and the above preferences file, any of the following commands will cause APT to upgrade to the -latest version(s) in the release codenamed with squeeze. +latest version(s) in the release codenamed with &testing-codename;. apt-get install package-name @@ -620,7 +620,7 @@ apt-get dist-upgrade The following command will cause APT to upgrade the specified package to the latest version from the sid distribution. Thereafter, apt-get upgrade will upgrade -the package to the most recent squeeze version if that is +the package to the most recent &testing-codename; version if that is more recent than the installed version, otherwise, to the most recent sid version if that is more recent than the installed version. diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index c71ae6bdd..b0ff42b59 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -111,8 +111,8 @@ Some examples: -deb http://http.us.debian.org/debian stable main contrib non-free -deb http://http.us.debian.org/debian dists/stable-updates/ +deb http://ftp.debian.org/debian &stable-codename; main contrib non-free +deb http://security.debian.org/ &stable-codename;/updates main contrib non-free @@ -206,8 +206,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/ deb http://archive.debian.org/debian-archive hamm main Uses FTP to access the archive at ftp.debian.org, under the debian - directory, and uses only the stable/contrib area. - deb ftp://ftp.debian.org/debian stable contrib + directory, and uses only the &stable-codename;/contrib area. + deb ftp://ftp.debian.org/debian &stable-codename; contrib Uses FTP to access the archive at ftp.debian.org, under the debian directory, and uses only the unstable/contrib area. If this line appears as -- cgit v1.2.3-70-g09d2 From 9233ef0dd48f896d2740e1a14061cc1c99a27d84 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 24 May 2010 13:18:14 +0200 Subject: remove the gnome-apt reference as it is removed from unstable --- debian/changelog | 1 + doc/apt-get.8.xml | 2 +- doc/apt.ent | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'doc/apt.ent') diff --git a/debian/changelog b/debian/changelog index 006149a60..0d114c915 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low * doc/apt-get.8.xml: - do not say explicit target_release_{name,version,codename}, it should be clear by itself and 'man' can break lines again (Closes: #566166) + - remove the gnome-apt reference as it is removed from unstable [ Jari Aalto ] * debian/rules: diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index fd4e89bf0..abdec96c1 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -112,7 +112,7 @@ apt-get is the command-line tool for handling packages, and may be considered the user's "back-end" to other tools using the APT library. Several "front-end" interfaces exist, such as &dselect;, - &aptitude;, &synaptic;, &gnome-apt; and &wajig;. + &aptitude;, &synaptic; and &wajig;. Unless the , or option is given, one of the commands below must be present. diff --git a/doc/apt.ent b/doc/apt.ent index be769e232..494c6b02c 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -142,12 +142,6 @@ " > - - gnome-apt - 1 - " -> - wajig 1 -- cgit v1.2.3-70-g09d2 From d34690e1dc76c1e572d9f7ac172dd6b12059f774 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 28 May 2010 14:10:00 +0200 Subject: * apt-pkg/deb/debsystem.cc: - add better config item for extended_states file --- apt-pkg/deb/debsystem.cc | 2 +- apt-pkg/depcache.cc | 4 ++-- debian/changelog | 2 ++ doc/apt-mark.8.xml | 7 +------ doc/apt.ent | 8 ++++++++ doc/examples/configure-index | 3 +-- 6 files changed, 15 insertions(+), 11 deletions(-) (limited to 'doc/apt.ent') diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc index 59f826d96..31c26ab2f 100644 --- a/apt-pkg/deb/debsystem.cc +++ b/apt-pkg/deb/debsystem.cc @@ -158,7 +158,7 @@ bool debSystem::Initialize(Configuration &Cnf) /* These really should be jammed into a generic 'Local Database' engine which is yet to be determined. The functions in pkgcachegen should be the only users of these */ - Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct + Cnf.CndSet("Dir::State::extended_states", Cnf.FindDir("Dir::State").append("extended_states")); Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status"); Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg"); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 411ae5f62..bdb89b5ce 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -165,7 +165,7 @@ bool pkgDepCache::Init(OpProgress *Prog) bool pkgDepCache::readStateFile(OpProgress *Prog) /*{{{*/ { FileFd state_file; - string const state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindFile("Dir::State::extended_states"); if(FileExists(state)) { state_file.Open(state, FileFd::ReadOnly); int const file_size = state_file.Size(); @@ -222,7 +222,7 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ std::clog << "pkgDepCache::writeStateFile()" << std::endl; FileFd StateFile; - string const state = _config->FindDir("Dir::State") + "extended_states"; + string const state = _config->FindFile("Dir::State::extended_states"); // if it does not exist, create a empty one if(!FileExists(state)) diff --git a/debian/changelog b/debian/changelog index 9fa04058d..028452751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - write Disappeared also to the history.log - forward manual-installed bit on package disappearance + * apt-pkg/deb/debsystem.cc: + - add better config item for extended_states file -- David Kalnischkies Thu, 27 May 2010 17:34:51 +0200 diff --git a/doc/apt-mark.8.xml b/doc/apt-mark.8.xml index 3f6cc78f5..8e07cd7d9 100644 --- a/doc/apt-mark.8.xml +++ b/doc/apt-mark.8.xml @@ -121,12 +121,7 @@ Files - /var/lib/apt/extended_states - Status list of auto-installed packages. - Configuration Item: Dir::State - sets the path to the extended_states file. - - + &file-extended_states; diff --git a/doc/apt.ent b/doc/apt.ent index 494c6b02c..0d037c8bb 100644 --- a/doc/apt.ent +++ b/doc/apt.ent @@ -363,6 +363,14 @@ "> +/var/lib/apt/extended_states + Status list of auto-installed packages. + Configuration Item: Dir::State::extended_states. + + +"> + diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d168417d8..487c09acb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -294,9 +294,8 @@ Dir "/" State "var/lib/apt/" { Lists "lists/"; - xstatus "xstatus"; - userstatus "status.user"; status "/var/lib/dpkg/status"; + extended_states "extended_states"; cdroms "cdroms.list"; }; -- cgit v1.2.3-70-g09d2