[Aptitude-devel] Modifications to src/ in "debian" branch?

[Manuel A. Fernandez Montecelo]

Hello,

Maybe you already noticed this before, but there are modifications
from the "debian" branch other than Makefile.in, changes to the source
code itself, e.g.:
----------------------------------------------------------------------------------------
$ PAGER="" git diff master..debian src/cmdline/text_progress.cc
diff --git a/src/cmdline/text_progress.cc b/src/cmdline/text_progress.cc
index da9c2db..05b8855 100644
--- a/src/cmdline/text_progress.cc
+++ b/src/cmdline/text_progress.cc
@@ -137,13 +137,9 @@ namespace aptitude
       bool hidden = false;

       if(!isatty(1) ||
-         aptcfg->FindI("quiet", 0) >= 1 ||
-         aptcfg->FindB("quiet::NoUpdate", false) == true)
+         aptcfg->FindI("Quiet", 0))
         hide_tty_decorations = true;

-      if(aptcfg->FindI("quiet", 0) >= 2)
-        hidden = true;
-
       if(require_tty_decorations && hide_tty_decorations)
         hidden = true;
----------------------------------------------------------------------------------------

Probably this is due to some oversight, but I guess that it should be
corrected and that "debian" should only contain the added "debian/"
dir, or at most some building-system related stuff.

What do you think?  Any volunteer to untangle this, if everybody
agrees that it's a good idea?

Cheers.