* invert the auto-mark flag only for new installs (in MarkInstall()), keep it as...

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 9adc4e3901f9cecab2f1cf42e770e71ff35e40fc..4c52c6c719aa843d863dd2fc6a26b80557c5c234 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -708,7 +708,9 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
    
    P.Mode = ModeInstall;
    P.InstallVer = P.CandidateVer;
    
    P.Mode = ModeInstall;
    P.InstallVer = P.CandidateVer;

-   P.Flags &= ~Flag::Auto;
+   // invert the auto-flag only for new installs, not for upgrades
+   if(P.Status == 0)
+      P.Flags &= ~Flag::Auto;

    if (P.CandidateVer == (Version *)Pkg.CurrentVer())
       P.Mode = ModeKeep;
        
    if (P.CandidateVer == (Version *)Pkg.CurrentVer())
       P.Mode = ModeKeep;
        

diff --git a/configure.in b/configure.in
index 2cbbd4b554333b0c29d79546f75ab59bb95f6dba..39dc6a98848edffd7913805ffa3f15dd9176e345 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_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.39ubuntu1mvo1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.39ubuntu4mvo1")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index a18f18f1a529174c7b1f05894325a7bb94ed48ac..a11b4ab311820d21f204db24f1f6c79a78881bcd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.6.39ubuntu1mvo1) unstable; urgency=low
+apt (0.6.39ubuntu4mvo1) unstable; urgency=low

 
   * Michael Vogt
     - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
 
   * Michael Vogt
     - Change debian/bugscript to use #!/bin/bash (Closes: #313402)