From 62a91a826f8706a712a15bf8c3abb4befbe8e6ff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 26 Apr 2006 13:01:23 +0200 Subject: * NEWS.Debian entry for the database format change --- debian/NEWS.Debian | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index db04b1e91..f44d1966b 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt Wed, 26 Apr 2006 12:57:53 +0200 + apt (0.5.25) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a -- cgit v1.2.3-70-g09d2 From 8c64fc132ce0743f02b4d7216a3646a8fb93d8b6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 May 2006 17:12:15 +0200 Subject: * finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f67e33455..c4bcf5c1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ apt (0.6.44.1) unstable; urgency=low - applied patch to fix unaligned access problem. Closes: #367417 (thanks to David Mosberger) - -- + -- Michael Vogt Tue, 16 May 2006 21:51:16 +0200 apt (0.6.44) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From c1f640c54b42992a07c2b7384d0528674d1ccaf2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Jun 2006 12:07:23 +0200 Subject: * changelog updated --- configure.in | 2 +- debian/changelog | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index 6d42f340e..138016ce9 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44.2") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 0a04f4893..a0e819ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,12 +6,12 @@ apt (0.6.44.2) unstable; urgency=low - fix missing chmod() in the new aquire code (Closes: #367425) * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations -- Michael Vogt Wed, 14 Jun 2006 12:00:57 +0200 -- cgit v1.2.3-70-g09d2 From ee8a0bbceed82c8bfd45e04fe5ca1a7b472e6244 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 14 Jun 2006 12:09:31 +0200 Subject: * changelog updated --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a0e819ea1..56e4c35f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ apt (0.6.44.2) unstable; urgency=low * apt-pkg/depcache.cc: - added Debug::pkgDepCache::AutoInstall (thanks to infinity) * apt-pkg/acquire-item.cc: - - fix missing chmod() in the new aquire code (Closes: #367425) + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: * sk.po: Completed to 512t -- cgit v1.2.3-70-g09d2 From df78a81e47daa9de9d26f9bbc28708c8cd8fc6e4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 14:55:27 +0200 Subject: * changelog update --- debian/changelog | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0c4a4da37..d21348047 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,11 @@ apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions * added support for aptitude like auto-install tracking (a HUGE - HUGE thanks to Daniel Burrows who made this possible, if you meet - him, please give him a HUG and tell him how great he his!) + HUGE thanks to Daniel Burrows who made this possible) * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental - - -- Michael Vogt Tue, 6 Jun 2006 19:31:31 +0200 + + -- Michael Vogt Mon, 3 Jul 2006 21:50:31 +0200 apt (0.6.44.2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 9be0fa1dc11f06b624a45f96ecdb7bca77928e87 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 27 Jul 2006 00:37:19 +0200 Subject: * finalized changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 931e44ea0..e157096f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,7 +33,7 @@ apt (0.6.45) unstable; urgency=low * eu.po: Updated * eu.po: Updated - -- Michael Vogt Tue, 25 Jul 2006 11:55:22 +0200 + -- Michael Vogt Thu, 27 Jul 2006 00:37:09 +0200 apt (0.6.44.2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 01af346ab90dd293fc54b2d2760466fda73f4be9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Aug 2006 21:45:12 +0200 Subject: * changelog updated --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88b35413f..0c4ac04b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ apt (0.6.45exp2) experimental; urgency=low - * merged "install-recommends" branch (ABI break): + * merged "install-recommends" branch (ABI break): - new "--install-recommends" - install new recommends on "upgrade" if --install-recommends is given - new "--fix-policy" option to install all packages with unmet important dependencies (usefull with --install-recommends to see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + (closes: #42266, #281534, #257054) -- Michael Vogt Mon, 14 Aug 2006 17:47:25 +0200 -- cgit v1.2.3-70-g09d2 From fa5a2334af1f3f7ec33ce53dd9f5c32bcf93a560 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 9 Oct 2006 20:15:46 +0200 Subject: * debian/control: - depends on debian-archive-keyring instead of recommends --- debian/changelog | 8 ++++++++ debian/control | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d733313a..0eea3b4ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.46.2) unstable; urgency=low + + * debian/control: + - depend on debian-archive-keyring to offer clean upgrade path + (closes: #386800) + + -- + apt (0.6.46.1) unstable; urgency=low * methods/gzip.cc: diff --git a/debian/control b/debian/control index 3cba50acb..a7e2dc6c4 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,10 @@ Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Recommends: debian-archive-keyring Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg -- cgit v1.2.3-70-g09d2 From 1bb04b974dbe4eb5fe41ed81ce6726b775b699f3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 11 Oct 2006 08:59:24 +0200 Subject: * debian/control: - droped gnupg suggests because of debian-archive-keyring --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a7e2dc6c4..f331a84c1 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}, debian-archive-keyring Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2 Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3-70-g09d2 From 6829543e206399daad8d2522b0a4d05a69a6935b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 30 Oct 2006 10:51:31 +0100 Subject: * changelog updated --- configure.in | 2 +- debian/changelog | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index a94cb6417..81f327c37 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.1") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index d92575c26..0f9b01973 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,6 @@ -apt (0.6.46.2) unstable; urgency=low +apt (0.6.46.3) unstable; urgency=low - * debian/control: - - depend on debian-archive-keyring to offer clean upgrade path - (closes: #386800) * Merged from Christian Perrier bzr branch: - - es.po: Updated to 514t. Closes: #391661 - - da.po: Updated to 514t. Closes: #391424 - - cs.po: Updated. Closes: #391064 - - es.po: Updated to 514t. Closes: #391661 - - da.po: Updated to 514t. Closes: #391424 - ca.po: Updated to 514t - be.po: Updated to 514t - it.po: Updated to 514t @@ -25,6 +17,20 @@ apt (0.6.46.2) unstable; urgency=low - de.po: Updated to 514t. - en_GB.po: Updated to 514t. + -- Michael Vogt Mon, 30 Oct 2006 08:51:14 +0100 + +apt (0.6.46.2) unstable; urgency=low + + * debian/control: + - depend on debian-archive-keyring to offer clean upgrade path + (closes: #386800) + * Merged from Christian Perrier bzr branch: + - es.po: Updated to 514t. Closes: #391661 + - da.po: Updated to 514t. Closes: #391424 + - cs.po: Updated. Closes: #391064 + - es.po: Updated to 514t. Closes: #391661 + - da.po: Updated to 514t. Closes: #391424 + -- Michael Vogt Wed, 11 Oct 2006 09:03:15 +0200 apt (0.6.46.1) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From f70974f746ee8dfafc9a1ac6c9c6d9de22356f13 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Nov 2006 21:57:03 +0100 Subject: * finalized changelog, uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 066baa8bf..eaf897439 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,7 +21,7 @@ apt (0.6.46.3) unstable; urgency=low - de.po: Updated to 514t. - en_GB.po: Updated to 514t. - -- Michael Vogt Mon, 30 Oct 2006 08:51:14 +0100 + -- Michael Vogt Thu, 2 Nov 2006 11:37:58 +0100 apt (0.6.46.2) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 4716731f20c72dde5b280af90af2dc2bd16a9aff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Nov 2006 21:59:43 +0100 Subject: * finalized changelog, uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7768234f5..f3b191ca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,7 @@ apt (0.6.46.1exp1) experimental; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- + -- Michael Vogt Mon, 2 Oct 2006 01:12:49 +0200 apt (0.6.46) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From 07494f6580dd689c1d82d8dc2f7dbbcfedaf6e52 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 8 Dec 2006 18:21:59 +0000 Subject: 0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade --- apt-pkg/algorithms.cc | 1 + debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f50c52a32..723c8ea3a 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -986,6 +986,7 @@ bool pkgProblemResolver::Resolve(bool BrokenFix) } if (Debug) clog << " Will not break " << Pkg.Name() << " as stated in Breaks field in " << I.Name() < Thu, 7 Dec 2006 15:46:52 +0000 + apt (0.6.45ubuntu6) edgy; urgency=low * Tests pass without code changes! Except that we need this: -- cgit v1.2.3-70-g09d2 From 06ce8ac63b1cc476aba2687a4a742cbe59023096 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Dec 2006 10:48:37 +0100 Subject: * finalized changelog --- configure.in | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index 81f327c37..df452ba34 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c83d5e350..9547be05e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ apt (0.6.46.4) unstable; urgency=low - el.po: Update to 503t9f2u - de.po: Updates and corrections. - -- + -- Michael Vogt Fri, 1 Dec 2006 14:36:30 +0100 apt (0.6.46.3) unstable; urgency=low -- cgit v1.2.3-70-g09d2 From c5100d8bb855b0dcc80c896b367ae66ca213ce4b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Dec 2006 11:32:31 +0100 Subject: * changelog prepared --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b392444b..35bf91080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -apt (0.6.46.5) unstable; urgency=low +apt (0.7.0) experimental; urgency=low + + * Branch that contains tall the new features + + -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 + +apt (0.6.46.5) UNRELEASED; urgency=low * apt-pkg/algorithm.cc: - use clog for all debugging - -- + -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 apt (0.6.46.4) unstable; urgency=high -- cgit v1.2.3-70-g09d2 From e3d924ac623ec88310bfd36f1e425440f5885aab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 14:51:52 +0100 Subject: * changelog updated --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1ea2a294a..9f8326739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.7.0) experimental; urgency=low * handle network failures more gracefully on "update" * support for unattended-upgrades (via unattended-upgrades package) + * added apt-transport-https method -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 -- cgit v1.2.3-70-g09d2 From 8d5fbbc51c5d5468aaf5ebb284597d94aeae1ee3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 25 Apr 2007 00:32:01 +0200 Subject: * debian/changelog: - fix changelog entries --- debian/changelog | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eea6d2a29..c6db5e7c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.47) UNRELEASED; urgency=low +apt (0.6.47) unstable; urgency=low * apt-pkg/algorithm.cc: - use clog for all debugging @@ -24,17 +24,17 @@ apt (0.6.47) UNRELEASED; urgency=low * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) * merged from Christian Perrier: - * mr.po: New Marathi translation Closes: #416806 - * zh_CN.po: Updated by Eric Pareja Closes: #416822 - * tl.po: Updated by Eric Pareja Closes: #416638 - * gl.po: Updated by Jacobo Tarrio - Closes: #412828 - * da.po: Updated by Claus Hindsgaul - Closes: #409483 - * fr.po: Remove a non-breakable space for usability - issues. Closes: #408877 - * ru.po: Updated Russian translation. Closes: #405476 - * *.po: Unfuzzy after upstream typo corrections + * mr.po: New Marathi translation Closes: #416806 + * zh_CN.po: Updated by Eric Pareja Closes: #416822 + * tl.po: Updated by Eric Pareja Closes: #416638 + * gl.po: Updated by Jacobo Tarrio + Closes: #412828 + * da.po: Updated by Claus Hindsgaul + Closes: #409483 + * fr.po: Remove a non-breakable space for usability + issues. Closes: #408877 + * ru.po: Updated Russian translation. Closes: #405476 + * *.po: Unfuzzy after upstream typo corrections -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 -- cgit v1.2.3-70-g09d2 From b4dd017206dc92782462dde702076c389567fb57 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 25 Apr 2007 00:49:59 +0200 Subject: * changelog updated --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c6db5e7c2..9acf948b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ apt (0.6.47) unstable; urgency=low + * ABI library name change because its build against + new glibc * apt-pkg/algorithm.cc: - use clog for all debugging - only increase the score of installed applications if they -- cgit v1.2.3-70-g09d2 From 3bc9f25de62f59cf5d4f90d1c1aaccc9ba23439b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 May 2007 13:39:49 +0200 Subject: * fix version number and changelog --- configure.in | 2 +- debian/changelog | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/configure.in b/configure.in index b72421968..76810c5c1 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.4") +AC_DEFINE_UNQUOTED(VERSION,"0.7.0") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c40804746..09cdf2b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ apt (0.7.0) experimental; urgency=low - * Branch that contains tall the new features + * Package that contains tall the new features * Removed all #pragma interface/implementation * Branch that contains tall the new features: * translated package descriptions * task install support - * automatic dependency removal - * Removed all #pragma interface/implementation + * automatic dependency removal (thanks to Daniel Burrows) * merged support for the new dpkg "Breaks" field (thanks to Ian Jackson) * handle network failures more gracefully on "update" @@ -14,7 +13,7 @@ apt (0.7.0) experimental; urgency=low package) * added apt-transport-https method - -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 + -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 apt (0.6.46.5) UNRELEASED; urgency=low -- cgit v1.2.3-70-g09d2 From c2f2b86252cec3a9ec68df2f55850067faa705d6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 23 May 2007 09:34:18 +0200 Subject: * implement SourceVer() in pkgRecords (thanks to Daniel Burrows for the patch!) --- apt-pkg/deb/debrecords.cc | 28 +++++++++++++++++++++++++++- apt-pkg/deb/debrecords.h | 1 + apt-pkg/pkgrecords.h | 1 + debian/changelog | 2 ++ 4 files changed, 31 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc index c3e579ad1..26ca36799 100644 --- a/apt-pkg/deb/debrecords.cc +++ b/apt-pkg/deb/debrecords.cc @@ -92,18 +92,44 @@ string debRecordParser::LongDesc() return Section.FindS("Description"); } /*}}}*/ + +static const char *SourceVerSeparators = " ()"; + // RecordParser::SourcePkg - Return the source package name if any /*{{{*/ // --------------------------------------------------------------------- /* */ string debRecordParser::SourcePkg() { string Res = Section.FindS("Source"); - string::size_type Pos = Res.find(' '); + string::size_type Pos = Res.find_first_of(SourceVerSeparators); if (Pos == string::npos) return Res; return string(Res,0,Pos); } /*}}}*/ +// RecordParser::SourceVer - Return the source version number if present /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string debRecordParser::SourceVer() +{ + string Pkg = Section.FindS("Source"); + string::size_type Pos = Pkg.find_first_of(SourceVerSeparators); + if (Pos == string::npos) + return ""; + + string::size_type VerStart = Pkg.find_first_not_of(SourceVerSeparators, Pos); + if(VerStart == string::npos) + return ""; + + string::size_type VerEnd = Pkg.find_first_of(SourceVerSeparators, VerStart); + if(VerEnd == string::npos) + // Corresponds to the case of, e.g., "foo (1.2" without a closing + // paren. Be liberal and guess what it means. + return string(Pkg, VerStart); + else + return string(Pkg, VerStart, VerEnd - VerStart); +} + /*}}}*/ // RecordParser::GetRec - Return the whole record /*{{{*/ // --------------------------------------------------------------------- /* */ diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h index efef2e588..bb72275a5 100644 --- a/apt-pkg/deb/debrecords.h +++ b/apt-pkg/deb/debrecords.h @@ -38,6 +38,7 @@ class debRecordParser : public pkgRecords::Parser virtual string MD5Hash(); virtual string SHA1Hash(); virtual string SourcePkg(); + virtual string SourceVer(); // These are some general stats about the package virtual string Maintainer(); diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h index 08f004414..dcfec07ef 100644 --- a/apt-pkg/pkgrecords.h +++ b/apt-pkg/pkgrecords.h @@ -58,6 +58,7 @@ class pkgRecords::Parser virtual string MD5Hash() {return string();}; virtual string SHA1Hash() {return string();}; virtual string SourcePkg() {return string();}; + virtual string SourceVer() {return string();}; // These are some general stats about the package virtual string Maintainer() {return string();}; diff --git a/debian/changelog b/debian/changelog index 8294c45d9..c487bc8dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ apt (0.6.47) UNRELEASED; urgency=low + * implement SourceVer() in pkgRecords + (thanks to Daniel Burrows for the patch!) * apt-pkg/algorithm.cc: - use clog for all debugging - only increase the score of installed applications if they -- cgit v1.2.3-70-g09d2 From 507e17180d478e52be5bc8725587ad3602e5d9b3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Jun 2007 14:47:34 +0200 Subject: * buildlib/archtable: - added support for sh3/sh4 (closes: #424870) - added support for m32r (closes: #394096) --- buildlib/archtable | 4 ++++ buildlib/sizetable | 1 + debian/changelog | 3 +++ 3 files changed, 8 insertions(+) (limited to 'debian') diff --git a/buildlib/archtable b/buildlib/archtable index 197529202..eacc9889f 100644 --- a/buildlib/archtable +++ b/buildlib/archtable @@ -22,8 +22,12 @@ mips mips sheb sheb shel sh sh sh +sh3 sh3 +sh4 sh4 +m32r m32r hppa.* hppa ia64 ia64 s390 s390 s390x s390x x86_64 amd64 +# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable) diff --git a/buildlib/sizetable b/buildlib/sizetable index 8b18528cf..b5782360c 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -21,3 +21,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 +m32r big 1 4 2 4 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index c487bc8dd..88dda5f8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,9 @@ apt (0.6.47) UNRELEASED; urgency=low * *.po: Unfuzzy after upstream typo corrections * apt-pkg/policy.cc: - allow multiple packages (thanks to David Foerster) + * buildlib/archtable: + - added support for sh3/sh4 (closes: #424870) + - added support for m32r (closes: #394096) -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 -- cgit v1.2.3-70-g09d2 From 0fa17428d9905865fe2d586f3787ebc590ca5a24 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Jun 2007 19:40:06 +0200 Subject: * buildlib/systemtable, configure.in: added new buildlib/systemtable to map complette canonical system type to apt architecture and add support for lpia --- buildlib/systemtable | 11 +++++++++++ configure.in | 9 +++++++-- debian/changelog | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 buildlib/systemtable (limited to 'debian') diff --git a/buildlib/systemtable b/buildlib/systemtable new file mode 100644 index 000000000..64c176b50 --- /dev/null +++ b/buildlib/systemtable @@ -0,0 +1,11 @@ +# This file contains a table of known canonical system strings, with +# things to map them to. `configure' will take the output of the +# autoconf cannon macros and look in here. It will check for +# the full canonical system name (required for e.g. lpia) and if that +# fails it will configure.in will fallback to just checking for the CPU +# in buildlib/archtable + +# The left side is a regex for awk against the canonical system name + +# config.guess reports lpia as i386-unknown-linux-gnulp +i.86-.*-linux-gnulp lpia diff --git a/configure.in b/configure.in index c7bf253d1..4aa56e117 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.46.5") +AC_DEFINE_UNQUOTED(VERSION,"0.6.47") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -78,10 +78,15 @@ AC_SUBST(BDBLIB) dnl Converts the ARCH to be something singular for this general CPU family dnl This is often the dpkg architecture string. +dnl First check against the full canonical canoncial-system-type in $target +dnl and if that fails, just look for the cpu AC_MSG_CHECKING(system architecture) -archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" +archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`" if test "x$archset" = "x"; then + archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`" + if test "x$archset" = "x"; then AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) + fi fi AC_MSG_RESULT($archset) AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") diff --git a/debian/changelog b/debian/changelog index 4918ee7f7..483c22796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,10 @@ apt (0.6.47) UNRELEASED; urgency=low * buildlib/archtable: - added support for sh3/sh4 (closes: #424870) - added support for m32r (closes: #394096) + * buildlib/systemtable: + - added support for lpia + * configure.in: + - check systemtable for architecture mapping too -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 -- cgit v1.2.3-70-g09d2 From 7a1445aaa4de0e33ad3d7d08988f9f095442c94a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 7 Jun 2007 13:42:15 +0200 Subject: * debian/control: - update to new standards version - add XS-Vcs-Bzr header --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index a47d13817..5686926d4 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,10 @@ Section: admin Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt -Standards-Version: 3.6.2.2 +Standards-Version: 3.7.2.2 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) +XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -- cgit v1.2.3-70-g09d2 From 0eb7056b0cc57bceb5cc6c55db102c89e7b475fc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 21:47:40 +0200 Subject: * fix error in AutocleanInterval, closes: #319339 (thanks to Israel G. Lugo for the patch) --- debian/apt.cron.daily | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 26dfa2530..4d6bf5842 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -146,7 +146,7 @@ UpdateInterval=0 DownloadUpgradeableInterval=0 eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists DownloadUpgradeableInterval APT::Periodic::Download-Upgradeable-Packages) AutocleanInterval=$DownloadUpgradeableInterval -eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean) +eval $(apt-config shell AutocleanInterval APT::Periodic::AutocleanInterval) # laptop check, on_ac_power returns: # 0 (true) System is on mains power diff --git a/debian/changelog b/debian/changelog index 483c22796..a4757dad6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,8 @@ apt (0.6.47) UNRELEASED; urgency=low - added support for lpia * configure.in: - check systemtable for architecture mapping too + * fix error in AutocleanInterval, closes: #319339 + (thanks to Israel G. Lugo for the patch) -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 -- cgit v1.2.3-70-g09d2 From e47c7d16435822f40149cd831ff6ba0a143ded85 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 22:21:42 +0200 Subject: * add "purge" commandline argument, closes: #133421) (thanks to Julien Danjou for the patch) --- cmdline/apt-get.cc | 7 ++++++- debian/changelog | 2 ++ doc/apt-get.8.xml | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 64882e3e8..c79c1559e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1428,7 +1428,11 @@ bool DoInstall(CommandLine &CmdL) bool DefRemove = false; if (strcasecmp(CmdL.FileList[0],"remove") == 0) DefRemove = true; - + else if (strcasecmp(CmdL.FileList[0], "purge") == 0) + { + _config->Set("APT::Get::Purge", true); + DefRemove = true; + } for (const char **I = CmdL.FileList + 1; *I != 0; I++) { // Duplicate the string @@ -2443,6 +2447,7 @@ bool ShowHelp(CommandLine &CmdL) " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" + " purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" diff --git a/debian/changelog b/debian/changelog index a4757dad6..2dc11190d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ apt (0.6.47) UNRELEASED; urgency=low - check systemtable for architecture mapping too * fix error in AutocleanInterval, closes: #319339 (thanks to Israel G. Lugo for the patch) + * add "purge" commandline argument, closes: #133421) + (thanks to Julien Danjou for the patch) -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 17f663a35..0d080b885 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -42,6 +42,7 @@ dselect-upgrade install pkg remove pkg + purge pkg source pkg build-dep pkg check @@ -151,6 +152,11 @@ installed instead of removed. + purge + purge is identical to remove except that packages are + removed and purged. + + source source causes apt-get to fetch source packages. APT will examine the available packages to decide which source package to -- cgit v1.2.3-70-g09d2 From 152ab79e05f077440d76c1c423b013eaeb3fe2ff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 23:04:36 +0200 Subject: * fix FTBFS with gcc 4.3, closes: #417090 (thanks to Martin Michlmayr for the patch) --- apt-pkg/algorithms.cc | 2 + apt-pkg/cdrom.cc | 1 + apt-pkg/contrib/fileutl.cc | 1 + apt-pkg/contrib/strutl.cc | 1 + apt-pkg/init.cc | 1 + cmdline/apt-sortpkgs.cc | 2 +- debian/changelog | 2 + ftparchive/apt-ftparchive.cc | 1 + po/apt-all.pot | 195 ++++++++++++++++++++++--------------------- 9 files changed, 108 insertions(+), 98 deletions(-) (limited to 'debian') diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index 5fa16e66f..c6583f3b5 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -24,6 +24,8 @@ #include +#include +#include #include /*}}}*/ using namespace std; diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 17a4f184b..07a7b868a 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -18,6 +18,7 @@ #include #include #include +#include #include "indexcopy.h" diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index 9fd71728e..5d294c36a 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -24,6 +24,7 @@ #include +#include #include #include #include diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index d96155917..6e549bedd 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index b47378d4a..52c8a68aa 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -14,6 +14,7 @@ #include #include +#include #include /*}}}*/ diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc index e6a6b9a56..8909c3826 100644 --- a/cmdline/apt-sortpkgs.cc +++ b/cmdline/apt-sortpkgs.cc @@ -162,7 +162,7 @@ int ShowHelp() } /*}}}*/ -int main(unsigned int argc,const char *argv[]) +int main(int argc,const char *argv[]) { CommandLine::Args Args[] = { {'h',"help","help",0}, diff --git a/debian/changelog b/debian/changelog index 2dc11190d..7d06d98c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,8 @@ apt (0.6.47) UNRELEASED; urgency=low (thanks to Israel G. Lugo for the patch) * add "purge" commandline argument, closes: #133421) (thanks to Julien Danjou for the patch) + * fix FTBFS with gcc 4.3, closes: #417090 + (thanks to Martin Michlmayr for the patch) -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc index 0e2be8a00..4fbea13e1 100644 --- a/ftparchive/apt-ftparchive.cc +++ b/ftparchive/apt-ftparchive.cc @@ -24,6 +24,7 @@ #include #include +#include #include #include diff --git a/po/apt-all.pot b/po/apt-all.pot index 6237cd395..bfcd78c99 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-08 11:09+0200\n" +"POT-Creation-Date: 2007-06-08 22:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,8 +147,8 @@ msgid " %4i %s\n" msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 +#: cmdline/apt-get.cc:2391 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -252,31 +252,31 @@ msgstr "" msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:342 msgid "Package extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 -#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 -#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:184 +#: ftparchive/apt-ftparchive.cc:207 ftparchive/apt-ftparchive.cc:257 +#: ftparchive/apt-ftparchive.cc:271 ftparchive/apt-ftparchive.cc:293 #, c-format msgid "Error processing directory %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:254 +#: ftparchive/apt-ftparchive.cc:255 msgid "Source extension list is too long" msgstr "" -#: ftparchive/apt-ftparchive.cc:371 +#: ftparchive/apt-ftparchive.cc:372 msgid "Error writing header to contents file" msgstr "" -#: ftparchive/apt-ftparchive.cc:401 +#: ftparchive/apt-ftparchive.cc:402 #, c-format msgid "Error processing contents %s" msgstr "" -#: ftparchive/apt-ftparchive.cc:556 +#: ftparchive/apt-ftparchive.cc:557 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -318,11 +318,11 @@ msgid "" " -o=? Set an arbitrary configuration option" msgstr "" -#: ftparchive/apt-ftparchive.cc:762 +#: ftparchive/apt-ftparchive.cc:763 msgid "No selections matched" msgstr "" -#: ftparchive/apt-ftparchive.cc:835 +#: ftparchive/apt-ftparchive.cc:836 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1510 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -705,11 +705,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1822 cmdline/apt-get.cc:1855 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2139 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1993 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2036 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2045 msgid "Download complete and in download only mode" msgstr "" @@ -891,27 +891,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1497 cmdline/apt-get.cc:1533 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1520 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1550 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:1553 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1565 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -919,163 +919,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1569 +#: cmdline/apt-get.cc:1573 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1574 +#: cmdline/apt-get.cc:1578 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1577 +#: cmdline/apt-get.cc:1581 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1603 +#: cmdline/apt-get.cc:1607 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1692 +#: cmdline/apt-get.cc:1696 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1693 +#: cmdline/apt-get.cc:1697 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1717 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1720 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1721 +#: cmdline/apt-get.cc:1725 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1790 cmdline/apt-get.cc:1798 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:1898 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153 +#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2157 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:1972 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:1996 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2000 +#: cmdline/apt-get.cc:2004 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2006 +#: cmdline/apt-get.cc:2010 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2037 +#: cmdline/apt-get.cc:2041 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2065 +#: cmdline/apt-get.cc:2069 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2077 +#: cmdline/apt-get.cc:2081 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2078 +#: cmdline/apt-get.cc:2082 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2095 +#: cmdline/apt-get.cc:2099 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2114 +#: cmdline/apt-get.cc:2118 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2130 +#: cmdline/apt-get.cc:2134 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2162 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:2182 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2230 +#: cmdline/apt-get.cc:2234 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2286 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2317 +#: cmdline/apt-get.cc:2321 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2342 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2356 +#: cmdline/apt-get.cc:2360 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2364 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2392 +#: cmdline/apt-get.cc:2396 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2433 +#: cmdline/apt-get.cc:2437 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1090,6 +1090,7 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" +" purge - Remove and purge packages\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1555,7 +1556,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:472 methods/rsh.cc:190 msgid "Read error" msgstr "" @@ -1567,7 +1568,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:511 methods/rsh.cc:232 msgid "Write error" msgstr "" @@ -1834,7 +1835,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:939 #, c-format msgid "Selection %s not found" msgstr "" @@ -1964,70 +1965,70 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:82 +#: apt-pkg/contrib/fileutl.cc:83 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:87 +#: apt-pkg/contrib/fileutl.cc:88 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:105 +#: apt-pkg/contrib/fileutl.cc:106 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:109 +#: apt-pkg/contrib/fileutl.cc:110 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:377 +#: apt-pkg/contrib/fileutl.cc:378 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:387 +#: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:391 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:392 +#: apt-pkg/contrib/fileutl.cc:393 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:436 +#: apt-pkg/contrib/fileutl.cc:437 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 +#: apt-pkg/contrib/fileutl.cc:493 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:522 +#: apt-pkg/contrib/fileutl.cc:523 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:597 +#: apt-pkg/contrib/fileutl.cc:598 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:603 +#: apt-pkg/contrib/fileutl.cc:604 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:614 +#: apt-pkg/contrib/fileutl.cc:615 msgid "Problem syncing the file" msgstr "" @@ -2152,7 +2153,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:427 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2185,19 +2186,19 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "" -#: apt-pkg/algorithms.cc:241 +#: apt-pkg/algorithms.cc:243 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." msgstr "" -#: apt-pkg/algorithms.cc:1066 +#: apt-pkg/algorithms.cc:1068 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -#: apt-pkg/algorithms.cc:1068 +#: apt-pkg/algorithms.cc:1070 msgid "Unable to correct problems, you have held broken packages." msgstr "" @@ -2238,12 +2239,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:121 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:137 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2398,78 +2399,78 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:508 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:517 apt-pkg/cdrom.cc:599 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:542 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:562 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:580 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:584 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:592 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:610 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:648 #, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:684 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:712 +#: apt-pkg/cdrom.cc:713 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:728 +#: apt-pkg/cdrom.cc:729 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:733 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:756 +#: apt-pkg/cdrom.cc:757 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:765 +#: apt-pkg/cdrom.cc:766 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:807 +#: apt-pkg/cdrom.cc:808 msgid "Unmounting CD-ROM...\n" msgstr "" -- cgit v1.2.3-70-g09d2 From 1979e742ad5e2a0b6e547fbe3f4c4066b5a9bd2e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 8 Jun 2007 23:06:54 +0200 Subject: * add --dsc-only option, thanks to K. Richard Pixley --- cmdline/apt-get.cc | 8 +++++++- debian/changelog | 1 + doc/apt-get.8.xml | 6 +++--- po/apt-all.pot | 58 +++++++++++++++++++++++++++--------------------------- 4 files changed, 40 insertions(+), 33 deletions(-) (limited to 'debian') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c79c1559e..6bbc40242 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1954,6 +1954,11 @@ bool DoSource(CommandLine &CmdL) I->Type != "tar") continue; + // Dsc only mode only fetches .dsc files + if (_config->FindB("APT::Get::Dsc-Only",false) == true && + I->Type != "dsc") + continue; + // don't download the same uri twice (should this be moved to // the fetcher interface itself?) if(queued.find(Last->Index().ArchiveURI(I->Path)) != queued.end()) @@ -2536,7 +2541,8 @@ int main(int argc,const char *argv[]) {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, - {0,"tar-only","APT::Get::tar-Only",0}, + {0,"tar-only","APT::Get::Tar-Only",0}, + {0,"dsc-only","APT::Get::Dsc-Only",0}, {0,"purge","APT::Get::Purge",0}, {0,"list-cleanup","APT::Get::List-Cleanup",0}, {0,"reinstall","APT::Get::ReInstall",0}, diff --git a/debian/changelog b/debian/changelog index 7d06d98c6..dfdf0a401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ apt (0.6.47) UNRELEASED; urgency=low (thanks to Julien Danjou for the patch) * fix FTBFS with gcc 4.3, closes: #417090 (thanks to Martin Michlmayr for the patch) + * add --dsc-only option, thanks to K. Richard Pixley -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 0d080b885..a6bb98ad0 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -399,9 +399,9 @@ Item: APT::Get::Only-Source. - - Download only the diff or tar file of a source archive. - Configuration Item: APT::Get::Diff-Only and + + Download only the diff, dsc, or tar file of a source archive. + Configuration Item: APT::Get::Diff-Only, APT::Get::Dsc-Only, and APT::Get::Tar-Only. diff --git a/po/apt-all.pot b/po/apt-all.pot index bfcd78c99..ad05fbdc8 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-08 22:53+0200\n" +"POT-Creation-Date: 2007-06-08 23:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:551 -#: cmdline/apt-get.cc:2391 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2396 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -709,7 +709,7 @@ msgstr "" msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2139 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1903 cmdline/apt-get.cc:2144 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1993 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1998 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2036 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2041 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2045 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2050 msgid "Download complete and in download only mode" msgstr "" @@ -966,116 +966,116 @@ msgstr "" msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2157 +#: cmdline/apt-get.cc:1928 cmdline/apt-get.cc:2162 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1972 +#: cmdline/apt-get.cc:1977 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1996 +#: cmdline/apt-get.cc:2001 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2001 +#: cmdline/apt-get.cc:2006 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2009 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2010 +#: cmdline/apt-get.cc:2015 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2041 +#: cmdline/apt-get.cc:2046 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2074 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2081 +#: cmdline/apt-get.cc:2086 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2082 +#: cmdline/apt-get.cc:2087 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2099 +#: cmdline/apt-get.cc:2104 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2118 +#: cmdline/apt-get.cc:2123 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2134 +#: cmdline/apt-get.cc:2139 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2162 +#: cmdline/apt-get.cc:2167 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:2187 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2234 +#: cmdline/apt-get.cc:2239 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2291 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2321 +#: cmdline/apt-get.cc:2326 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2351 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2365 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2364 +#: cmdline/apt-get.cc:2369 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2396 +#: cmdline/apt-get.cc:2401 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2437 +#: cmdline/apt-get.cc:2442 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" -- cgit v1.2.3-70-g09d2