merged lp:~donkult/apt/sid

diff --combined cmdline/apt-get.cc
index a6dfd82edb211920d644817c994466cbd9c17c7e,eaa982856c4a29b5c6a7ba79975f10c048006e91..c0e74b37b1601efae83d5540566ab0a8cdd91246
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -25,9 -25,6 +25,9 @@@
     ##################################################################### */
                                                                        /*}}}*/
  // Include Files                                                      /*{{{*/
 +#define _LARGEFILE_SOURCE
 +#define _LARGEFILE64_SOURCE
 +
  #include <apt-pkg/error.h>
  #include <apt-pkg/cmndline.h>
  #include <apt-pkg/init.h>
@@@ -40,6 -37,7 +40,7 @@@
  #include <apt-pkg/srcrecords.h>
  #include <apt-pkg/version.h>
  #include <apt-pkg/cachefile.h>
+ #include <apt-pkg/cacheset.h>
  #include <apt-pkg/sptr.h>
  #include <apt-pkg/md5.h>
  #include <apt-pkg/versionmatch.h>
@@@ -48,7 -46,6 +49,6 @@@
  #include <apti18n.h>
  
  #include "acqprogress.h"
- #include "cacheset.h"
  
  #include <set>
  #include <locale.h>
@@@ -66,9 -63,6 +66,9 @@@
  #include <regex.h>
  #include <sys/wait.h>
  #include <sstream>
 +
 +#define statfs statfs64
 +#define statvfs statvfs64
                                                                        /*}}}*/
  
  #define RAMFS_MAGIC     0x858458f6

diff --combined debian/changelog
index ee48ec1d21dee387d4be60fabd3927694b76e8a2,345a46579d2ccfcbb4f37e388a7de5a4a323e34e..76107f8cb736ce9a800e7dc71df9d006d75a4420
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,21 +1,34 @@@
  apt (0.7.26~exp11) experimental; urgency=low
  
-  -- Julian Andres Klode <jak@debian.org>  Wed, 21 Jul 2010 17:09:11 +0200
++  [ Julian Andres Klode ]
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - Write architecture information to history file.
 +    - Add to history whether a change was automatic or not.
 +  * apt-pkg/contrib/fileutl.cc:
 +    - Add FileFd::OpenDescriptor() (needed for python-apt's #383617).
 +  * cmdline/apt-get.cc:
 +    - Support large filesystems by using statvfs64() instead of statvfs()
 +      and statfs64() instead of statfs() (Closes: #590513).
 +  * apt-pkg/cdrom.cc:
 +    - Use link() instead of rename() for creating the CD database backup;
 +      otherwise there would be a short time without any database.
 +
+   [ David Kalnischkies ]
+   * apt-pkg/depcache.cc:
+     - handle "circular" conflicts for "all" packages correctly
+   * cmdline/apt-cache.cc:
+     - be able to omit dependency types in (r)depends (Closes: #319006)
+     - show in (r)depends the canidate per default instead of newest
+     - share the (r)depends code instead of codecopy
+   * apt-pkg/cacheset.cc:
+     - move them back to the library as they look stable now
+     - add a 'newest' pseudo target release as in pkg/newest
+   * apt-pkg/pkgcache.cc:
+     - prefer non-virtual packages in FindPreferredPkg (Closes: #590041)
+   * test/integration/*:
+     - add with bug#590041 testcase a small test "framework"
+ 
+  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 26 Jul 2010 12:40:44 +0200
  
  apt (0.7.26~exp10) experimental; urgency=low