* doc/examples/sources.list:

  - Removed obsolete commented non-us deb-src entry, replaced it with
    'deb-src security.debian.org' one. (Closes: #411298)
* apt-pkg/contrib/mmap.cc:
  - Added instruction how to work around MMap error in MMap error message.
    (Closes: #385674, 436028)

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index eed43825087407ccd989c6e4771357e52c86f0dd..04a45811b63351a5fe00d4d7cd1466fcc88e65de 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -210,7 +210,8 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    // Just in case error check
    if (Result + Size > WorkSpace)
    {
-      _error->Error(_("Dynamic MMap ran out of room"));
+         _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+                                 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
       return 0;
    }
 
@@ -272,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
    // Just in case error check
    if (Result + Len > WorkSpace)
    {
-      _error->Error("Dynamic MMap ran out of room");
+         _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+                                 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
       return 0;
    }   
    

diff --git a/debian/changelog b/debian/changelog
index c60050fd477b926e976c6ddc57d241c02c947049..d1ccf8b8fbddcc1b26f2a0c54a733ee1cabe0593 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.7.20~exp2) unstable; urgency=low
+
+  [ Eugene V. Lyubimkin ]
+  * doc/examples/sources.list:
+    - Removed obsolete commented non-us deb-src entry, replaced it with
+      'deb-src security.debian.org' one. (Closes: #411298)
+  * apt-pkg/contrib/mmap.cc:
+    - Added instruction how to work around MMap error in MMap error message.
+      (Closes: #385674, 436028)
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 26 Nov 2008 22:06:21 +0200
+
 apt (0.7.19) unstable; urgency=low
 
   [ Eugene V. Lyubimkin ]

diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9af1c3c4ce9f43cde2dede760971471891ebee07..ef729e203d149a0d625f30de75e2c150e10dfed5 100644 (file)
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -6,4 +6,4 @@ deb http://security.debian.org stable/updates main contrib non-free
 
 # Uncomment if you want the apt-get source function to work
 #deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+#deb-src http://security.debian.org stable/updates main contrib non-free