Uncommitted built-in help for apt-cache for Lenny.

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 420630694ec086a1e22330422b668d2184d5b717..f10ea48be3bd8f15a7129ff4cfda75066ec15cff 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1739,8 +1739,8 @@ bool ShowHelp(CommandLine &Cmd)
       "   show - Show a readable record for the package\n"
       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"
       "   show - Show a readable record for the package\n"
       "   depends - Show raw dependency information for a package\n"
       "   rdepends - Show reverse dependency information for a package\n"

-      "   pkgnames - List the names of all packages in the system\n"
-      "   dotty - Generate package graphs for GraphViz\n"
+      "   pkgnames - List the names of all packages\n"
+      "   dotty - Generate package graphs for GraphVis\n"

       "   xvcg - Generate package graphs for xvcg\n"
       "   policy - Show policy settings\n"
       "\n"
       "   xvcg - Generate package graphs for xvcg\n"
       "   policy - Show policy settings\n"
       "\n"

diff --git a/debian/changelog b/debian/changelog
index 8c1ce3bd7de73f7f53f10cb8fee3f0453c27e569..c9853169acac1300dd78e54d963d62987c7c8c95 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,9 +35,6 @@ apt (0.7.17) unstable; urgency=low
     - Lowercased short package descriptions.
     - Bumped 'Standards-Version' to 3.8.0, no changes needed.
     - Actualized 'Uploaders' field.
     - Lowercased short package descriptions.
     - Bumped 'Standards-Version' to 3.8.0, no changes needed.
     - Actualized 'Uploaders' field.

-  * cmdline/apt-cache.cc:
-    - Advanced built-in help. Patch by Andre Felipe Machado. (Closes: #286061)
-    - Fixed typo 'GraphVis' -> 'GraphViz'. (Closes: #349038)

   * doc/:
     - Substituded 'apt-archive' with 'apt-ftparchive' in docs.
       Patch based on work of Andre Felipe Machado. (Closes: #350865)
   * doc/:
     - Substituded 'apt-archive' with 'apt-ftparchive' in docs.
       Patch based on work of Andre Felipe Machado. (Closes: #350865)