summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2015-04-02 23:56:02 +0200
committerGuillem Jover <guillem@debian.org>2015-04-06 05:09:32 +0200
commit770965969c0ec9edc91ab9cdada5c97b022809dd (patch)
tree66b295928cacdfa7930c06e84e1d1600701fa331
parentf79acb2abcecc8aa8e28ca85e149789aa98fc723 (diff)
downloaddpkg-770965969c0ec9edc91ab9cdada5c97b022809dd.tar.gz
dpkg: Add --ctrl-tarfile forwarding command for dpkg-deb
-rw-r--r--debian/changelog1
-rw-r--r--man/dpkg.12
-rw-r--r--src/main.c6
3 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index aacbd9aae..36b7f835e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -123,6 +123,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
* Document in man pages the dpkg version when new features were introduced.
* Document that timestamps are reset for files patched with source format
“3.0 (quilt)” too.
+ * Add dpkg --ctrl-tarfile forwarding command for dpkg-deb.
[ Raphaël Hertzog ]
* Drop myself from Uploaders.
diff --git a/man/dpkg.1 b/man/dpkg.1
index f39a68085..8385865df 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -376,6 +376,8 @@ See \fBdpkg\-deb\fP(1) for more information about the following actions.
package.
\fB\-f\fP, \fB\-\-field\fP \fIarchive\fP [\fIcontrol-field\fP...]
Display control field(s) of a package.
+.BR \-\-ctrl\-tarfile " \fIarchive\fP"
+ Output the control tar-file contained in a Debian package.
\fB\-\-fsys\-tarfile\fP \fIarchive\fP
Display the filesystem tar-file contained by a
Debian package.
diff --git a/src/main.c b/src/main.c
index 4cb846a97..8d449ead5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -120,8 +120,9 @@ usage(const struct cmdinfo *ci, const char *value)
"\n"));
printf(_(
-"Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile on archives (type %s --help).\n"
+"Use dpkg with -b, --build, -c, --contents, -e, --control, -I, --info,\n"
+" -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-tarfile\n"
+"on archives (type %s --help).\n"
"\n"), BACKEND);
printf(_(
@@ -740,6 +741,7 @@ static const struct cmdinfo cmdinfos[]= {
ACTIONBACKEND( "field", 'f', BACKEND),
ACTIONBACKEND( "extract", 'x', BACKEND),
ACTIONBACKEND( "vextract", 'X', BACKEND),
+ ACTIONBACKEND( "ctrl-tarfile", 0, BACKEND),
ACTIONBACKEND( "fsys-tarfile", 0, BACKEND),
{ NULL, 0, 0, NULL, NULL, NULL, 0 }
};