From 3573e286ba001ef30f4871f3ed2e17ea905d6404 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 8 Jun 2005 15:58:38 +0000
Subject: * merged with apt--main and apt--fixes
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-80
Merge michael.vogt@ubuntu.com--2005/apt--fixes--0
* apt@packages.debian.org/apt--main--0--patch-81
Open 0.6.37
* apt@packages.debian.org/apt--main--0--patch-82
merge bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-83
Update changelog
* apt@packages.debian.org/apt--main--0--patch-84
Fix build of French man pages (now using XML, not SGML)
* apt@packages.debian.org/apt--main--0--patch-85
Merge patch from Philippe Batailler for French man page build
* apt@packages.debian.org/apt--main--0--patch-86
add Welsh translations from Dafydd Harries
* apt@packages.debian.org/apt--main--0--patch-87
Update changelog
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-4
Merge from mainline
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-5
Merge from mainline
* apt@packages.debian.org/apt--misc-abi-changes--0--patch-6
Collapse both pkgAcquire::Run() methods into one, with a default value
* bubulle@debian.org--2005/apt--main--0--patch-66
Italian translation complete
* bubulle@debian.org--2005/apt--main--0--patch-67
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-68
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-69
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-70
Re-generate the POT and PO files from sources
* bubulle@debian.org--2005/apt--main--0--patch-71
Update French translation
* bubulle@debian.org--2005/apt--main--0--patch-72
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-73
Basque translation update
* bubulle@debian.org--2005/apt--main--0--patch-74
Hebres translation update
* bubulle@debian.org--2005/apt--main--0--patch-75
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-76
Correct the Hebrew translation for #306658
* bubulle@debian.org--2005/apt--main--0--patch-77
Update French man pages translations
* bubulle@debian.org--2005/apt--main--0--patch-78
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-79
Correct syntax errors in Hebrew translation
* bubulle@debian.org--2005/apt--main--0--patch-80
Revert changes to debian/changelog and debian/apt.cron.daily
* bubulle@debian.org--2005/apt--main--0--patch-81
Portuguese translation update
* daf@muse.19inch.net--2005/apt--main--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-85
* daf@muse.19inch.net--2005/apt--main--0--patch-1
add Welsh translation
* michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1
* merged obvious fixes into the tree to make it easy for matt to merge
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2
* more merges from otavio that looks good/uncritical
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3
* merged Matts misc-abi-changes tree
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4
* finalized the changelog for a ubuntu build
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
* build fix for apt--main--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26
* fix the cache-control header generation
* otavio@debian.org--2005/apt--fixes--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-71
* otavio@debian.org--2005/apt--fixes--0--patch-1
Fix comments about the need of xmlto
* otavio@debian.org--2005/apt--fixes--0--patch-2
Fix a compile warning
* otavio@debian.org--2005/apt--fixes--0--patch-3
Sync with apt--main--0--patch-76
* otavio@debian.org--2005/apt--fixes--0--patch-4
Sync with apt--main--0--patch-78
* otavio@debian.org--2005/apt--fixes--0--patch-5
Add fixes that was wrongly included on DDTP changes.
* otavio@debian.org--2005/apt--fixes--0--patch-8
Add information about the other fixes include on this branch now.
* otavio@debian.org--2005/apt--fixes--0--patch-9
Merge last changes from apt--main--0.
* otavio@debian.org--2005/apt--fixes--0--patch-10
Fix warnings about min/max change in gcc-4.0
* otavio@debian.org--2005/apt--fixes--0--patch-11
Fix remaning warnings while compiling gcc-4.0
* otavio@debian.org--2005/apt--fixes--0--patch-12
Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler.
* philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
Passage sous arch
* philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1
fix xml error
---
apt-inst/deb/dpkgdb.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'apt-inst/deb')
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index de781f44c..c6a0e80e6 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -67,7 +67,7 @@ static bool EraseDir(const char *Dir)
if (Pid == 0)
{
execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(),
- "rm","-rf","--",Dir,0);
+ "rm","-rf","--",Dir,(char *)NULL);
_exit(100);
}
return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());
@@ -380,7 +380,7 @@ bool debDpkgDB::ReadDiversions()
bool debDpkgDB::ReadyFileList(OpProgress &Progress)
{
if (Cache == 0)
- return _error->Error(_("The pkg cache must be initialize first"));
+ return _error->Error(_("The pkg cache must be initialized first"));
if (FList != 0)
{
Progress.OverallProgress(1,1,1,_("Reading file list"));
--
cgit v1.2.3