[Pkg-gnupg-commit] [gnupg] 15/17: remove utilities we no longer ship

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg.

commit 1e560935651d68c58f93f0baa1b31fc2caea948c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Mar 31 22:14:41 2016 -0400

    remove utilities we no longer ship
---
 debian/gnupg.install  |   1 -
 debian/gnupg.manpages |   3 --
 debian/gpg-zip.1      | 102 --------------------------------------------------
 debian/gpgsplit.1     |  41 --------------------
 debian/lspgpot.1      |  22 -----------
 debian/rules          |   4 ++
 6 files changed, 4 insertions(+), 169 deletions(-)

diff --git a/debian/gnupg.install b/debian/gnupg.install
deleted file mode 100644
index 6df310f..0000000
--- a/debian/gnupg.install
+++ /dev/null
@@ -1 +0,0 @@
-tools/lspgpot	usr/bin
diff --git a/debian/gnupg.manpages b/debian/gnupg.manpages
deleted file mode 100644
index 7859184..0000000
--- a/debian/gnupg.manpages
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/gpgsplit.1
-debian/lspgpot.1
-debian/gpg-zip.1
diff --git a/debian/gpg-zip.1 b/debian/gpg-zip.1
deleted file mode 100644
index cba5db4..0000000
--- a/debian/gpg-zip.1
+++ /dev/null
@@ -1,102 +0,0 @@
-.TH "GPG\-ZIP" 1 "November 2006"
-
-.SH NAME
-gpg\-zip \- encrypt or sign files into an archive
-
-.SH SYNOPSIS
-.B gpg\-zip
-.RB [ OPTIONS ]
-.IR filename1 " [" "filename2, ..." ]
-.IR directory1 " [" "directory2, ..." ]
-
-.SH DESCRIPTION
-This manual page documents briefly the 
-.B gpg\-zip
-command.
-.PP
-.B gpg\-zip
-encrypts or signs files into an archive. It is an gpg-ized tar using the
-same format as PGP's PGP Zip.
-
-.SH OPTIONS
-.TP
-.BR \-e ", " \-\-encrypt
-Encrypt data. This option may be combined with 
-.B \-\-symmetric
-(for output that may be decrypted via a secret key or a passphrase).
-.TP
-.BR \-d ", " \-\-decrypt
-Decrypt data.
-.TP
-.BR \-c ", " \-\-symmetric
-Encrypt with a symmetric cipher using a passphrase.  The default
-symmetric cipher used is CAST5, but may be chosen with the
-.B \-\-cipher\-algo
-option to
-.BR gpg (1).
-.TP
-.BR \-s ", " \-\-sign
-Make a signature. See
-.BR gpg (1).
-.TP
-.BR \-r ", " \-\-recipient " \fIUSER\fR"
-Encrypt for user id \fIUSER\fR. See
-.BR gpg (1).
-.TP
-.BR \-u ", " \-\-local\-user " \fIUSER\fR"
-Use \fIUSER\fR as the key to sign with. See
-.BR gpg (1).
-.TP
-.B \-\-list\-archive
-List the contents of the specified archive.
-.TP
-.BR \-o ", " \-\-output " " \fIFILE\fR"
-Write output to specified file
-.IR FILE .
-.TP
-.BI \-\-gpg " GPG"
-Use the specified command instead of
-.BR gpg .
-.TP
-.BI \-\-gpg\-args " ARGS"
-Pass the specified options to
-.BR gpg (1).
-.TP
-.BI \-\-tar " TAR"
-Use the specified command instead of
-.BR tar .
-.TP
-.BI \-\-tar\-args " ARGS"
-Pass the specified options to 
-.BR tar (1).
-.TP
-.BR \-h ", " \-\-help
-Output a short usage information.
-.TP
-.B \-\-version
-Output the program version.
-
-.SH DIAGNOSTICS
-The program returns \fB0\fR if everything was fine, \fB1\fR otherwise.
-
-.SH EXAMPLES
-Encrypt the contents of directory \fImydocs\fR for user Bob to file \fItest1\fR:
-.IP
-.B gpg\-zip \-\-encrypt \-\-output test1 \-\-gpg-args ""\-r Bob"" mydocs
-.PP
-List the contents of archive \fItest1\fR:
-.IP
-.B gpg\-zip \-\-list\-archive test1
-
-.SH SEE ALSO
-.BR gpg (1),
-.BR tar (1)
-
-.SH AUTHOR
-Copyright (C) 2005 Free Software Foundation, Inc. Please report bugs to
-<\&bug-gnupg at gnu.org\&>.
-
-This manpage was written by \fBColin Tuckley\fR <\&colin at tuckley.org\&>
-and \fBDaniel Leidert\fR <\&daniel.leidert at wgdd.de\&> for the Debian
-distribution (but may be used by others).
-
diff --git a/debian/gpgsplit.1 b/debian/gpgsplit.1
deleted file mode 100644
index 116ce89..0000000
--- a/debian/gpgsplit.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.TH "gpgsplit" 1 "December 2005" 
-
-.SH NAME
-gpgsplit \- Split an OpenPGP message into packets
-
-.SH SYNOPSIS
-.B gpgsplit 
-.RI [ OPTIONS ]
-.RI [ FILES ]
-
-.SH DESCRIPTION
-This manual page documents briefly the 
-.B gpgsplit
-command.
-.PP
-.B gpgsplit
-splits an OpenPGP message into packets.
-
-.SH OPTIONS
-.TP
-.BR \-v , \-\-verbose
-Verbose.
-.TP
-.BR \-p , "\-\-prefix " \fISTRING\fR
-Prepend filenames with \fISTRING\fR.
-.TP
-.B \-\-uncompress
-Uncompress a packet.
-.TP
-.B \-\-secret\-to\-public
-Convert secret keys to public keys.
-.TP
-.B \-\-no\-split
-Write to stdout and don't actually split.
-
-.SH AUTHOR
-Copyright (C) 2002 Free Software Foundation, Inc. Please report bugs to
-<bug-gnupg at gnu.org>.
-
-This manpage was written by Francois Wendling <frwendling at free.fr>.
-
diff --git a/debian/lspgpot.1 b/debian/lspgpot.1
deleted file mode 100644
index ba27eca..0000000
--- a/debian/lspgpot.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH "lspgpot" 1 "December 2005" 
-
-.SH NAME
-lspgpot - extracts the ownertrust values from PGP keyrings and list them in
-GnuPG ownertrust format.
-
-
-.SH SYNOPSIS
-.B lspgpot
-
-
-.SH DESCRIPTION
-.B lspgpot
-extracts the ownertrust values from PGP keyrings and list them in
-GnuPG ownertrust format.
-
-.SH AUTHOR
-Copyright (C) 2002 Free Software Foundation, Inc. Please report bugs to
-<bug-gnupg at gnu.org>.
-
-This manpage was written by Francois Wendling <frwendling at free.fr>.
-
diff --git a/debian/rules b/debian/rules
index af603a6..8f72f24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,6 +118,10 @@ install: build
 	$(RM) debian/gnupg1/usr/share/gnupg1/FAQ 
 	$(RM) debian/gnupg1/usr/share/info/dir*
 	find debian/gnupg1/ -type d -empty -delete
+	: # remove utilities shipped from gnupg2 source package instead
+	$(RM) debian/gnupg1/usr/bin/gpgsplit \
+	      debian/gnupg1/usr/bin/gpg-zip \
+	      debian/gnupg1/usr/share/man/man1/gpg-zip.*
 	$(MAKE) -C build-deb-curl/keyserver install DESTDIR=$(CURDIR)/debian/gnupg1-curl
 	$(RM) debian/gnupg1-curl/usr/lib/gnupg1/gpgkeys_finger \
 	      debian/gnupg1-curl/usr/lib/gnupg1/gpgkeys_ldap \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg.git