The 'not dead yet' release

* add hook for MarkInstall and MarkDelete (closes: #470035)
* add the various foldmarkers in apt-pkg & cmdline (no code change)
* versions with a pin of -1 shouldn't be a candidate (Closes: #355237)
* prefer mmap as memory allocator in MMap instead of a static char
  array which can (at least in theory) grow dynamic
* eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc
  which can arise if cache doesn't fit into the mmap (Closes: #535218)
* display warnings instead of errors if the parts dirs doesn't exist
* honor the dpkg hold state in new Marker hooks (closes: #64141)

diff --cc apt-pkg/acquire.cc
Simple merge

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc apt-pkg/cacheiterators.h
Simple merge

diff --cc apt-pkg/cdrom.cc
Simple merge

diff --cc apt-pkg/contrib/hashes.cc
Simple merge

diff --cc apt-pkg/contrib/mmap.cc
index 04a45811b63351a5fe00d4d7cd1466fcc88e65de,ba4482131d4c1fd7b5ddc4388d3b16c9b93ed0a1..229b18037c149ef2353ec2d5e4476e5f5704e0d7
--- 1/apt-pkg/contrib/mmap.cc
--- 2/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@@ -172,9 -171,17 +171,18 @@@ DynamicMMap::DynamicMMap(unsigned long 
  {
     if (_error->PendingError() == true)
        return;
-    
+ 
+ #ifdef _POSIX_MAPPED_FILES
+    // use anonymous mmap() to get the memory
+    Base = (unsigned char*) mmap(0, WorkSpace, PROT_READ|PROT_WRITE,
 -                      MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 -   if(Base != MAP_FAILED)
++                                MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
++   if(Base == MAP_FAILED)
+       return;
 -#endif
++#else
+    // fallback to a static allocated space
     Base = new unsigned char[WorkSpace];
     memset(Base,0,WorkSpace);
++#endif
     iSize = 0;
  }
                                                                        /*}}}*/
@@@ -185,7 -192,11 +193,11 @@@ DynamicMMap::~DynamicMMap(
  {
     if (Fd == 0)
     {
 -      munmap(Base, WorkSpace);
+ #ifdef _POSIX_MAPPED_FILES
++      if(munmap(Base, WorkSpace) < 0)
+ #else
        delete [] (unsigned char *)Base;
+ #endif
        return;
     }
     

diff --cc apt-pkg/indexcopy.cc
Simple merge

diff --cc apt-pkg/indexrecords.cc
Simple merge

diff --cc cmdline/apt-cache.cc
Simple merge

diff --cc debian/changelog
index 6e03bbbd43f1f8f0ff503eb3069f4283d52ad805,ea7e0469bdf514d16f24c1d1e05da992f729ce1a..970c7029fc4d279e1609df133a938877f395c178
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,7 @@@
  apt (0.7.22) UNRELEASED; urgency=low
  
++  The 'not dead yet' release
++  
    [ Christian Perrier ]
    * Documentation translations:
      - Fix a typo in apt-get(8) French translation. Closes: #525043
@@@ -32,58 -30,22 +34,64 @@@
    * add Debug::pkgProblemResolver::ShowScores and make the scores
      adjustable
    * do not write state file in simulate mode (closes: #433007)
-   * add hook for auto-install (closes: #470035)
-   * support IsAutoInstallOk in the resolver too
+   * add hook for MarkInstall and MarkDelete (closes: #470035)
    * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work
      correctly when downloading from multiple sites (Closes: #534752)
+   * add the various foldmarkers in apt-pkg & cmdline (no code change)
+   * versions with a pin of -1 shouldn't be a candidate (Closes: #355237)
+   * prefer mmap as memory allocator in MMap instead of a static char
+     array which can (at least in theory) grow dynamic
+   * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc
+     which can arise if cache doesn't fit into the mmap (Closes: #535218)
+   * display warnings instead of errors if the parts dirs doesn't exist
  
    [ Michael Vogt ]
-   * honor the dpkg hold state in AutoInstOk (closes: #64141)
+   * honor the dpkg hold state in new Marker hooks (closes: #64141)
    * debian/apt.cron.daily:
      - if the timestamp is too far in the future, delete it
 -
 +  * apt-pkg/acquire.cc:
 +    - make the max pipeline depth of the acquire queue configurable
 +      via Acquire::Max-Pipeline-Depth
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - add Dpkg::UseIoNice boolean option to run dpkg with ionice -c3
 +      (off by default)
 +    - send "dpkg-exec" message on the status fd when dpkg is run
 +    - provide DPkg::Chroot-Directory config option (useful for testing)
 +    - fix potential hang when in a backgroud process group
 +  * apt-pkg/algorithms.cc:
 +    - consider recommends when making the scores for the problem 
 +      resolver
 +  * apt-pkg/acquire-worker.cc:
 +    - show error details of failed methods
 +  * apt-pkg/contrib/fileutl.cc:
 +    - if a process aborts with signal, show signal number
 +  * methods/http.cc:
 +    - ignore SIGPIPE, we deal with EPIPE from write in 
 +      HttpMethod::ServerDie() (LP: #385144)
 +  * apt-pkg/indexcopy.cc:
 +    - support having CDs with no Packages file (just a Packages.gz)
 +      by not forcing a verification on non-existing files
 +     (LP: #255545)
 +    - remove the gettext from a string that consists entirely 
 +      of variables (LP: #56792)
 +  * apt-pkg/cacheiterators.h:
 +    - add missing checks for Owner == 0 in end()
 +  * apt-pkg/indexrecords.cc:
 +    - fix some i18n issues
 +  * apt-pkg/contrib/strutl.h:
 +    - add new strprintf() function to make i18n strings easier
 +    - fix compiler warning
 +  * apt-pkg/deb/debsystem.cc:
 +    - make strings i18n able 
 +  * fix problematic use of tolower() when calculating the version 
 +    hash by using locale independant tolower_ascii() function. 
 +    Thanks to M. Vefa Bicakci (LP: #80248)
 +  * build fixes for g++-4.4
 +  * cmdline/apt-mark:
 +    - add "showauto" option to show automatically installed packages
 +  * document --install-recommends and --no-install-recommends
 +    (thanks to Dereck Wonnacott, LP: #126180)
 +  
    [ Julian Andres Klode ]
    * apt-pkg/contrib/configuration.cc: Fix a small memory leak in
      ReadConfigFile.
@@@ -92,25 -54,7 +100,23 @@@
    * configure-index: document Dir::Etc::SourceParts and some other options
      (Closes: #459605)
    * Remove Eugene V. Lyubimkin from uploaders as requested.
 +  * apt-pkg/contrib/hashes.cc, apt-pkg/contrib/md5.cc:
 +    - Support reading until EOF if Size=0 to match behaviour of
 +      SHA1Summation and SHA256Summation
 +
 +  [ Osamu Aoki ]
 +  * Updated cron script to support backups by hardlinks and 
 +    verbose levels.  All features turned off by default. 
 +  * Added more error handlings.  Closes: #438803, #462734, #454989, 
 +  * Refactored condition structure to make download and upgrade performed 
 +    if only previous steps succeeded. Closes: #341970
 +  * Documented all cron script related configuration items in 
 +    configure-index.
 +
 +  [ Dereck Wonnacott ]
 +  * apt-ftparchive might write corrupt Release files (LP: #46439)
 +  * Apply --important option to apt-cache depends (LP: #16947) 
  
- 
- 
   -- Julian Andres Klode <jak@debian.org>  Fri, 03 Jul 2009 08:27:35 +0200
  
  apt (0.7.21) unstable; urgency=low

diff --cc doc/apt-get.8.xml
Simple merge

diff --cc doc/examples/configure-index
Simple merge