Deprecate Keep-Suggests and Keep-Recommends in favor of the "standard" apt equivalents. (Closes: #540230)

apt's version of MarkFollowsRecommends() reads the two options
Apt::AutoRemove::RecommendsImportant and ...::SuggestsImportant,
where aptitude historically used Aptitude::Keep-Recommends and
Aptitude::Keep-Suggests.  This means that there were two sets of
options controlling aptitude's behavior, one of them undocumented.
This change mostly just alters the documentation to make the apt
versions the "official" place to set the behavior -- and also to
document their existence.

One thing to note is that Apt::AutoRemove::RecommendsImportant
defaults to "true", whereas Aptitude::Keep-Recommends defaulted to
"false".  This is not, however, a change in behavior; instead, it
just brings the documentation in line with how the program already
behaves.

3 files changed, 46 insertions, 16 deletions

diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 8ad4606a..887b38bc 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -10210,6 +10210,35 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	    <segtitle>Default</segtitle>
 	    <segtitle>Description</segtitle>
 
+	    <seglistitem id='configApt-AutoRemove-RecommendsImportant'>
+	      <seg><literal>Apt::AutoRemove::RecommendsImportant</literal></seg>
+	      <seg><literal>true</literal></seg>
+
+	      <seg>
+		If this option is <literal>true</literal>, then
+		&aptitude; will not consider packages to be unused
+		(and thus will not automatically remove them) as long
+		as any installed package recommends them, even if
+		<literal><link
+		linkend='configAptInstall-Recommends'>Apt::Install-Recommends</link></literal>
+		is <literal>false</literal>.  For more information,
+		see <xref linkend='secAutoInstall'/>.
+	      </seg>
+	    </seglistitem>
+
+	    <seglistitem id='configApt-AutoRemove-SuggestsImportant'>
+	      <seg><literal>Apt::AutoRemove::SuggestsImportant</literal></seg>
+	      <seg><literal>false</literal></seg>
+
+	      <seg>
+		If this option is <literal>true</literal>, then
+		&aptitude; will not consider packages to be unused
+		(and thus will not automatically remove them) as long
+		as any installed package suggests them.  For more
+		information, see <xref linkend='secAutoInstall'/>.
+	      </seg>
+	    </seglistitem>
+
 	    <seglistitem id='configAptInstall-Recommends'>
 	      <seg><literal>Apt::Install-Recommends</literal></seg>
 	      <seg><literal>true</literal></seg>
@@ -10803,14 +10832,13 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      <seg><literal>false</literal></seg>
 
 	      <seg>
-		If this option is <literal>true</literal>, then
-		&aptitude; will not consider packages to be unused
-		(and thus will not automatically remove them) as long
-		as any installed package recommends them, even if
+		This is an obsolete option; use <literal><link
+		linkend='configApt-AutoRemove-RecommendsImportant'>Apt::AutoRemove::Recommends-Important</link></literal>
+		instead.  Setting this option to
+		<literal>true</literal> has the same effect as setting
 		<literal><link
-		linkend='configAptInstall-Recommends'>Apt::Install-Recommends</link></literal>
-		is <literal>false</literal>.  For more information,
-		see <xref linkend='secAutoInstall'/>.
+		linkend='configApt-AutoRemove-RecommendsImportant'>Apt::AutoRemove::Recommends-Important</link></literal>
+		to <literal>true</literal>.
 	      </seg>
 	    </seglistitem>
 
@@ -10820,11 +10848,13 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      <seg><literal>false</literal></seg>
 
 	      <seg>
-		If this option is <literal>true</literal>, then
-		&aptitude; will not consider packages to be unused
-		(and thus will not automatically remove them) as long
-		as any installed package suggests them.  For more
-		information, see <xref linkend='secAutoInstall'/>.
+		This is an obsolete option; use <literal><link
+		linkend='configApt-AutoRemove-SuggestsImportant'>Apt::AutoRemove::Suggests-Important</link></literal>
+		instead.  Setting this option to
+		<literal>true</literal> has the same effect as setting
+		<literal><link
+		linkend='configApt-AutoRemove-SuggestsImportant'>Apt::AutoRemove::Suggests-Important</link></literal>
+		to <literal>true</literal>.
 	      </seg>
 	    </seglistitem>
 
@@ -11595,11 +11625,11 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 
 	      <seg>
 		This is an obsolete option; use <literal><link
-		linkend='configKeep-Suggests'>Aptitude::Keep-Suggests</link></literal>
+		linkend='configApt-AutoRemove-SuggestsImportant'>Apt::AutoRemove::Suggests-Important</link></literal>
 		instead.  Setting this option to
 		<literal>true</literal> has the same effect as setting
 		<literal><link
-		linkend='configKeep-Suggests'>Aptitude::Keep-Suggests</link></literal>
+		linkend='configApt-AutoRemove-SuggestsImportant'>Apt::AutoRemove::Suggests-Important</link></literal>
 		to <literal>true</literal>.
 	      </seg>
 	    </seglistitem>
diff --git a/doc/en/manpage.xml b/doc/en/manpage.xml
index 0ce3531c..b8c02b28 100644
--- a/doc/en/manpage.xml
+++ b/doc/en/manpage.xml
@@ -1565,7 +1565,7 @@ libdbix-fulltextsearch-perl 0.73-10</screen>
 	  </para>
 
 	  <para>
-	    This corresponds to the pair of configuration options <literal><link linkend='configAptInstall-Recommends'>Apt::Install-Recommends</link></literal> and <literal><link linkend='configKeep-Recommends'>Aptitude::Keep-Recommends</link></literal>.
+	    This corresponds to the pair of configuration options <literal><link linkend='configAptInstall-Recommends'>Apt::Install-Recommends</link></literal> and <literal><link linkend='configApt-AutoRemove-InstallRecommends'>Apt::AutoRemove::InstallRecommends</link></literal>.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/src/main.cc b/src/main.cc
index 206ef6f8..b8bc9586 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -670,7 +670,7 @@ int main(int argc, char *argv[])
 	  break;
 	case 'R':
 	  aptcfg->SetNoUser("Apt::Install-Recommends", "false");
-	  aptcfg->SetNoUser(PACKAGE "::Keep-Recommends", "true");
+	  aptcfg->SetNoUser("Apt::AutoRemove::RecommendsImportant", "true");
 	  break;
 	case 't':
 	  aptcfg->SetNoUser("APT::Default-Release", optarg);