Merge lp:~dktrkranz/synaptic/manual into lp:synaptic

[Luca Falavigna]

* common/rpackageview.cc:
  - Do not display base packages in manual view.

[Michael Vogt (mvo)]

Thanks for your branch.

I have to say that I'm a bit in split minds about it. Technically "Install (manual)" is no longer quite correct with it. But I see the value in protecting users from removing important stuff and apt will also not garbage collect stuff in manual mode.

=== modified file 'common/rpackageview.cc'
--- common/rpackageview.cc	2010-05-04 13:53:00 +0000
+++ common/rpackageview.cc	2010-11-28 00:25:41 +0000
@@ -151,7 +151,8 @@
    }
 
    if ((flags & RPackage::FInstalled) &&
-       !(flags & RPackage::FIsAuto))
+       !(flags & RPackage::FIsAuto) &&
+       !(flags & RPackage::FImportant))
    {
       str = _("Installed (manual)");
       _view[str].push_back(pkg);

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-23 16:43:38 +0000
+++ debian/changelog	2010-11-28 00:25:41 +0000
@@ -1,5 +1,6 @@
 synaptic (0.70~pre3) UNRELEASED; urgency=low
   
+  [ Michael Vogt ]
   * gtk/rgmainwindow.cc:
     - show message in quick search label if no apt-xapian-index can
       be found
@@ -7,6 +8,10 @@
   * po/hu.po:
     - updated, thanks to Gabor Kum 
   
+  [ Luca Falavigna ]
+  * common/rpackageview.cc:
+    - Do not display base packages in manual view.
+
  -- Michael Vogt <[e-mail]>  Wed, 10 Nov 2010 19:44:31 +0100
 
 synaptic (0.70~pre2) unstable; urgency=low