* cmdline/apt-get.cc:

  - merged patch from otavio to make the order of package selections less important

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 64882e3e8875ad58672ae0c14f3f80964f207584..b33a324ea2eceb441c5b2504784a85948b663be8 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1144,10 +1144,7 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
    }   
    else
       ExpectedInst++;
-   
-   // Install it with autoinstalling enabled.
-   if (State.InstBroken() == true && BrokenFix == false)
-      Cache.MarkInstall(Pkg,true);
+
    return true;
 }
                                                                        /*}}}*/
@@ -1538,6 +1535,20 @@ bool DoInstall(CommandLine &CmdL)
       }      
    }
 
+   for (unsigned J = 0; J < Cache->Head().PackageCount; J++)
+   {
+      pkgCache::PkgIterator I(Cache,Cache.List[J]);
+      if ((*Cache)[I].Install() == false)
+         continue;
+      
+      pkgDepCache::StateCache &State = Cache[I];
+      // Install it with autoinstalling enabled (if we not respect the minial
+      // required deps or the policy)
+      if (State.InstBroken() == true && BrokenFix == false)
+         Cache->MarkInstall(I,true);
+   }
+
+
    /* If we are in the Broken fixing mode we do not attempt to fix the
       problems. This is if the user invoked install without -f and gave
       packages */

diff --git a/configure.in b/configure.in
index f0b0d6703af0f057455389e7258eefc6230852fd..dc410b22fb975588e5fa2d34b5483dd3de7b23bf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.46")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 4c5841057ef254ee048af1fe08ca0ef1ab48a94f..1ec80ca011c1bb42eb47401df508c4c5feb8877b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.45.1) unstable; urgency=low
+apt (0.6.46) unstable; urgency=low
 
   * debian/control:
     - switched to libdb4.4 for building (closes: #381019)
@@ -7,6 +7,8 @@ apt (0.6.45.1) unstable; urgency=low
       versions of the package (closes: #257054)
     - properly handle recommends/suggests or-groups when printing the list of
       suggested/recommends packages (closes: #311619)
+    - fix the way multiple packages are installed so that the order of
+      packages on the commandline doesn't matter anymore
   * methods/http.cc:
     - check more careful for incorrect proxy settings (closes: #378868)
   * methods/gzip.cc: