The following commit has been merged in the master branch:
commit 4fcb3aac35cbb826e21c9ab5bcc661bd1306f691
Author: Guillem Jover <[email protected]>
Date: Mon Jul 15 17:38:23 2013 +0200
Change user-friendly UI recommendation from dselect to apt
Suggested-by: Ma Xiaojun <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index bfa9ca1..3c888a2 100644
--- a/debian/changelog
+++ b/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.
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index ad097c4..a01d358 100644
--- a/dpkg-deb/main.c
+++ b/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>"));
diff --git a/src/main.c b/src/main.c
index bc8c714..61d9f1d 100644
--- a/src/main.c
+++ b/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;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
