summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:53:39 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:53:39 +0000
commiteec898ad83d383f27b94f747245fe82fe11949b0 (patch)
tree75915d7506528151f88d3aff07c282b59d06fdb8
parentd6e79b75582b25065e2e1e843191c93d1f56ec3a (diff)
Change log updates
Author: jgg Date: 1999-04-20 05:59:29 GMT Change log updates
-rw-r--r--apt-pkg/acquire-item.cc3
-rw-r--r--cmdline/acqprogress.cc6
-rw-r--r--cmdline/apt-get.cc3
-rw-r--r--debian/changelog15
4 files changed, 22 insertions, 5 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7e178c3b4..35ae7d8b7 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire-item.cc,v 1.27 1999/04/07 05:30:17 jgg Exp $
+// $Id: acquire-item.cc,v 1.28 1999/04/20 05:59:29 jgg Exp $
/* ######################################################################
Acquire Item - Item to acquire
@@ -479,6 +479,7 @@ void pkgAcqArchive::Done(string Message,unsigned long Size,string Md5Hash)
if (Md5Hash != MD5)
{
_error->Error("MD5Sum mismatch for package %s",Version.ParentPkg().Name());
+ Rename(DestFile + ".FAILED",DestFile);
return;
}
}
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 89a8280c8..a5383a838 100644
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acqprogress.cc,v 1.12 1999/04/15 02:43:48 jgg Exp $
+// $Id: acqprogress.cc,v 1.13 1999/04/20 05:59:29 jgg Exp $
/* ######################################################################
Acquire Progress - Command line progress meter
@@ -70,7 +70,7 @@ void AcqTextStatus::Fetch(pkgAcquire::ItemDesc &Itm)
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
- cout << "Get:" << hex << Itm.Owner->ID << dec << ' ' << Itm.Description;
+ cout << "Get:" << Itm.Owner->ID << ' ' << Itm.Description;
if (Itm.Owner->FileSize != 0)
cout << " [" << SizeToStr(Itm.Owner->FileSize) << "b]";
cout << endl;
@@ -170,7 +170,7 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner)
// Add in the short description
if (I->CurrentItem->Owner->ID != 0)
- snprintf(S,End-S," [%lx %s",I->CurrentItem->Owner->ID,
+ snprintf(S,End-S," [%lu %s",I->CurrentItem->Owner->ID,
I->CurrentItem->ShortDesc.c_str());
else
snprintf(S,End-S," [%s",I->CurrentItem->ShortDesc.c_str());
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 0228bb395..740d69e29 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: apt-get.cc,v 1.56 1999/04/20 05:14:55 jgg Exp $
+// $Id: apt-get.cc,v 1.57 1999/04/20 05:59:29 jgg Exp $
/* ######################################################################
apt-get - Cover for dpkg
@@ -1321,6 +1321,7 @@ bool ShowHelp(CommandLine &CmdL)
cout << " -f Attempt to continue if the integrity check fails" << endl;
cout << " -m Attempt to continue if archives are unlocatable" << endl;
cout << " -u Show a list of upgraded packages as well" << endl;
+ cout << " -b Bulid the source package after fetching itl" << endl;
cout << " -c=? Read this configuration file" << endl;
cout << " -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp" << endl;
cout << "See the apt-get(8), sources.list(5) and apt.conf(5) manual" << endl;
diff --git a/debian/changelog b/debian/changelog
index 4bf7dfae3..c6089630f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+apt (0.3.5) unstable; urgency=low
+
+ * Fix for apt-cdrom and unusual disk label locations. Closes: #35571
+ * Made APT print numbers in decimal. Closes: #35617
+ * Buffer munching fix for FTP. Closes: #35868
+ * Typo in sample config file. Closes: #35907
+ * Fixed whitespace in version compares. Closes: #35968, #36283
+ * Changed installed size counter to only count unpacked packages.
+ Closes: #36201
+ * apt-get source support. Closes: #23934, #27190
+ * Renames .debs that fail MD5 checking, provides automatic corruption
+ recovery. Closes: #35931
+
+ -- Adam Heath <doogie@debian.org> Sun, 4 Apr 1999 18:26:44 -0500
+
apt (0.3.4) unstable; urgency=low
* Release for Ben while he is out of town.