The following commit has been merged in the master branch:
commit afe7def40f32d22a8c51c16c3e38a6f8a7de7a27
Author: James Vega <[email protected]>
Date: Tue Sep 20 21:14:42 2011 -0400
Doc updates for debsign/debrsign
Signed-off-by: James Vega <[email protected]>
diff --git a/scripts/debrsign.1 b/scripts/debrsign.1
index e1a839d..1a17131 100644
--- a/scripts/debrsign.1
+++ b/scripts/debrsign.1
@@ -46,7 +46,7 @@ use the most recent file with the name pattern
changes files produced by \fBdpkg-cross\fR.
.TP
\fB\-\-path \fIremote-path\fR
-Specify a path to the GPG or PGP binary on the remote host.
+Specify a path to the GPG binary on the remote host.
.TP
\fB\-\-help\fR, \fB\-\-version\fR
Show help message and version information respectively.
diff --git a/scripts/debrsign.sh b/scripts/debrsign.sh
index 9d3634e..2073ec0 100755
--- a/scripts/debrsign.sh
+++ b/scripts/debrsign.sh
@@ -10,18 +10,6 @@
# You should run this program from within the package directory on
# the build machine.
#
-# Usage: debrsign [options] [user@]remotehost [changes or dsc file]
-# You may also provide the following options, which will be passed
-# on to signchanges:
-# -m<maintainer> Sign using key of <maintainer>
-# -k<key> The PGP/GPG key ID to use; overrides -m
-# -p<type> <type> is either pgp or gpg to specify which to use
-# -spgp,-sgpg The program takes arguments like pgp or gpg respectively
-# -S Source-only .changes file
-# -a<arch> Debian architecture
-# -t<type> GNU machine type
-# --multi Search for multiarch .changes files
-# --help, --version
# Debian GNU/Linux debrsign.
# Copyright 1999 Mike Goldman, all rights reserved
@@ -50,8 +38,7 @@ usage () {
echo \
"Usage: debrsign [options] [username@]remotehost [changes or dsc]
Options:
- -sgpg, -spgp Sign takes options like GPG, PGP respectively
- -pgpg, -ppgp Sign using GPG, PGP respectively
+ -p<sign-command> The command to use for signing
-e<maintainer> Sign using key of <maintainer> (takes precedence over -m)
-m<maintainer> The same as -e
-k<keyid> The key to use for signing
@@ -59,7 +46,7 @@ usage () {
-a<arch> Use changes file made for Debian target architecture <arch>
-t<target> Use changes file made for GNU target architecture <target>
--multi Use most recent multiarch .changes file found
- --path Specify directory GPG/PGP binary is located on remote host
+ --path Specify directory GPG binary is located on remote host
--help Show this message
--version Show version and copyright information
If a changes or dscfile is specified, it is signed, otherwise
diff --git a/scripts/debsign.1 b/scripts/debsign.1
index c8dd237..265363c 100644
--- a/scripts/debsign.1
+++ b/scripts/debsign.1
@@ -1,6 +1,6 @@
.TH DEBSIGN 1 "Debian Utilities" "DEBIAN" \" -*- nroff -*-
.SH NAME
-debsign \- sign a Debian changes and dsc file pair using GPG/PGP
+debsign \- sign a Debian changes and dsc file pair using GPG
.SH SYNOPSIS
\fBdebsign\fR [\fIoptions\fR]
[\fIchanges-file\fR|\fIdsc-file\fR|\fIcommands-file\fR ...]
.SH DESCRIPTION
@@ -9,7 +9,7 @@ debsign \- sign a Debian changes and dsc file pair using GPG/PGP
file or an unsigned \fI.changes\fR file (along with the associated
unsigned \fI.dsc\fR file found by replacing the architecture name and
\fI.changes\fR by \fI.dsc\fR if it appears in the \fI.changes\fR
-file), and signs them using the GNU Privacy Guard or PGP. It is
+file), and signs them using the GNU Privacy Guard. It is
careful to calculate the size and checksums of the newly signed
\fI.dsc\fR file and replace the original values in the \fI.changes\fR
file.
@@ -140,7 +140,6 @@ the option.
.BR sha1sum (1),
.BR sha256sum (1),
.BR gpg (1),
-.BR pgp (1),
.BR scp (1)
and
.BR devscripts.conf (5).
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 6030975..4ddba0f 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -3,17 +3,7 @@
# This program is designed to GPG sign a .dsc and .changes file pair
# in the form needed for a legal Debian upload. It is based in part
# on dpkg-buildpackage. It takes one argument: the name of the
-# .changes file. It also takes some options:
-# -e<maintainer> Sign using key of <maintainer> (takes precedence over -m)
-# -m<maintainer> Sign using key of <maintainer>
-# -k<key> The GPG key ID to use; overrides -m
-# -S Source-only .changes file
-# -a<arch> Debian architecture
-# -t<type> GNU machine type
-# --multi Search for multiarch .changes files
-# -r [username@]remotehost The changes (and dsc) files live on remotehost
-# --no-conf, --noconf Don't read configuration files
-# --help, --version
+# .changes file.
# Debian GNU/Linux debsign. Copyright (C) 1999 Julian Gilbey.
# Modifications to work with GPG by Joseph Carter and Julian Gilbey
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
