Parcourir la source

Change user-friendly UI recommendation from dselect to apt

Suggested-by: Ma Xiaojun <damage3025@gmail.com>
Guillem Jover il y a 13 ans
Parent
commit
4fcb3aac35
3 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 2 0
      debian/changelog
  2. 3 3
      dpkg-deb/main.c
  3. 3 3
      src/main.c

+ 2 - 0
debian/changelog

@@ -127,6 +127,8 @@ dpkg (1.17.0) UNRELEASED; urgency=low
     gzip to make debootstrap life easier on non-Debian based systems.
   * Add support for gzip compression strategies to dpkg-deb. The new
     strategies are: filtered, huffman, rle and fixed.
+  * Change dpkg and dpkg-deb help output to recommend apt instead of dselect
+    as a user-friendly frontend.
 
   [ Updated programs translations ]
   * Fix typo in Spanish translation of update-alternatives.

+ 3 - 3
dpkg-deb/main.c

@@ -127,9 +127,9 @@ usage(const struct cmdinfo *cip, const char *value)
 
   printf(_(
 "\n"
-"Use `dpkg' to install and remove packages from your system, or\n"
-"`dselect' or `aptitude' for user-friendly package management.  Packages\n"
-"unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"));
+"Use 'dpkg' to install and remove packages from your system, or\n"
+"'apt' or 'aptitude' for user-friendly package management. Packages\n"
+"unpacked using 'dpkg-deb --extract' will be incorrectly installed !\n"));
 
   m_output(stdout, _("<standard output>"));
 

+ 3 - 3
src/main.c

@@ -165,7 +165,7 @@ usage(const struct cmdinfo *ci, const char *value)
 "\n"));
 
   printf(_(
-"Use `dselect' or `aptitude' for user-friendly package management.\n"));
+"Use 'apt' or 'aptitude' for user-friendly package management.\n"));
 
   m_output(stdout, _("<standard output>"));
 
@@ -174,12 +174,12 @@ usage(const struct cmdinfo *ci, const char *value)
 
 static const char printforhelp[] = N_(
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
-"Use `dselect' or `aptitude' for user-friendly package management;\n"
+"Use 'apt' or 'aptitude' for user-friendly package management;\n"
 "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
 "Type dpkg --force-help for a list of forcing options;\n"
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "\n"
-"Options marked [*] produce a lot of output - pipe it through `less' or `more' !");
+"Options marked [*] produce a lot of output - pipe it through 'less' or 'more' !");
 
 int f_pending=0, f_recursive=0, f_alsoselect=1, f_skipsame=0, f_noact=0;
 int f_autodeconf=0, f_nodebsig=0;