From 37049546fc18d93f4387917bc9b8181e8adeb3fa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 2 Mar 2010 18:55:18 +0100 Subject: * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) --- doc/apt_preferences.5.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/apt_preferences.5.xml') diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3d7896226..e773ad144 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -59,6 +59,9 @@ APT will not questioning the preferences so wrong settings will therefore lead to uninstallable packages or wrong decisions while upgrading packages. Even more problems will arise if multiply distribution releases are mixed without a good understanding of the following paragraphs. +Packages included in a specific release aren't tested in and +therefore doesn't always work as expected in older or newer releases or +together with other packages from different releases. You have been warned. Note that the files in the /etc/apt/preferences.d -- cgit v1.2.3-70-g09d2 From 4a2bb9e60e942b6749c7dbb3763ddf0e3663d5f1 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 22:48:09 +0100 Subject: * doc/apt_preferences.5.xml: - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! --- debian/changelog | 1 + doc/apt_preferences.5.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/apt_preferences.5.xml') diff --git a/debian/changelog b/debian/changelog index d8b8244bf..787a97e3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ apt (0.7.26) UNRELEASED; urgency=low * doc/apt_preferences.5.xml: - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index e773ad144..c4f18d90a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -594,7 +594,7 @@ Pin-Priority: 900 Explanation: Debian unstable is always codenamed with sid Package: * -Pin: release a=sid +Pin: release n=sid Pin-Priority: 800 Package: * -- cgit v1.2.3-70-g09d2 From 4fb6fdaf95de3db51ef386de7b494ed4c889bedc Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Mar 2010 23:51:14 +0100 Subject: origin can be used to match a hostname (Closes: #352667) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'doc/apt_preferences.5.xml') diff --git a/debian/changelog b/debian/changelog index f48cbf275..9bae5210e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ apt (0.7.26) UNRELEASED; urgency=low - fix two typos and be more verbose in the novice warning. Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! + - origin can be used to match a hostname (Closes: #352667) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c4f18d90a..c927f327a 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -195,8 +195,15 @@ Pin: origin "" Pin-Priority: 999 -A note of caution: the keyword used here is "origin". -This should not be confused with the Origin of a distribution as +A note of caution: the keyword used here is "origin" +which can be used to match a hostname. The following record will assign a high priority +to all versions available from the server identified by the hostname "ftp.de.debian.org" + +Package: * +Pin: origin "ftp.de.debian.org" +Pin-Priority: 999 + +This should not be confused with the Origin of a distribution as specified in a Release file. What follows the "Origin:" tag in a Release file is not an Internet address but an author or vendor name, such as "Debian" or "Ximian". -- cgit v1.2.3-70-g09d2 From b569b4650c647c3aef5341c40d208a37211b57aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 27 Mar 2010 00:01:34 +0100 Subject: remove wrong pin-priority is optional remark (Closes: #574944) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'doc/apt_preferences.5.xml') diff --git a/debian/changelog b/debian/changelog index 9bae5210e..17affee4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ apt (0.7.26) UNRELEASED; urgency=low Thanks to Osamu Aoki for pointing it out! (Closes: #567669) - fix a=sid vs. n=sid typo, thanks Ansgar Burchardt! - origin can be used to match a hostname (Closes: #352667) + - remove wrong pin-priority is optional remark (Closes: #574944) * apt-pkg/deb/dpkgpm.cc: - fix error message construction in OpenLog() - if available store the Commandline in the history diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index c927f327a..77b7776e8 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -476,10 +476,6 @@ distribution. Each record in the APT preferences file can optionally begin with one or more lines beginning with the word Explanation:. This provides a place for comments. - -The Pin-Priority: line in each APT preferences record is -optional. If omitted, APT assigns a priority of 1 less than the last value -specified on a line beginning with Pin-Priority: release .... -- 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_preferences.5.xml') 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 10df254bd756cea401e2564d465bbb4a99ee8e9e Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 13 May 2010 17:58:35 +0200 Subject: add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347) --- debian/changelog | 1 + doc/apt_preferences.5.xml | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'doc/apt_preferences.5.xml') diff --git a/debian/changelog b/debian/changelog index 0902e79c8..2ad9fbdd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low - 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 + - add "NotAutomatic: yes" handling, thanks Osamu Aoki (Closes: #490347) [ Jari Aalto ] * debian/rules: diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 5f8f9fded..abcf56744 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -97,6 +97,12 @@ APT::Default-Release "stable"; algorithm to set the priorities of the versions of a package. Assign: + +priority 1 +to the versions coming from archives which in their Release +files are marked as "NotAutomatic: yes" like the debian experimental archive. + + priority 100 to the version that is already installed (if any). @@ -116,7 +122,9 @@ algorithm to set the priorities of the versions of a package. Assign: If the target release has not been specified then APT simply assigns priority 100 to all installed package versions and priority 500 to all -uninstalled package versions. +uninstalled package versions, expect versions coming from archives which +in their Release files are marked as "NotAutomatic: yes" - +these versions get the priority 1. APT then applies the following rules, listed in order of precedence, to determine which version of a package to install. -- cgit v1.2.3-70-g09d2