integrate Anthonys rred with POC for client-side merge

Providing the benefits of both without the downsides :)
(ABI breaks or external dependencies)

For this Anthonys rred is equipped with:
- magic-filename-pickup of patches rather than explicit messages
- use of FileFd instead of FILE* to get on-the-fly uncompress
  of the gzip compressed pdiff patches

The acquire code in turn stops checking for apt-file's helper
as our own rred is now clever enough for our needs.

1 files changed, 3 insertions, 8 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 7f6443555..1185908f3 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -513,14 +513,9 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)		/*{{{*/
 	 bool pdiff_merge = _config->FindB("Acquire::PDiffs::Merge", true);
 	 if (pdiff_merge == true)
 	 {
-	    // this perl script is provided by apt-file
-	    pdiff_merge = FileExists(_config->FindFile("Dir::Bin::rred", "/usr/bin/diffindex-rred"));
-	    if (pdiff_merge == true)
-	    {
-	       // reprepro adds this flag if it has merged patches on the server
-	       std::string const precedence = Tags.FindS("X-Patch-Precedence");
-	       pdiff_merge = (precedence != "merged");
-	    }
+	    // reprepro adds this flag if it has merged patches on the server
+	    std::string const precedence = Tags.FindS("X-Patch-Precedence");
+	    pdiff_merge = (precedence != "merged");
 	 }
 
 	 if (pdiff_merge == false)