Automated merge with http://hg.debian.org/hg/aptitude/head

3 files changed, 34 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index c0ca30bf..04fd474e 100644
--- a/NEWS
+++ b/NEWS
@@ -31,7 +31,7 @@ Version 0.4.11.2                            "How far the sky,
       resolver uses to ensure that it progresses monotonically towards
       a solution doesn't work in the presence of Recommends, so the
       resolver ended up exploring the entire space of possible
-      resolutions to packages' Recommendations.
+      resolutions to packages' Recommendations.  (Closes: #474680)
 
     * Don't crash if a package's Section is empty. (Closes: #474115)
 
@@ -54,7 +54,7 @@ Version 0.4.11.2                            "How far the sky,
       update").  (Closes: #486186 and friends)
 
     * "why" and "why-not" now appear in the list of commands in
-      "aptitude --help".
+      "aptitude --help". (Closes: #454088)
 
   + Minor bugs:
 
diff --git a/autogen.sh b/autogen.sh
index fadcbf19..c53847e9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,5 +7,4 @@ autoheader &&
 automake-1.9 --add-missing &&
 aclocal-1.9 -I m4 &&
 autoconf &&
-autoheader &&
-./configure $@
+autoheader
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 3a7f8223..d889039d 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -450,13 +450,40 @@
 	      <listitem>
 		<para>
 		  The <systemitem>libsigc++-2.0</systemitem> library,
-		  available from <ulink
+		  available in the package
+		  <systemitem>libsigc++-2.0-dev</systemitem> or from
+		  <ulink
 		  url='http://libsigc.sourceforge.net'></ulink>.
 		</para>
 	      </listitem>
 
 	      <listitem>
 		<para>
+		  The <systemitem>cwidget</systemitem> library,
+		  available in the package
+		  <systemitem>libcwidget-dev</systemitem> or from
+		  <ulink
+		  url='http://cwidget.alioth.debian.org'></ulink>.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  The <systemitem>gettext</systemitem> program, which
+		  should be included with your Linux distribution.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
+		  A <systemitem>make</systemitem> tool, such as <ulink
+		  url='http://www.gnu.org/software/make'>GNU
+		  make</ulink>.
+		</para>
+	      </listitem>
+
+	      <listitem>
+		<para>
 		  Last but not least, download the most recent
 		  &aptitude; source code, available from <ulink
 		  url='http://packages.debian.org/unstable/admin/aptitude'></ulink>.
@@ -572,9 +599,9 @@
 	    To build aptitude from the Mercurial repository, you must
 	    have the programs <systemitem>autoconf</systemitem> and
 	    <systemitem>automake</systemitem> installed.  Type
-	    <command>sh ./autogen.sh</command> to generate the files
-	    needed to compile &aptitude;, then execute
-	    <command>make</command> and <command>make
+	    <command>sh ./autogen.sh &amp;&amp; ./configure</command>
+	    to generate the files needed to compile &aptitude;, then
+	    execute <command>make</command> and <command>make
 	    install</command>.
 	  </para>
 	</section>