You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.8 KiB
42 lines
1.8 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../gnupg2/gnupg2-2.0.16-no-gpg-zip-manpage.patch
|
||
|
|
# Copyright (C) 2010 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Description: Do not install gpg-zip manpage
|
||
|
|
|
||
|
|
As the 'tools/Changelog' shows, gpg-zip is not installed with gnupg2 because
|
||
|
|
it gets installed by gnupg. Strangely gnupg2 still tries to install a gpg-zip
|
||
|
|
manpage which ofcourse conflicts too.
|
||
|
|
|
||
|
|
-----------------------------------------------------------------------------
|
||
|
|
2006-10-12 Werner Koch <wk@g10code.com>
|
||
|
|
|
||
|
|
* Makefile.am (gpg-zip, gpgsplit): Do not install due to a
|
||
|
|
conflict with gpg1.
|
||
|
|
-----------------------------------------------------------------------------
|
||
|
|
|
||
|
|
diff -ruN gnupg-2.0.16-orig/doc/Makefile.in gnupg-2.0.16/doc/Makefile.in
|
||
|
|
--- gnupg-2.0.16-orig/doc/Makefile.in 2010-07-19 09:05:40.000000000 +0200
|
||
|
|
+++ gnupg-2.0.16/doc/Makefile.in 2010-10-04 23:14:39.472000877 +0200
|
||
|
|
@@ -353,7 +353,7 @@
|
||
|
|
myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
|
||
|
|
watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
|
||
|
|
gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
|
||
|
|
- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1
|
||
|
|
+ gpgsm-gencert.sh.1 applygnupgdefaults.8
|
||
|
|
|
||
|
|
man_MANS = $(myman_pages)
|
||
|
|
noinst_MANS = gnupg.7
|