The following commit has been merged in the master branch:
commit 06b64be7ba505c51f8673e7ba323629e9c60574d
Author: Guillem Jover <[email protected]>
Date: Tue Feb 23 00:08:12 2010 +0100
Remove --license and --licence options from tools
The options are pretty useless and non-standard. The user can surely
cat a file from the installed package. In addition this option has not
worked ever on non-Debian systems as it's relying on the GPL-2 file
from the base-files Debian package. So remove it, and we get some code
reduction as a nice side-effect.
diff --git a/debian/changelog b/debian/changelog
index b1b6f9a..ed8624c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -111,6 +111,7 @@ dpkg (1.15.6) UNRELEASED; urgency=low
* On dpkg --no-act with --install, --unpack or --record-avail, and
dpkg-deb --info or --field use mkdtemp() to create a temporary directory
instead of insecure tempnam() or tmpnam() functions.
+ * Remove --license and --licence options from tools.
[ Modestas Vainius ]
* Implement symbol patterns (Closes: #563752). From now on, it is possible to
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 5faa7eb..1b77acf 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -56,8 +56,7 @@ printversion(const struct cmdinfo *cip, const char *value)
BACKEND, DPKG_VERSION_ARCH);
printf(_(
"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), BACKEND);
+"later for copying conditions. There is NO warranty.\n"));
m_output(stdout, _("<standard output>"));
@@ -87,7 +86,6 @@ usage(const struct cmdinfo *cip, const char *value)
printf(_(
" -h|--help Show this help message.\n"
" --version Show the version.\n"
-" --license|--licence Show the copyright licensing terms.\n"
"\n"));
printf(_(
@@ -192,10 +190,6 @@ static const struct cmdinfo cmdinfos[]= {
{ "showformat", 0, 1, NULL, &showformat, NULL },
{ "help", 'h', 0, NULL, NULL, usage },
{ "version", 0, 0, NULL, NULL, printversion },
- /* UK spelling. */
- { "licence", 0, 0, NULL, NULL, showcopyright },
- /* US spelling. */
- { "license", 0, 0, NULL, NULL, showcopyright },
{ NULL, 0, 0, NULL, NULL, NULL }
};
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index eac1d50..82a672d 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -48,8 +48,7 @@ printversion(const struct cmdinfo *cip, const char *value)
printf(_("Copyright (C) 1994-1996 Ian Jackson.\n"));
printf(_(
"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), SPLITTER);
+"later for copying conditions. There is NO warranty.\n"));
m_output(stdout, _("<standard output>"));
@@ -76,7 +75,6 @@ usage(const struct cmdinfo *cip, const char *value)
printf(_(
" -h|--help Show this help message.\n"
" --version Show the version.\n"
-" --license|--licence Show the copyright licensing terms.\n"
"\n"));
printf(_(
@@ -153,8 +151,6 @@ static const struct cmdinfo cmdinfos[]= {
{ "discard", 'd', 0, NULL, NULL, setaction },
{ "help", 'h', 0, NULL, NULL, usage },
{ "version", 0, 0, NULL, NULL, printversion },
- { "licence", 0, 0, NULL, NULL, showcopyright },
/* UK spelling */
- { "license", 0, 0, NULL, NULL, showcopyright },
/* US spelling */
{ "depotdir", 0, 1, NULL, &depotdir, NULL },
{ "partsize", 'S', 1, NULL, NULL, setpartsize },
{ "output", 'o', 1, NULL, &outputfile, NULL },
diff --git a/dselect/main.cc b/dselect/main.cc
index df01370..9b3ad46 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -161,8 +161,7 @@ static const char copyrightstring[]= N_(
static const char licensestring[]= N_(
"This is free software; see the GNU General Public License version 2
or\n"
- "later for copying conditions. There is NO warranty.\n"
- "See %s --license for copyright and license details.\n");
+ "later for copying conditions. There is NO warranty.\n");
static void DPKG_ATTR_NORET
printversion(const struct cmdinfo *ci, const char *value)
@@ -197,7 +196,6 @@ usage(const struct cmdinfo *ci, const char *value)
printf(_(
" --help Show this help message.\n"
" --version Show the version.\n"
-" --license | --licence Show the license.\n"
"\n"));
printf(_(
@@ -308,8 +306,6 @@ static const struct cmdinfo cmdinfos[]= {
{ "expert", 'E', 0, 0, 0, setexpert },
{ "help", 'h', 0, 0, 0, usage },
{ "version", 0, 0, 0, 0, printversion },
- { "licence", 0, 0, 0, 0, showcopyright }, /* UK spelling
*/
- { "license", 0, 0, 0, 0, showcopyright }, /* US spelling
*/
{ "color", 0, 1, 0, 0, setcolor }, /* US spelling
*/
{ "colour", 0, 1, 0, 0, setcolor }, /* UK spelling
*/
{ 0, 0, 0, 0, 0, 0 }
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index 1699784..557a916 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -7,7 +7,6 @@ pkgconfdir = $(sysconfdir)/@PACKAGE@
AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DCONFIGDIR=\"$(pkgconfdir)\" \
- -DCOPYINGFILE=\"$(datadir)/common-licenses/GPL-2\" \
-idirafter $(top_srcdir)/lib/compat \
-I$(top_builddir) \
-I$(top_srcdir)/lib
@@ -37,7 +36,6 @@ libdpkg_a_SOURCES = \
md5.c md5.h \
mlib.c \
myopt.c myopt.h \
- myopt-util.c \
nfmalloc.c \
parse.c \
parsehelp.c \
diff --git a/lib/dpkg/myopt-util.c b/lib/dpkg/myopt-util.c
deleted file mode 100644
index b7596ec..0000000
--- a/lib/dpkg/myopt-util.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * libdpkg - Debian packaging suite library routines
- * myopt-util.c - command line option utilities
- *
- * Copyright © 1994,1995 Ian Jackson <[email protected]>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <dpkg/i18n.h>
-#include <dpkg/dpkg.h>
-#include <dpkg/buffer.h>
-#include <dpkg/myopt.h>
-
-void
-showcopyright(const struct cmdinfo *cip, const char *value)
-{
- int fd;
-
- fd = open(COPYINGFILE, O_RDONLY);
- if (fd < 0)
- ohshite(_("cannot open GPL file"));
- fd_fd_copy(fd, 1, -1, "showcopyright");
- exit(0);
-}
-
diff --git a/man/dpkg-deb.1 b/man/dpkg-deb.1
index bb08dc9..8f5c5df 100644
--- a/man/dpkg-deb.1
+++ b/man/dpkg-deb.1
@@ -166,9 +166,6 @@ Show the usage message and exit.
.TP
.BR \-\-version
Show the version and exit.
-.TP
-.BR \-\-license ", " \-\-licence
-Show the copyright licensing terms and exit.
.
.SH OPTIONS
.TP
diff --git a/man/dpkg-name.1 b/man/dpkg-name.1
index 4d78cb4..015cb15 100644
--- a/man/dpkg-name.1
+++ b/man/dpkg-name.1
@@ -60,9 +60,6 @@ Show the usage message and exit.
.TP
.BR \-v ", " \-\-version
Show the version and exit.
-.TP
-.BR \-l ", " \-\-license
-Show the copyright licensing terms and exit.
.
.SH EXAMPLES
.TP
diff --git a/man/dpkg-query.1 b/man/dpkg-query.1
index 8fc7bf9..fbd6039 100644
--- a/man/dpkg-query.1
+++ b/man/dpkg-query.1
@@ -73,9 +73,6 @@ Show the usage message and exit.
.TP
.B \-\-version
Show the version and exit.
-.TP
-.BR \-\-license ", " \-\-licence
-Show the copyright licensing terms and exit.
.
.SH OPTIONS
.TP
diff --git a/man/dpkg-split.1 b/man/dpkg-split.1
index 4b8aa1b..7fd4039 100644
--- a/man/dpkg-split.1
+++ b/man/dpkg-split.1
@@ -130,9 +130,6 @@ Show the usage message and exit.
.TP
.BR \-\-version
Show the version and exit.
-.TP
-.BR \-\-license ", " \-\-licence
-Show the copyright licensing terms and exit.
.
.SH OPTIONS
.TP
diff --git a/man/dpkg-trigger.1 b/man/dpkg-trigger.1
index a286e67..a744ee1 100644
--- a/man/dpkg-trigger.1
+++ b/man/dpkg-trigger.1
@@ -34,9 +34,6 @@ Show the usage message and exit.
.TP
.B \-\-version
Show the version and exit.
-.TP
-.BR \-\-license ", " \-\-licence
-Show the copyright licensing terms and exit.
.
.SH OPTIONS
.TP
diff --git a/man/dpkg.1 b/man/dpkg.1
index e88d007..30be4ac 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -263,9 +263,6 @@ Give help about the \fB\-\-force\-\fP\fIthing\fP options.
.BR \-Dh ", " \-\-debug=help
Give help about debugging options.
.TP
-\fB\-\-licence\fP, \fB\-\-license\fP
-Display \fBdpkg\fP licence.
-.TP
\fB\-\-version\fP
Display \fBdpkg\fP version information.
.TP
diff --git a/man/dselect.1 b/man/dselect.1
index 6bceb2d..fb20410 100644
--- a/man/dselect.1
+++ b/man/dselect.1
@@ -8,7 +8,6 @@ dselect \- Debian package management frontend
.IR <directory> ]
.RB [ \-\-help ]
.RB [ \-\-version ]
-.RB [ \-\-licence | \-\-license ]
.RB [ \-\-expert ]
.RB [ \-\-debug | \-D\fI<file>\fP ]
.RI [ <action> ]
@@ -123,10 +122,6 @@ blink, bright, dim, bold
.B \-\-help
Print a brief help text and exit successfully.
.TP
-.BR \-\-licence | \-\-license
-Displays the \fBdselect\fP copyright and license information and exits
-successfully.
-.TP
.B \-\-version
Print version information and exit successfully.
.
@@ -457,7 +452,7 @@ broken, it is also much more flexible than the built in
access methods.
.SH AUTHORS
.B dselect
was written by Ian Jackson ([email protected]). Full list of
-contributors may be found in `dselect \-\-license'.
+contributors may be found in 'dselect \-\-version'.
.br
This manual page was written by Juho Vuori <[email protected]>,
Josip Rodin and Joost kooij.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1fad898..053b985 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,7 +16,6 @@ lib/dpkg/log.c
lib/dpkg/md5.c
lib/dpkg/mlib.c
lib/dpkg/myopt.c
-lib/dpkg/myopt-util.c
lib/dpkg/nfmalloc.c
lib/dpkg/parse.c
lib/dpkg/parsehelp.c
diff --git a/src/main.c b/src/main.c
index 6065d35..9f3a5b7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,8 +57,7 @@ printversion(const struct cmdinfo *ci, const char *value)
DPKG, DPKG_VERSION_ARCH);
printf(_(
"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), DPKG);
+"later for copying conditions. There is NO warranty.\n"));
m_output(stdout, _("<standard output>"));
@@ -106,7 +105,6 @@ usage(const struct cmdinfo *ci, const char *value)
printf(_(
" -h|--help Show this help message.\n"
" --version Show the version.\n"
-" --license|--licence Show the copyright licensing terms.\n"
"\n"));
printf(_(
@@ -166,7 +164,6 @@ const char printforhelp[]= 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"
-"Type dpkg --license for copyright license and lack of warranty (GNU GPL)
[*].\n"
"\n"
"Options marked [*] produce a lot of output - pipe it through `less' or `more'
!");
@@ -522,10 +519,6 @@ static const struct cmdinfo cmdinfos[]= {
{ "debug", 'D', 1, NULL, NULL, setdebug, 0 },
{ "help", 'h', 0, NULL, NULL, usage, 0 },
{ "version", 0, 0, NULL, NULL, printversion, 0 },
- /* UK spelling. */
- { "licence", 0, 0, NULL, NULL, showcopyright, 0 },
- /* US spelling. */
- { "license", 0, 0, NULL, NULL, showcopyright, 0 },
ACTIONBACKEND( "build", 'b', BACKEND),
ACTIONBACKEND( "contents", 'c', BACKEND),
ACTIONBACKEND( "control", 'e', BACKEND),
diff --git a/src/query.c b/src/query.c
index c22c915..5273587 100644
--- a/src/query.c
+++ b/src/query.c
@@ -564,8 +564,7 @@ printversion(const struct cmdinfo *ci, const char *value)
DPKGQUERY, DPKG_VERSION_ARCH);
printf(_(
"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), DPKGQUERY);
+"later for copying conditions. There is NO warranty.\n"));
m_output(stdout, _("<standard output>"));
@@ -594,7 +593,6 @@ usage(const struct cmdinfo *ci, const char *value)
printf(_(
" -h|--help Show this help message.\n"
" --version Show the version.\n"
-" --license|--licence Show the copyright licensing terms.\n"
"\n"));
printf(_(
@@ -618,9 +616,7 @@ usage(const struct cmdinfo *ci, const char *value)
}
const char thisname[]= "dpkg-query";
-const char printforhelp[]= N_("\
-Use --help for help about querying packages;\n\
-Use --license for copyright license and lack of warranty (GNU GPL).");
+const char printforhelp[]= N_("Use --help for help about querying packages.");
const struct cmdinfo *cipaction = NULL;
@@ -655,10 +651,6 @@ static const struct cmdinfo cmdinfos[]= {
{ "showformat", 'f', 1, NULL, &showformat, NULL },
{ "help", 'h', 0, NULL, NULL, usage },
{ "version", 0, 0, NULL, NULL, printversion },
- /* UK spelling. */
- { "licence", 0, 0, NULL, NULL, showcopyright },
- /* US spelling */
- { "license", 0, 0, NULL, NULL, showcopyright },
{ NULL, 0, 0, NULL, NULL, NULL }
};
diff --git a/src/statcmd.c b/src/statcmd.c
index 13fe8d1..9f5e473 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -47,9 +47,7 @@
#include "filesdb.h"
const char thisname[] = "dpkg-statoverrides";
-const char printforhelp[] = N_(
-"Use --help for help about querying packages;\n"
-"Use --license for copyright license and lack of warranty (GNU GPL).");
+const char printforhelp[] = N_("Use --help for help about querying packages.");
static void DPKG_ATTR_NORET
printversion(const struct cmdinfo *cip, const char *value)
@@ -402,10 +400,6 @@ static const struct cmdinfo cmdinfos[] = {
{ "update", 0, 0, &opt_update, NULL, NULL, 1 },
{ "help", 'h', 0, NULL, NULL, usage },
{ "version", 0, 0, NULL, NULL, printversion },
- /* UK spelling */
- { "licence", 0, 0, NULL, NULL, showcopyright },
- /* US spelling */
- { "license", 0, 0, NULL, NULL, showcopyright },
{ NULL, 0 }
};
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 85d2fec..32650fe 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -53,8 +53,7 @@ printversion(const struct cmdinfo *ci, const char *value)
printf(_(
"This is free software; see the GNU General Public License version 2 or\n"
-"later for copying conditions. There is NO warranty.\n"
-"See %s --license for copyright and license details.\n"), thisname);
+"later for copying conditions. There is NO warranty.\n"));
m_output(stdout, _("<standard output>"));
@@ -77,7 +76,6 @@ usage(const struct cmdinfo *ci, const char *value)
printf(_(
" -h|--help Show this help message.\n"
" --version Show the version.\n"
-" --license|--licence Show the copyright licensing terms.\n"
"\n"));
printf(_(
@@ -174,10 +172,6 @@ static const struct cmdinfo cmdinfos[] = {
{ "check-supported", 0, 0, &f_check, NULL, NULL, 1 },
{ "help", 'h', 0, NULL, NULL, usage },
{ "version", 0, 0, NULL, NULL, printversion },
- /* UK spelling */
- { "licence", 0, 0, NULL, NULL, showcopyright },
- /* US spelling */
- { "license", 0, 0, NULL, NULL, showcopyright },
{ NULL }
};
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
