Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1

Conflicts:
	configure.ac
	debian/changelog

1 files changed, 5 insertions, 3 deletions

diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index 86884dcfc..d8a10e0bb 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -127,8 +127,10 @@ class PackagesWriter : public FTWScanner
       {return Over.ReadExtraOverride(File);};
    virtual bool DoPackage(string FileName);
 
-   PackagesWriter(string const &DB,string const &Overrides,string const &ExtOverrides=string(),
-		  string const &Arch=string());
+   PackagesWriter(string const &DB,
+                  string const &Overrides,
+                  string const &ExtOverrides = "",
+		  string const &Arch = "");
    virtual ~PackagesWriter() {};
 };
 
@@ -174,7 +176,7 @@ class SourcesWriter : public FTWScanner
    string PathPrefix;
    string DirStrip;
    FILE *Output;
-   struct CacheDB::Stats Stats;
+   struct CacheDB::Stats &Stats;
 
    virtual bool DoPackage(string FileName);