From 6ae0cde915102bb4b0d272de4342ff6f62840d63 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:19:41 +0200 Subject: Removed obsolete header line from configure-index. --- debian/changelog | 7 +++++++ doc/examples/configure-index | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 14af5f036..225687d9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.7.18) unstable; urgency=low + + * doc/examples/configure-index: + - Removed obsoleted header line. (Closes: #417638) + + -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 + apt (0.7.17) unstable; urgency=low [ Eugene V. Lyubimkin ] diff --git a/doc/examples/configure-index b/doc/examples/configure-index index d0c453a1c..a55dd27d6 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -1,4 +1,3 @@ -// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $ /* This file is an index of all APT configuration directives. It should NOT actually be used as a real config file, though it is (except for the last line) a completely valid file. Most of the options have sane default -- cgit v1.2.3 From 63b0c1775520329d3daaa9f78a7c0ac9362ef38d Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:21:31 +0200 Subject: doc/examples/configure-index: 'linux-kernel' -> 'linux-image'. --- debian/changelog | 1 + doc/examples/configure-index | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 225687d9e..8c6543a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.7.18) unstable; urgency=low * doc/examples/configure-index: - Removed obsoleted header line. (Closes: #417638) + - Changed 'linux-kernel' to 'linux-image'. -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/examples/configure-index b/doc/examples/configure-index index a55dd27d6..07803b2cb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -24,7 +24,7 @@ APT Architecture "i386"; Build-Essential "build-essential"; - NeverAutoRemove { "linux-kernel.*"; }; // packages that should never + NeverAutoRemove { "linux-image.*"; }; // packages that should never // considered for autoRemove // Options for apt-get -- cgit v1.2.3 From 5af4276c8e64d28f4d43e2ebb5938e9ba2c93cfa Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 22:34:16 +0200 Subject: doc/sources.list.5.xml: fixed grammar and typo. --- debian/changelog | 3 +++ doc/sources.list.5.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c6543a0f..9dd22caf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ apt (0.7.18) unstable; urgency=low * doc/examples/configure-index: - Removed obsoleted header line. (Closes: #417638) - Changed 'linux-kernel' to 'linux-image'. + * doc/sources.list.5.xml: + - Fixed typo and grammar in 'sources.list.d' section. Thanks to + Timothy G Abbott . (Closes: #478098) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 8b041391a..9eb66d728 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -48,7 +48,7 @@ sources.list.d The /etc/apt/sources.list.d directory provides - a way to add sources.list entries in seperate files that end with + a way to add sources.list entries in separate files whose names end with .list. The format is the same as for the regular sources.list file. -- cgit v1.2.3 From 861aa1bdf1a895fa8e437abfe992c5d33e5f0fcb Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:04:40 +0200 Subject: doc/apt-get.8.xml: advanced descriptions for 'remove' and 'purge'. --- debian/changelog | 3 +++ doc/apt-get.8.xml | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9dd22caf4..1f39db3b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ apt (0.7.18) unstable; urgency=low * doc/sources.list.5.xml: - Fixed typo and grammar in 'sources.list.d' section. Thanks to Timothy G Abbott . (Closes: #478098) + * doc/apt-get.8.xml: + - Advanced descriptions for 'remove' and 'purge' options. + (Closes: #274283) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 73bacf09b..325f1964d 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -213,14 +213,15 @@ remove remove is identical to install except that packages are - removed instead of installed. If a plus sign is appended to the package + removed instead of installed. Note the removing a package leaves its + configuration files in system. If a plus sign is appended to the package name (with no intervening space), the identified package will be installed instead of removed. purge purge is identical to remove except that packages are - removed and purged. + removed and purged (any configuration files are deleted too). source @@ -419,7 +420,8 @@ Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. + scheduled to be purged. is equivalent for + command. Configuration Item: APT::Get::Purge. -- cgit v1.2.3 From 425684e05521bba07b03dc2c5e647908ce757141 Mon Sep 17 00:00:00 2001 From: "Eugene V. Lyubimkin" Date: Thu, 6 Nov 2008 23:52:36 +0200 Subject: Fix 'dpkg-buildpackage -B' FTBFS. --- debian/changelog | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1f39db3b4..ca8c6cea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ apt (0.7.18) unstable; urgency=low * doc/apt-get.8.xml: - Advanced descriptions for 'remove' and 'purge' options. (Closes: #274283) + * debian/rules: + - Target 'apt' need to depend on 'build-doc'. Thanks for Peter Green. + Fixes FTBFS. (Closes: #504181) -- Eugene V. Lyubimkin Thu, 06 Nov 2008 22:18:15 +0200 diff --git a/debian/rules b/debian/rules index f6ff3c47a..f587b141a 100755 --- a/debian/rules +++ b/debian/rules @@ -186,7 +186,7 @@ apt-doc: build-doc # Build architecture-dependent files here. binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https -apt: build debian/shlibs.local +apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k -- cgit v1.2.3