[Aptitude-devel] r3218 - in branches/aptitude-0.3/aptitude: . doc/en doc/en/images

Daniel Burrows dburrows@costa.debian.org
Sun, 01 May 2005 02:09:21 +0000


Author: dburrows
Date: Sun May  1 02:09:18 2005
New Revision: 3218

Added:
   branches/aptitude-0.3/aptitude/doc/en/images/solution-dialog-snapshot.png   (contents, props changed)
Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
   branches/aptitude-0.3/aptitude/doc/en/images/broken-snapshot.png
Log:
Update the broken dep tutorial.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun May  1 02:09:18 2005
@@ -1,5 +1,10 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* doc/en/aptitude.xml:
+
+	  Update the tutorial on broken dependencies to discuss the new
+	  dependency resolver.
+
 	* src/generic/problemresolver/model.tex:
 
 	  Further description of the algorithm.

Modified: branches/aptitude-0.3/aptitude/doc/en/aptitude.xml
==============================================================================
--- branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	(original)
+++ branches/aptitude-0.3/aptitude/doc/en/aptitude.xml	Sun May  1 02:09:18 2005
@@ -1064,8 +1064,8 @@
 	  unfulfilled dependencies are said to be
 	  <firstterm>broken</firstterm>.  &aptitude; will warn you
 	  when this happens, and explain why it occured.  For
-	  instance, here is what happens if you attempt to remove
-	  <systemitem>libpopt0</systemitem>:
+	  instance, here is what happens if I attempt to remove
+	  <systemitem>libexif1</systemitem>:
 	</para>
 
 	<screenshot>
@@ -1077,40 +1077,41 @@
 	    <textobject role='text'>
 <screen> Actions  Undo  Package  Search  Options  Views  Help
 f10: Menu  ?: Help  q: Quit  u: Update  g: Download/Install/Remove Pkgs
-aptitude 0.2.14.1    #Broken: 103 Will free 446kB of disk space
-idA   libpopt0                                             1.7-4      1.7-4     
-i A   libstdc++5                                           1:3.3.4-2  1:3.3.4-2
-i     libwrap0                                             7.6.dbs-4  7.6.dbs-4
-i     locales                                              2.3.2.ds1- 2.3.2.ds1-
-i     login                                                1:4.0.3-28 1:4.0.3-28
-i     makedev                                              2.3.1-70   2.3.1-70
-i     mawk                                                 1.3.3-11   1.3.3-11
-i     mbr                                                  1.1.5-2    1.1.5-2
-i     modconf                                              0.2.45.1   0.2.45.1 
-i     modutils                                             2.4.26-1   2.4.26-1
-lib for parsing cmdline parameters
-libpopt0 will be removed.                                                      #
-This will free 446kB of disk space.
-
-
-The following packages depend on libpopt0 and will be broken by its removal:
-
-
-  * abiword-gnome depends on libpopt0 (>= 1.7)
-  * alleyoop depends on libpopt0 (>= 1.7)
-  * apt-watch depends on libpopt0 (>= 1.7)</screen>
+aptitude 0.3.1       #Broken: 1   Will free 397kB of disk space
+i A   libjsw2                                              1:1.5.0-7  1:1.5.0-7
+i A   libkadm55                                            1.3.6-3    1.3.6-3
+i A   libkcal2a                                            4:3.3.2-3  4:3.3.2-3
+i A   libkcddb1                                            4:3.3.2-1  4:3.3.2-1
+i A   libkdeedu1                                           4:3.3.2-3  4:3.3.2-3
+i A   libkdenetwork2                                       4:3.3.2-3  4:3.3.2-3
+i A   libkdepim1                                           4:3.3.2-3  4:3.3.2-3
+idA   libkexif1                                    -397kB  0.2.1-2    0.2.1-2   
+library for KDE to read/display/edit EXIF informations (runtime)
+libkexif1 will be removed.
+
+
+The following packages depend on libkexif1 and will be broken by its removal:
+
+
+  * digikam depends on libkexif1 (>= 0.2.1)
+
+
+[1/2] Suggest 1 keep
+e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	    </textobject>
 	  </mediaobject>
 	</screenshot>
 
 	<para>
-	  As you can see, &aptitude; displays two indicators that
+	  As you can see, &aptitude; displays three indicators that
 	  something has gone wrong: first, the number of broken
 	  packages is displayed in the upper blue area; second, the
 	  lower half of the display changes to describe broken
 	  packages that are related to the currently highlighted
-	  package.  To quickly find broken packages in the package
-	  list, you can search for <literal>~b</literal>.
+	  package; third, a bar appears at the bottom of the screen
+	  with a suggestion on how to solve the problem.  To quickly
+	  find broken packages in the package list, you can press
+	  <keycap>b</keycap> or search for <literal>~b</literal>.
 	</para>
 
 	<tip>
@@ -1123,12 +1124,67 @@
 	</tip>
 
 	<para>
-	  If you do not resolve the situation on your own, &aptitude;
-	  will try to fix things for you when you commit your
-	  selections.  However, it is hard to automatically solve
-	  dependency problems, and you may not be happy with the
-	  results, so it is generally better to solve problems such as
-	  this before committing your selections.
+	  To see more information about how &aptitude; thinks you can
+	  solve this problem, press <keycap>e</keycap>.  You can see
+	  more solutions by pressing <keycap>.</keycap>; once you have
+	  done so, you can return to solutions you skipped past by
+	  pressing <keycap>,</keycap>.  Finally, when you have found a
+	  solution that you are satisfied with, you can press
+	  <keycap>!</keycap> to execute it.
+	</para>
+
+	<para>
+	  For instance, in the following screen-shot, I have decided
+	  that I really want to remove
+	  <systemitem>libexif1</systemitem>, even if it means that the
+	  <systemitem>digikam</systemitem> package must also be
+	  removed.  Pressing <keycap>!</keycap> or selecting the
+	  <quote>Apply</quote> button will flag
+	  <systemitem>digikam</systemitem> for removal, resolving the
+	  broken dependency.
+	</para>
+
+	<screenshot>
+	  <mediaobject>
+	    <imageobject>
+	      <imagedata fileref='images/solution-dialog-snapshot.png' format='PNG'/>
+	    </imageobject>
+
+	    <textobject role='text'>
+<screen> Actions  Undo  Package  Search  Options  Views  Help
+f10: Menu  ?: Help  q: Quit  u: Update  g: Download/Install/Remove Pkgs
+aptitude 0.3.1       #Broken: 1   Will free 397kB of disk space
+i A   libjsw2                                              1:1.5.0-7  1:1.5.0-7
+i A   libkadm55                                            1.3.6-3    1.3.6-3
+i A   libkcal2a                                            4:3.3.2-3  4:3.3.2-3
+i A   libkcddb1                                            4:3.3.2-1  4:3.3.2-1
+i A   libkdeedu1                                           4:3.3.2-3  4:3.3.2-3
+i A   libkdenetwork2+--------------------------------------+:3.3.2-3  4:3.3.2-3
+i A   libkdepim1    |Remove the following packages:        |:3.3.2-3  4:3.3.2-3
+idA   libkexif1     |digikam                               |.2.1-2    0.2.1-2
+library for KDE to r|                                      |ime)
+libkexif1 will be re|Score is -261                         |
+                    |[ Previous ][ Next ][ Apply ][ Close ]|
+                    +--------------------------------------+
+The following packages depend on libkexif1 and will be broken by its removal:
+
+
+  * digikam depends on libkexif1 (>= 0.2.1)
+
+
+[2/2] Suggest 1 removal
+e: Examine  !: Apply  .: Next  ,: Previous</screen>
+	    </textobject>
+	  </mediaobject>
+	</screenshot>
+
+	<para>
+	  If you do not resolve the situation, &aptitude; will try to
+	  fix things for you when you commit your selections by
+	  pressing <keycap>g</keycap>.  However, it is hard to
+	  automatically solve dependency problems, and you may not be
+	  happy with the results, so it is generally better to solve
+	  problems such as this before committing your selections.
 	</para>
       </section>
 

Modified: branches/aptitude-0.3/aptitude/doc/en/images/broken-snapshot.png
==============================================================================
Binary files. No diff available.

Added: branches/aptitude-0.3/aptitude/doc/en/images/solution-dialog-snapshot.png
==============================================================================
Binary file. No diff available.