* cmdline/apt-get.cc:

  - do not change the auto-installed information if a package
    is reinstalled

diff --git a/README.arch b/README.arch
index 92870d614a244dd4d5c9c4d13ee147444550e4b4..364e940a4bbc789b26b0afb0fe01cbfcc1375825 100644 (file)
--- a/README.arch
+++ b/README.arch
@@ -1,7 +1,7 @@
 
 You can build apt from arch, but this needs the following additional
 packages (in addtion to the usual build-depends):
 
 You can build apt from arch, but this needs the following additional
 packages (in addtion to the usual build-depends):

-xmlto perlsgml sgml2x sgmlspl docbook
+autoconf automake xmlto perlsgml sgml2x sgmlspl docbook

 
 then run:
 
 
 then run:
 

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a52a34979103343ddd8169ff5ecbd7624a3a462a..e214691f8a7aa2413ec4f449bb6c4e9e97dd6a13 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1708,7 +1708,8 @@ bool DoInstall(CommandLine &CmdL)
            // where foo is marked automatic
            if(!Remove && 
               Cache[Pkg].Install() == false && 
            // where foo is marked automatic
            if(!Remove && 
               Cache[Pkg].Install() == false && 

-              (Cache[Pkg].Flags & pkgCache::Flag::Auto))
+              (Cache[Pkg].Flags & pkgCache::Flag::Auto) &&
+              _config->FindB("APT::Get::ReInstall",false) == false)

            {
               ioprintf(c1out,_("%s set to manual installed.\n"),
                        Pkg.Name());
            {
               ioprintf(c1out,_("%s set to manual installed.\n"),
                        Pkg.Name());


@@ -2471,6 +2472,7 @@ bool DoBuildDep(CommandLine &CmdL)
                            break;
                  }
                  if (CV.end() == true)
                            break;
                  }
                  if (CV.end() == true)

+                {

                   if (hasAlternatives)
                   {
                      continue;
                   if (hasAlternatives)
                   {
                      continue;


@@ -2483,6 +2485,7 @@ bool DoBuildDep(CommandLine &CmdL)
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            (*D).Package.c_str());
                   }
                                            Last->BuildDepType((*D).Type),Src.c_str(),
                                            (*D).Package.c_str());
                   }

+                }

             }
             else
             {
             }
             else
             {

diff --git a/debian/changelog b/debian/changelog
index 5bf454aa908fef32782e1a48f3cd60d8982ecac2..e07863c2ec1c9fcc49e9917076ccb85479c7f3a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ apt (0.7.7) UNRELEASED; urgency=low
     - move unattended-upgrade before apt-get autoclean
   * fix "purge" commandline argument, closes: #133421
     (thanks to Julien Danjou for the patch)
     - move unattended-upgrade before apt-get autoclean
   * fix "purge" commandline argument, closes: #133421
     (thanks to Julien Danjou for the patch)

+  * cmdline/apt-get.cc:
+    - do not change the auto-installed information if a package
+      is reinstalled

 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.