Merge remote-tracking branch 'origin/bugfix/bts731738-fancy-progess' into bugfix...

Conflicts:
	apt-pkg/install-progress.cc

diff --cc apt-pkg/install-progress.cc
index bfc00bd063bed5196a7c57ffa24c5945c6b6b04d,2215fb1f5a6ef471e77588aef93c67a68bddb209..0e093a5117cbf358fbe77d638661f8f2aac9ca38
--- 1/apt-pkg/install-progress.cc
--- 2/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@@ -295,14 -273,18 +295,12 @@@ void PackageManagerFancy::HandleSIGWINC
     SetupTerminalScrollArea(nr_terminal_rows);
  }
  
 -void PackageManagerFancy::Start(int child_pty)
 +void PackageManagerFancy::Start(int a_child_pty)
  {
 +   child_pty = a_child_pty;
     int nr_terminal_rows = GetNumberTerminalRows();
     if (nr_terminal_rows > 0)
--   {
        SetupTerminalScrollArea(nr_terminal_rows);
 -      // *cough*
 -      struct winsize win;
 -      ioctl(child_pty, TIOCGWINSZ, (char *)&win);
 -      win.ws_row = nr_terminal_rows - 1;
 -      ioctl(child_pty, TIOCSWINSZ, (char *)&win);
--   }
  }
  
  void PackageManagerFancy::Stop()