Merge branch 'debian/sid' into debian/experimental

Conflicts:
	cmdline/apt-get.cc
	debian/changelog

1 files changed, 38 insertions, 0 deletions

diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
new file mode 100644
index 000000000..e47bfb72d
--- /dev/null
+++ b/apt-private/acqprogress.h
@@ -0,0 +1,38 @@
+// -*- mode: cpp; mode: fold -*-
+// Description								/*{{{*/
+/* ######################################################################
+
+   Acquire Progress - Command line progress meter
+
+   ##################################################################### */
+									/*}}}*/
+#ifndef ACQPROGRESS_H
+#define ACQPROGRESS_H
+
+#include <apt-pkg/acquire.h>
+
+#include <string>
+
+class AcqTextStatus : public pkgAcquireStatus
+{
+   unsigned int &ScreenWidth;
+   char BlankLine[1024];
+   unsigned long ID;
+   unsigned long Quiet;
+   
+   public:
+   
+   virtual bool MediaChange(std::string Media,std::string Drive);
+   virtual void IMSHit(pkgAcquire::ItemDesc &Itm);
+   virtual void Fetch(pkgAcquire::ItemDesc &Itm);
+   virtual void Done(pkgAcquire::ItemDesc &Itm);
+   virtual void Fail(pkgAcquire::ItemDesc &Itm);
+   virtual void Start();
+   virtual void Stop();
+   
+   bool Pulse(pkgAcquire *Owner);
+
+   AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+};
+
+#endif