merged from david

diff --cc debian/changelog
index 035d3378a0608ef6e33a3e8dce19c5e38f7f6abc,3bed49ec06d6eaad4c59c1ea9ef34f5730cbc2c5..3c50c1b4e17650255a3ed5985be3d9ac27963096
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,41 +1,41 @@@
 -apt (0.9.7.3) UNRELEASED; urgency=low
+ apt (0.9.7.4) UNRELEASED; urgency=low
+ 
+   [ Manpages translation updates ]
+   * Polish (Robert Luberda) (Closes: #683109)
+ 
+   [ Program translation updates ]
+   * Polish (Michał Kułach)
+ 
+   [ Pino Toscano ]
+   * apt-pkg/contrib/mmap.cc:
+     - guard only the msync call with _POSIX_SYNCHRONIZED_IO rather
+       than also the fallback code as it breaks APT on hurd since 0.9.7.3
+       as the fallback is now always used on non-linux (Closes: #683354)
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/contrib/fileutl.cc:
+     - remove _POSIX_SYNCHRONIZED_IO guard in FileFd::Sync() around fsync
+       as this guard is only needed for fdatasync and not defined on hurd
+   * cmdline/apt-get.cc:
+     - error out on (unsatisfiable) build-deps on purly virtual packages
+       instead of ignoring these dependencies; thanks to Johannes Schauer
+       for the detailed report! (Closes: #683786)
+     - ensure that the right architecture is used for cross-dependencies in
+       cases we have to choose a provider by defaulting on host-arch
+       instead of build-arch
+   * doc/apt-verbatim.ent:
+     - denote 'wheezy' as stable codename and 'jessie' as testing codename
+       in the documentation in preparation for release
+   * apt-pkg/indexcopy.cc:
+     - do not use atomic writing if the target is /dev/null as we don't want
+       to replace it, not even automically. (Closes: #683410)
+   * apt-pkg/cdrom.cc:
+     - do not link() but rename() the cdroms.list to cdroms.list~ as a backup
+       to ensure that apt-cdrom can be run multiple times (Closes: #676302)
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jul 2012 11:45:57 +0200
+ 
 +apt (0.9.7.3) unstable; urgency=low
  
    [ Manpages translation updates ]
    * Spanish; (Omar Campagne). Closes: #681566

diff --cc doc/apt-verbatim.ent
index 5184cd339be65cad9571a89b58dcde219ce7d4ee,312a5cdff0e68f3937e20d06be252f48472df71b..2a6b69f2c04a180115267962b6307935ac43fe09
--- 1/doc/apt-verbatim.ent
--- 2/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@@ -213,13 -213,13 +213,13 @@@
  ">
  
  <!-- this will be updated by 'prepare-release' -->
 -<!ENTITY apt-product-version "0.9.7.2">
 +<!ENTITY apt-product-version "0.9.7.3">
  
  <!-- Codenames for debian releases -->
- <!ENTITY oldstable-codename "lenny">
- <!ENTITY stable-codename "squeeze">
- <!ENTITY testing-codename "wheezy">
- <!ENTITY stable-version "6.0">
+ <!ENTITY oldstable-codename "squeeze">
+ <!ENTITY stable-codename "wheezy">
+ <!ENTITY testing-codename "jessie">
+ <!ENTITY stable-version "7.0">
  <!ENTITY ubuntu-codename "precise">
  
  <!-- good and bad just refers to matching and not matching a pattern…