* apt-pkg/algorithms.cc:

  - bugfix in the InstallProcted() code (preserver the auto-install information)
* cmdline/makefile:
  - install apt-mark as well

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index ac9d3be0bea35a05c93d4545c1996c8c7a91f349..55f44fbd5c6bba50dc5813f4b7a41488b65b128b 100644 (file)
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1229,8 +1229,13 @@ void pkgProblemResolver::InstallProtect()
       {
         if ((Flags[I->ID] & ToRemove) == ToRemove)
            Cache.MarkDelete(I);
-        else
-           Cache.MarkInstall(I, false, 0, false);
+        else 
+        {
+           // preserver the information if the package was auto
+           // or manual installed
+           bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto);
+           Cache.MarkInstall(I, false, 0, !autoInst);
+        }
       }
    }   
 }

diff --git a/cmdline/makefile b/cmdline/makefile
index 882a0e1b564a9d8125225e6a92b1f961a874392b..49035be4493c8d08d3a2d1ac63ea4cd13d4418aa 100644 (file)
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -52,3 +52,9 @@ SOURCE=apt-key
 TO=$(BIN)
 TARGET=program
 include $(COPY_H)
+
+# The apt-mark program
+SOURCE=apt-mark
+TO=$(BIN)
+TARGET=program
+include $(COPY_H)