summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.arch12
-rw-r--r--apt-pkg/acquire-item.cc15
-rw-r--r--apt-pkg/acquire-item.h5
-rw-r--r--apt-pkg/algorithms.h3
-rw-r--r--apt-pkg/cacheiterators.h4
-rw-r--r--apt-pkg/cdrom.cc3
-rw-r--r--apt-pkg/deb/debmetaindex.cc4
-rw-r--r--apt-pkg/deb/debsystem.cc7
-rwxr-xr-xcmdline/apt-key6
-rw-r--r--configure.in5
-rw-r--r--debian/apt-utils.examples1
-rw-r--r--debian/apt.manpages1
-rw-r--r--debian/apt.postinst2
-rw-r--r--debian/changelog119
-rwxr-xr-xdebian/rules5
-rw-r--r--doc/apt-key.8.xml47
-rw-r--r--doc/apt-secure.8.xml209
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/apt.ent49
-rw-r--r--doc/examples/apt-ftparchive.conf46
-rw-r--r--doc/examples/configure-index5
-rw-r--r--doc/makefile3
-rw-r--r--po/apt-all.pot471
-rw-r--r--share/debian-archive.gpgbin1303 -> 0 bytes
24 files changed, 306 insertions, 718 deletions
diff --git a/README.arch b/README.arch
deleted file mode 100644
index 92870d614..000000000
--- a/README.arch
+++ /dev/null
@@ -1,12 +0,0 @@
-
-You can build apt from arch, but this needs the following additional
-packages (in addtion to the usual build-depends):
-xmlto perlsgml sgml2x sgmlspl docbook
-
-then run:
-
-$ debian/rules arch-build
-
-that will build packages in the "debian/arch-build" directory. It will
-honor "DEB_BUILD_PROG_OPTS" as options that are passed to debuild (e.g. -S
-may be usefull).
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index dea68f3ee..ef107444f 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -142,21 +142,20 @@ pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
{
Decompression = false;
Erase = false;
-
+
DestFile = _config->FindDir("Dir::State::lists") + "partial/";
DestFile += URItoFileName(URI);
if(comprExt.empty())
{
- // autoselect the compression method
- if(FileExists("/usr/bin/bzip2"))
- CompressionExtension = ".bz2";
- else
- CompressionExtension = ".gz";
+ // autoselect
+ if(FileExists("/usr/bin/bzip2"))
+ Desc.URI = URI + ".bz2";
+ else
+ Desc.URI = URI + ".gz";
} else {
- CompressionExtension = comprExt;
+ Desc.URI = URI + comprExt;
}
- Desc.URI = URI + CompressionExtension;
Desc.Description = URIDesc;
Desc.Owner = this;
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 90f80368b..ea71153d5 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -92,8 +92,7 @@ class pkgAcqIndex : public pkgAcquire::Item
pkgAcquire::ItemDesc Desc;
string RealURI;
string ExpectedMD5;
- string CompressionExtension;
-
+
public:
// Specialized action members
@@ -101,7 +100,7 @@ class pkgAcqIndex : public pkgAcquire::Item
virtual void Done(string Message,unsigned long Size,string Md5Hash,
pkgAcquire::MethodConfig *Cnf);
virtual string Custom600Headers();
- virtual string DescURI() {return RealURI + CompressionExtension;};
+ virtual string DescURI() {return RealURI + ".gz";};
pkgAcqIndex(pkgAcquire *Owner,string URI,string URIDesc,
string ShortDesct, string ExpectedMD5, string compressExt="");
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index b95218061..174a7f58d 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -118,8 +118,7 @@ class pkgProblemResolver
// Try to resolve problems only by using keep
bool ResolveByKeep();
-
- // Install all protected packages
+
void InstallProtect();
pkgProblemResolver(pkgDepCache *Cache);
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index c3a0d0a5a..62d2695dd 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -222,7 +222,7 @@ class pkgCache::PrvIterator
void operator ++(int) {if (Prv != Owner->ProvideP) Prv = Owner->ProvideP +
(Type == PrvVer?Prv->NextPkgProv:Prv->NextProvides);};
inline void operator ++() {operator ++(0);};
- inline bool end() const {return Owner == 0 || Prv == Owner->ProvideP?true:false;};
+ inline bool end() const {return Prv == Owner->ProvideP?true:false;};
// Comparison
inline bool operator ==(const PrvIterator &B) const {return Prv == B.Prv;};
@@ -244,8 +244,6 @@ class pkgCache::PrvIterator
inline PkgIterator OwnerPkg() {return PkgIterator(*Owner,Owner->PkgP + Owner->VerP[Prv->Version].ParentPkg);};
inline unsigned long Index() const {return Prv - Owner->ProvideP;};
- inline PrvIterator() : Prv(0), Type(PrvVer), Owner(0) {};
-
inline PrvIterator(pkgCache &Owner,Provides *Trg,Version *) :
Prv(Trg), Type(PrvVer), Owner(&Owner)
{
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index ce1beb39b..d7ef844a2 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -422,9 +422,6 @@ bool pkgCdrom::WriteSourceList(string Name,vector<string> &List,bool Source)
{
F.getline(Buffer,sizeof(Buffer));
CurLine++;
- if (F.fail() && !F.eof())
- return _error->Error(_("Line %u too long in source list %s."),
- CurLine,File.c_str());
_strtabexpand(Buffer,sizeof(Buffer));
_strstrip(Buffer);
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 526c8c0b2..85e5b16b3 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -165,6 +165,10 @@ bool debReleaseIndex::IsTrusted() const
string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
URItoFileName(MetaIndexURI("Release")) + ".gpg";
+ if(_config->FindB("APT::Authentication::TrustCDROM", false))
+ if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+ return true;
+
if (FileExists(VerifiedSigFile))
return true;
return false;
diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 2d805ea6f..0b3a4f742 100644
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -164,12 +164,7 @@ bool debSystem::Initialize(Configuration &Cnf)
Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
-
- if (StatusFile) {
- delete StatusFile;
- StatusFile = 0;
- }
-
+
return true;
}
/*}}}*/
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 0685e36f7..be2b19a1a 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
diff --git a/configure.in b/configure.in
index 87dac8e47..03399f5c5 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.41.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.40.1ubuntu5")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
@@ -181,6 +181,9 @@ AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
dnl Check for the XML tools needed to build man pages
AC_PATH_PROG(XMLTO,xmlto)
+dnl Check for the XML tools needed to build man pages
+AC_PATH_PROG(XMLTO,xmlto)
+
dnl Check for YODL
dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
diff --git a/debian/apt-utils.examples b/debian/apt-utils.examples
deleted file mode 100644
index 25aadf996..000000000
--- a/debian/apt-utils.examples
+++ /dev/null
@@ -1 +0,0 @@
-doc/examples/apt-ftparchive.conf \ No newline at end of file
diff --git a/debian/apt.manpages b/debian/apt.manpages
index b52ea3d3d..e621e1c49 100644
--- a/debian/apt.manpages
+++ b/debian/apt.manpages
@@ -3,7 +3,6 @@ doc/apt-cdrom.8
doc/apt-config.8
doc/apt-get.8
doc/apt-key.8
-doc/apt-secure.8
doc/apt.8
doc/apt.conf.5
doc/apt_preferences.5
diff --git a/debian/apt.postinst b/debian/apt.postinst
index ae1801198..df0433057 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
configure)
if ! test -f /etc/apt/trusted.gpg; then
- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
fi
;;
diff --git a/debian/changelog b/debian/changelog
index e88689667..f9e9c22ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,40 +1,59 @@
-apt (0.6.41.1) unstable; urgency=low
+apt (0.6.40.1ubuntu6) breezy; urgency=low
- * apt-pkg/cdrom.cc:
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
- unmount the cdrom when apt failed to locate any package files
- -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 13:45:53 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
-apt (0.6.41) unstable; urgency=low
+apt (0.6.40.1ubuntu2) breezy; urgency=low
* improved the support for "error" and "conffile" reporting from
dpkg, added the format to README.progress-reporting
* added README.progress-reporting to the apt-doc package
- * improved the network timeout handling, if a index file from a
- sources.list times out or EAI_AGAIN is returned from getaddrinfo,
- don't try to get the other files from that entry
- * Support architecture-specific extra overrides
- (closes: #225947). Thanks to Anthony Towns for idea and
- the patch, thanks to Colin Watson for testing it.
- * Javier Fernandez-Sanguino Pen~a:
- - Added a first version of an apt-secure.8 manpage, and modified
- apt-key and apt.end accordingly. Also added the 'update'
- argument to apt-key which was previously not documented
- (Closes: #322120)
- * Andreas Pakulat:
- - added example apt-ftparchive.conf file to doc/examples
- (closes: #322483)
- * Fix a incorrect example in the man-page (closes: #282918)
- * Fix a bug for very long lines in the apt-cdrom code (closes: #280356)
- * Fix a manual page bug (closes: #316314)
* Do md5sum checking for file and cdrom method (closes: #319142)
* Change pkgPolicy::Pin from private to protected to let subclasses
access it too (closes: #321799)
- * add default constructor for PrvIterator (closes: #322267)
- * Reread status configuration on debSystem::Initialize()
- (needed for apt-proxy, thanks to Otavio for this patch)
-
- -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
apt (0.6.40.1) unstable; urgency=low
@@ -45,6 +64,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -60,6 +85,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -70,7 +128,14 @@ apt (0.6.39) unstable; urgency=low
* Update priority of apt-utils to important, to match the override file
* Install only one keyring on each branch (Closes: #316119)
- -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:35:21 -0700
+
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
apt (0.6.38) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index cd026b4a4..3bc9f53d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,7 +209,7 @@ apt: build debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
- cp share/debian-archive.gpg debian/$@/usr/share/$@
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
# head -n 500 ChangeLog > debian/ChangeLog
@@ -269,7 +269,6 @@ apt-utils: build debian/shlibs.local
cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
dh_installdocs -p$@
- dh_installexamples -p$@
# Install the man pages..
dh_installman -p$@
@@ -337,4 +336,4 @@ arch-build:
mkdir -p debian/arch-build/apt-$(APT_DEBVER)
baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
- (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG))
+ (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index eac61307d..62686618a 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -68,56 +68,17 @@
<para>
List trusted keys.
-
</para>
</listitem>
</varlistentry>
-
- <varlistentry><term>update</term>
- <listitem>
- <para>
-
- Update the local keyring with the keyring of Debian archive
- keys and removes from the keyring the archive keys which are no
- longer valid.
-
- </para>
-
- </listitem>
- </varlistentry>
- </variablelist>
-</refsect1>
-
- <refsect1><title>Files</title>
- <variablelist>
- <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
- <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
- <listitem><para>Local trust database of archive keys.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
- <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
- </varlistentry>
-
- <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
- <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
- </varlistentry>
-
-
-
</variablelist>
-
</refsect1>
-<refsect1><title>See Also</title>
-<para>
-&apt-get;, &apt-secure;
-</para>
-</refsect1>
+<!-- <refsect1><title>See Also</title> -->
+<!-- <para> -->
+<!-- &apt-conf;, &apt-get;, &sources-list; -->
+<!-- </refsect1> -->
&manbugs;
&manauthor;
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
deleted file mode 100644
index e22446030..000000000
--- a/doc/apt-secure.8.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-
-<!ENTITY % aptent SYSTEM "apt.ent">
-%aptent;
-
-]>
-
-<refentry>
- &apt-docinfo;
-
- <refmeta>
- <refentrytitle>apt-secure</refentrytitle>
- <manvolnum>8</manvolnum>
- </refmeta>
-
-<!-- NOTE: This manpage has been written based on the
- Securing Debian Manual ("Debian Security
- Infrastructure" chapter) and on documentation
- available at the following sites:
- http://wiki.debian.net/?apt06
- http://www.syntaxpolice.org/apt-secure/
- http://www.enyo.de/fw/software/apt-secure/
--->
-<!-- TODO: write a more verbose example of how it works with
- a sample similar to
- http://www.debian-administration.org/articles/174
- ?
--->
-
-
- <!-- Man page title -->
- <refnamediv>
- <refname>apt-secure</refname>
- <refpurpose>Archive authentication support for APT</refpurpose>
- </refnamediv>
-
- <refsect1><title>Description</title>
- <para>
- Starting with version 0.6, <command>apt</command> contains code
- that does signature checking of the Release file for all
- archives. This ensures that packages in the archive can't be
- modified by people who have no access to the Release file signing
- key.
- </para>
-
- <para>
- If a package comes from a archive without a signature or with a
- signature that apt does not have a key for that package is
- considered untrusted and installing it will result in a big
- warning. <command>apt-get</command> will currently only warn
- for unsigned archives, future releases might force all sources
- to be verified before downloading packages from them.
- </para>
-
- <para>
- The package frontends &apt-get;, &aptitude; and &synaptic; support this new
- authentication feature.
- </para>
-</refsect1>
-
- <refsect1><title>Trusted archives</title>
-
- <para>
- The chain of trust from an apt archive to the end user is made up of
- different steps. <command>apt-secure</command> is the last step in
- this chain, trusting an archive does not mean that the packages
- that you trust it do not contain malicious code but means that you
- trust the archive maintainer. Its the archive maintainer
- responsibility to ensure that the archive integrity is correct.
- </para>
-
- <para>apt-secure does not review signatures at a
- package level. If you require tools to do this you should look at
- <command>debsig-verify</command> and
- <command>debsign</command> (provided in the debsig-verify and
- devscripts packages respectively).</para>
-
- <para>
- The chain of trust in Debian starts when a maintainer uploads a new
- package or a new version of a package to the Debian archive. This
- upload in order to become effective needs to be signed by a key of
- a maintainer within the Debian maintainer's keyring (available in
- the debian-keyring package). Maintainer's keys are signed by
- other maintainers following pre-established procedures to
- ensure the identity of the key holder.
- </para>
-
- <para>
- Once the uploaded package is verified and included in the archive,
- the maintainer signature is stripped off, an MD5 sum of the package
- is computed and put in the Packages file. The MD5 sum of all of the
- packages files are then computed and put into the Release file. The
- Release file is then signed by the archive key (which is created
- once a year and distributed through the FTP server. This key is
- also on the Debian keyring.
- </para>
-
- <para>
- Any end user can check the signature of the Release file, extract the MD5
- sum of a package from it and compare it with the MD5 sum of the
- package he downloaded. Prior to version 0.6 only the MD5 sum of the
- downloaded Debian package was checked. Now both the MD5 sum and the
- signature of the Release file are checked.
- </para>
-
- <para>Notice that this is distinct from checking signatures on a
- per package basis. It is designed to prevent two possible attacks:
- </para>
-
- <itemizedlist>
- <listitem><para><literal>Network "man in the middle"
- attacks</literal>. Without signature checking, a malicious
- agent can introduce himself in the package download process and
- provide malicious software either by controlling a network
- element (router, switch, etc.) or by redirecting traffic to a
- rogue server (through arp or DNS spoofing
- attacks).</para></listitem>
-
- <listitem><para><literal>Mirror network compromise</literal>.
- Without signature checking, a malicious agent can compromise a
- mirror host and modify the files in it to propage malicious
- software to all users downloading packages from that
- host.</para></listitem>
- </itemizedlist>
-
- <para>However, it does not defend against a compromise of the
- Debian master server itself (which signs the packages) or against a
- compromise of the key used to sign the Release files. In any case,
- this mechanism can complement a per-package signature.</para>
-</refsect1>
-
- <refsect1><title>User configuration</title>
- <para>
- <command>apt-key</command> is the program that manages the list
- of keys used by apt. It can be used to add or remove keys although
- an installation of this release will automatically provide the
- default Debian archive signing keys used in the Debian package
- repositories.
- </para>
- <para>
- In order to add a new key you need to first download it
- (you should make sure you are using a trusted communication channel
- when retrieving it), add it with <command>apt-key</command> and
- then run <command>apt-get update</command> so that apt can download
- and verify the <filename>Release.gpg</filename> files from the archives you
- have configured.
- </para>
-</refsect1>
-
-<refsect1><title>Archive configuration</title>
- <para>
- If you want to provide archive signatures in an archive under your
- maintenance you have to:
- </para>
-
- <itemizedlist>
- <listitem><para><literal>Create a toplevel Release
- file</literal>. if it does not exist already. You can do this
- by running <command>apt-ftparchive release</command>
- (provided inftp apt-utils).</para></listitem>
-
- <listitem><para><literal>Sign it</literal>. You can do this by running
- <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
-
- <listitem><para><literal>Publish the key fingerprint</literal>,
- that way your users will know what key they need to import in
- order to authenticate the files in the
- archive.</para></listitem>
-
- </itemizedlist>
-
- <para>Whenever the contents of the archive changes (new packages
- are added or removed) the archive maintainer has to follow the
- first two steps previously outlined.</para>
-
-</refsect1>
-
-<refsect1><title>See Also</title>
-<para>
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
-&debsign; &debsig-verify;, &gpg;
-</para>
-
-<para>For more backgound information you might want to review the
-<ulink
-url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
-Security Infrastructure</ulink> chapter of the Securing Debian Manual
-(available also in the harden-doc package) and the
-<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
->Strong Distribution HOWTO</ulink> by V. Alex Brennen. </para>
-
-</refsect1>
-
- &manbugs;
- &manauthor;
-
-<refsect1><title>Manpage Authors</title>
-
-<para>This man-page is based on the work of Javier Fernández-Sanguino
-Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt.
-</para>
-
-</refsect1>
-
-
-</refentry>
-
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 43f33681f..69e212243 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -284,7 +284,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<literal>sourcelist</literal> gives the location of the sourcelist and
<literal>main</literal> is the default configuration file (setting has no effect,
unless it is done from the config file specified by
- <envar>APT_CONFIG</envar>).</para>
+ <envar>APT_CONFIG</envar>.</para>
<para>The <literal>Dir::Parts</literal> setting reads in all the config fragments in
lexical order from the directory specified. After this is done then the
diff --git a/doc/apt.ent b/doc/apt.ent
index cf22df6d2..8054a25f6 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -44,25 +44,6 @@
</citerefentry>"
>
-<!ENTITY apt-key "<citerefentry>
- <refentrytitle><command>apt-key</command></refentrytitle>
- <manvolnum>8</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY apt-secure "<citerefentry>
- <refentrytitle>apt-secure</refentrytitle>
- <manvolnum>8</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY apt-archive "<citerefentry>
- <refentrytitle><filename>apt-archive</filename></refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>"
->
-
-
<!ENTITY sources-list "<citerefentry>
<refentrytitle><filename>sources.list</filename></refentrytitle>
<manvolnum>5</manvolnum>
@@ -110,36 +91,6 @@
<manvolnum>8</manvolnum>
</citerefentry>"
>
-
-<!ENTITY aptitude "<citerefentry>
- <refentrytitle><command>aptitude</command></refentrytitle>
- <manvolnum>8</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY synaptic "<citerefentry>
- <refentrytitle><command>synaptic</command></refentrytitle>
- <manvolnum>8</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY debsign "<citerefentry>
- <refentrytitle><command>debsign</command></refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY debsig-verify "<citerefentry>
- <refentrytitle><command>debsig-verify</command></refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>"
->
-
-<!ENTITY gpg "<citerefentry>
- <refentrytitle><command>gpg</command></refentrytitle>
- <manvolnum>1</manvolnum>
- </citerefentry>"
->
<!-- Boiler plate docinfo section -->
<!ENTITY apt-docinfo "
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
deleted file mode 100644
index 657ec5440..000000000
--- a/doc/examples/apt-ftparchive.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-// This config is for use with the pool-structure for the packages, thus we
-// don't use a Tree Section in here
-
-// The debian archive should be in the current working dir
-Dir {
- ArchiveDir ".";
- CacheDir ".";
-};
-
-// Create Packages, Packages.gz and Packages.bz2, remove what you don't need
-Default {
- Packages::Compress ". gzip bzip2";
- Sources::Compress ". gzip bzip2";
- Contents::Compress ". gzip bzip2";
-};
-
-// Includes the main section. You can structure the directory tree under
-// ./pool/main any way you like, apt-ftparchive will take any deb (and
-// source package) it can find. This creates a Packages a Sources and a
-// Contents file for these in the main section of the sid release
-BinDirectory "pool/main" {
- Packages "dists/sid/main/binary-i386/Packages";
- SrcPackages "dists/sid/main/source/Sources";
- Contents "dists/sid/Contents-i386";
-}
-
-// This is the same for the contrib section
-BinDirectory "pool/contrib" {
- Packages "dists/sid/contrib/binary-i386/Packages";
- SrcPackages "dists/sid/contrib/source/Sources";
- Contents "dists/sid/Contents-i386";
-}
-
-// This is the same for the non-free section
-BinDirectory "pool/non-free" {
- Packages "dists/sid/non-free/binary-i386/Packages";
- SrcPackages "dists/sid/non-free/source/Sources";
- Contents "dists/sid/Contents-i386";
-};
-
-// By default all Packages should have the extension ".deb"
-Default {
- Packages {
- Extensions ".deb";
- };
-};
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index dee0c06ff..a93b74349 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
NoAct "false";
};
+ Authentication
+ {
+ TrustCDROM "false"; // consider the CDROM always trusted
+ };
+
GPGV
{
TrustedKeyring "/etc/apt/trusted.gpg";
diff --git a/doc/makefile b/doc/makefile
index 31ee061fb..f34b3f6e5 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -14,8 +14,7 @@ include $(DEBIANDOC_H)
# XML man pages
SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
apt-config.8 apt_preferences.5 \
- apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \
- apt-key.8 apt-secure.8
+ apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 apt-key.8
INCLUDES = apt.ent
include $(XML_MANPAGE_H)
diff --git a/po/apt-all.pot b/po/apt-all.pot
index c34299d26..d06c14ce1 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: 2005-08-23 09:45+0200\n"
+"POT-Creation-Date: 2005-06-06 14:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -147,8 +147,8 @@ msgid " %4i %s\n"
msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2324 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
@@ -240,31 +240,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:163 ftparchive/apt-ftparchive.cc:337
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:165 ftparchive/apt-ftparchive.cc:179
+#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
+#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
#, c-format
msgid "Error processing directory %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:254
+#: ftparchive/apt-ftparchive.cc:250
msgid "Source extension list is too long"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:367
msgid "Error writing header to contents file"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:397
#, c-format
msgid "Error processing contents %s"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:556
+#: ftparchive/apt-ftparchive.cc:551
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -306,11 +306,11 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:762
+#: ftparchive/apt-ftparchive.cc:757
msgid "No selections matched"
msgstr ""
-#: ftparchive/apt-ftparchive.cc:835
+#: ftparchive/apt-ftparchive.cc:830
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr ""
@@ -343,83 +343,83 @@ msgstr ""
msgid "Unable to get a cursor"
msgstr ""
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr ""
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr ""
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:126
msgid "E: "
msgstr ""
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:128
msgid "W: "
msgstr ""
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:135
msgid "E: Errors apply to file "
msgstr ""
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
#, c-format
msgid "Failed to resolve %s"
msgstr ""
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:164
msgid "Tree walking failed"
msgstr ""
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:189
#, c-format
msgid "Failed to open %s"
msgstr ""
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:246
#, c-format
msgid " DeLink %s [%s]\n"
msgstr ""
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:254
#, c-format
msgid "Failed to readlink %s"
msgstr ""
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:258
#, c-format
msgid "Failed to unlink %s"
msgstr ""
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:265
#, c-format
msgid "*** Failed to link %s to %s"
msgstr ""
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:275
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr ""
#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr ""
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:378
msgid "Archive had no package field"
msgstr ""
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
#, c-format
msgid " %s has no override entry\n"
msgstr ""
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr ""
@@ -523,7 +523,7 @@ msgstr ""
msgid "Y"
msgstr ""
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr ""
@@ -654,10 +654,6 @@ msgstr ""
msgid "WARNING: The following packages cannot be authenticated!"
msgstr ""
-#: cmdline/apt-get.cc:691
-msgid "Authentication warning overridden.\n"
-msgstr ""
-
#: cmdline/apt-get.cc:698
msgid "Install these packages without verification [y/N]? "
msgstr ""
@@ -666,74 +662,57 @@ msgstr ""
msgid "Some packages could not be authenticated"
msgstr ""
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
msgid "There are problems and -y was used without --force-yes"
msgstr ""
-#: cmdline/apt-get.cc:753
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
-
#: cmdline/apt-get.cc:762
msgid "Packages need to be removed but remove is disabled."
msgstr ""
-#: cmdline/apt-get.cc:773
-msgid "Internal error, Ordering didn't finish"
-msgstr ""
-
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr ""
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2072
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr ""
-#: cmdline/apt-get.cc:814
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr ""
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:846
#, c-format
msgid "You don't have enough free space in %s."
msgstr ""
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr ""
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:865
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -741,74 +720,74 @@ msgid ""
" ?] "
msgstr ""
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr ""
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:886
msgid "Do you want to continue [Y/n]? "
msgstr ""
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr ""
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr ""
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:987
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:993
msgid "Aborting install."
msgstr ""
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1036
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr ""
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1065
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr ""
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr ""
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1087
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -816,79 +795,79 @@ msgid ""
"is only available from another source\n"
msgstr ""
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr ""
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr ""
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1129
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr ""
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr ""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr ""
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr ""
-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1372
msgid "Internal error, AllUpgrade broke stuff"
msgstr ""
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr ""
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1524
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1539
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"
@@ -896,153 +875,149 @@ msgid ""
"or been moved out of Incoming."
msgstr ""
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1547
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:1554
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr ""
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr ""
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr ""
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr ""
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr ""
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1673
msgid "Calculating upgrade... "
msgstr ""
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr ""
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr ""
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-msgid "Internal error, problem resolver broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1854
msgid "Must specify at least one package to fetch source for"
msgstr ""
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2090
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr ""
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1942
#, c-format
msgid "Fetch source %s\n"
msgstr ""
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr ""
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2001
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr ""
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2051
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr ""
-#: cmdline/apt-get.cc:2067
+#: cmdline/apt-get.cc:2065
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2093
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
-#: cmdline/apt-get.cc:2115
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr ""
-#: cmdline/apt-get.cc:2167
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-#: cmdline/apt-get.cc:2219
+#: cmdline/apt-get.cc:2217
#, 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:2254
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-#: cmdline/apt-get.cc:2279
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr ""
-#: cmdline/apt-get.cc:2293
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr ""
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr ""
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2327
msgid "Supported modules:"
msgstr ""
-#: cmdline/apt-get.cc:2370
+#: cmdline/apt-get.cc:2368
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1295,8 +1270,8 @@ msgstr ""
msgid "File %s/%s overwrites the one in the package %s"
msgstr ""
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1432,40 +1407,39 @@ msgstr ""
msgid "Unparsable control file"
msgstr ""
-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:113
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr ""
-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:122
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
"cannot be used to add new CD-ROMs"
msgstr ""
-#: methods/cdrom.cc:131 methods/cdrom.cc:169
+#: methods/cdrom.cc:130 methods/cdrom.cc:168
msgid "Wrong CD-ROM"
msgstr ""
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:163
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-#: methods/cdrom.cc:178 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
msgid "File not found"
msgstr ""
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr ""
-#: methods/file.cc:44
+#: methods/file.cc:42
msgid "Invalid URI, local URIS must not start with //"
msgstr ""
@@ -1521,7 +1495,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 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr ""
@@ -1533,7 +1507,7 @@ msgstr ""
msgid "Protocol corruption"
msgstr ""
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
msgid "Write error"
msgstr ""
@@ -1634,79 +1608,43 @@ msgstr ""
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr ""
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr ""
-#: methods/connect.cc:106
+#: methods/connect.cc:104
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr ""
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:132 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr ""
-#: methods/connect.cc:165
+#: methods/connect.cc:163
#, c-format
msgid "Could not resolve '%s'"
msgstr ""
-#: methods/connect.cc:171
+#: methods/connect.cc:167
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr ""
-#: methods/connect.cc:174
+#: methods/connect.cc:169
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr ""
-#: methods/connect.cc:221
+#: methods/connect.cc:216
#, c-format
msgid "Unable to connect to %s %s:"
msgstr ""
-#: methods/gpgv.cc:92
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:196
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:206
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:237
-msgid "The following signatures were invalid:\n"
-msgstr ""
-
-#: methods/gpgv.cc:244
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
@@ -1790,6 +1728,10 @@ msgstr ""
msgid "Internal error"
msgstr ""
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr ""
@@ -1804,57 +1746,57 @@ msgstr ""
msgid "Selection %s not found"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:436
+#: apt-pkg/contrib/configuration.cc:395
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:494
+#: apt-pkg/contrib/configuration.cc:453
#, c-format
msgid "Opening configuration file %s"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:512
+#: apt-pkg/contrib/configuration.cc:471
#, c-format
msgid "Line %d too long (max %d)"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:608
+#: apt-pkg/contrib/configuration.cc:567
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr ""
-#: apt-pkg/contrib/configuration.cc:627
+#: apt-pkg/contrib/configuration.cc:586
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:644
+#: apt-pkg/contrib/configuration.cc:603
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:684
+#: apt-pkg/contrib/configuration.cc:643
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:691
+#: apt-pkg/contrib/configuration.cc:650
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:704
+#: apt-pkg/contrib/configuration.cc:663
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr ""
-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr ""
@@ -1920,7 +1862,7 @@ msgstr ""
msgid "Unable to stat the mount point %s"
msgstr ""
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr ""
@@ -1929,70 +1871,70 @@ msgstr ""
msgid "Failed to stat the cdrom"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:82
+#: apt-pkg/contrib/fileutl.cc:80
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:87
+#: apt-pkg/contrib/fileutl.cc:85
#, c-format
msgid "Could not open lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:105
+#: apt-pkg/contrib/fileutl.cc:103
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:109
+#: apt-pkg/contrib/fileutl.cc:107
#, c-format
msgid "Could not get lock %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:377
+#: apt-pkg/contrib/fileutl.cc:359
#, c-format
msgid "Waited for %s but it wasn't there"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:387
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:372
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:392
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:436
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:492
+#: apt-pkg/contrib/fileutl.cc:474
#, c-format
msgid "read, still have %lu to read but none left"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:522
+#: apt-pkg/contrib/fileutl.cc:504
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:597
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:603
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:614
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr ""
@@ -2117,7 +2059,7 @@ msgstr ""
msgid "Opening %s"
msgstr ""
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:170
#, c-format
msgid "Line %u too long in source list %s."
msgstr ""
@@ -2166,21 +2108,16 @@ msgstr ""
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-#: apt-pkg/acquire.cc:62
+#: apt-pkg/acquire.cc:61
#, c-format
msgid "Lists directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:66
+#: apt-pkg/acquire.cc:65
#, c-format
msgid "Archive directory %spartial is missing."
msgstr ""
-#: apt-pkg/acquire.cc:817
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
-
#: apt-pkg/acquire-worker.cc:112
#, c-format
msgid "The method driver %s could not be found."
@@ -2314,31 +2251,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:803
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr ""
@@ -2347,73 +2284,73 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:504
#, 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:513 apt-pkg/cdrom.cc:595
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:538
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:558
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:576
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:580
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:588
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:606
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:647
+#: apt-pkg/cdrom.cc:644
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:704
+#: apt-pkg/cdrom.cc:701
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:720
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:724
+#: apt-pkg/cdrom.cc:721
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:748
+#: apt-pkg/cdrom.cc:745
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:754
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:791
+#: apt-pkg/cdrom.cc:788
msgid "Unmounting CD-ROM..."
msgstr ""
@@ -2436,57 +2373,3 @@ msgstr ""
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:358
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:359
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:364
-#, c-format
-msgid "Preparing to configure %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:365
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:366
-#, c-format
-msgid "Installed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:371
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:372
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:373
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
deleted file mode 100644
index c391d8fa1..000000000
--- a/share/debian-archive.gpg
+++ /dev/null
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:52:32 +0000