[Pkg-gnupg-commit] [gnupg2] 05/09: have some manpages to ship when cross-compiling
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Apr 1 16:20:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 13723e9d9e45311d2a72254a64e8ea1982b76bda
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Thu Mar 31 18:07:52 2016 -0400
have some manpages to ship when cross-compiling
This potentially results in packages that are different when
cross-compiled vs. natively-compiled; and if the maintainer fails to
keep debian/*.1 then they will also ship outdated manpages in
cross-compiled .debs.
however, without this change, it is not possible to cross-build the
package, so it's an overall win despite the drawbacks listed above.
---
debian/clean | 2 --
debian/gpg-check-pattern.1 | 31 +++++++++++++++++++++++++
debian/kbxutil.1 | 57 ++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 16 ++++---------
4 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/debian/clean b/debian/clean
index c41ea11..ddec324 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,3 @@
-debian/kbxutil.1
-debian/gpg-check-pattern.1
po/*.gmo
po/stamp-po
build-gpgv-udeb/
diff --git a/debian/gpg-check-pattern.1 b/debian/gpg-check-pattern.1
new file mode 100644
index 0000000..1e80832
--- /dev/null
+++ b/debian/gpg-check-pattern.1
@@ -0,0 +1,31 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
+.TH GPG-CHECK-PATTERN "1" "March 2016" "gpg-check-pattern (@GnuPG@) 2.1.11" "User Commands"
+.SH NAME
+gpg-check-pattern \- Check a passphrase on stdin against the patternfile
+.SH DESCRIPTION
+gpg\-check\-pattern (@GnuPG@) 2.1.11
+Copyright \(co 2016 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.PP
+Syntax: gpg\-check\-pattern [options] patternfile
+Check a passphrase given on stdin against the patternfile
+.SH OPTIONS
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+verbose
+.TP
+\fB\-\-check\fR
+run only a syntax check on the patternfile
+.TP
+\fB\-0\fR, \fB\-\-null\fR
+input is expected to be null delimited
+.PP
+Please report bugs to <http://bugs.gnupg.org>.
+.SH COPYRIGHT
+Copyright \(co 2016 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/debian/kbxutil.1 b/debian/kbxutil.1
new file mode 100644
index 0000000..08eb517
--- /dev/null
+++ b/debian/kbxutil.1
@@ -0,0 +1,57 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
+.TH KBXUTIL "1" "March 2016" "kbxutil (GnuPG) 2.1.11" "User Commands"
+.SH NAME
+kbxutil \- List, export, import Keybox data
+.SH DESCRIPTION
+kbxutil (GnuPG) 2.1.11
+Copyright \(co 2016 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.PP
+Syntax: kbxutil [options] [files]
+List, export, import Keybox data
+.PP
+Commands:
+.TP
+\fB\-\-stats\fR
+show key statistics
+.TP
+\fB\-\-import\-openpgp\fR
+import OpenPGP keyblocks
+.TP
+\fB\-\-find\-dups\fR
+find duplicates
+.TP
+\fB\-\-cut\fR
+export records
+.SH OPTIONS
+.TP
+\fB\-\-from\fR N
+first record to export
+.TP
+\fB\-\-to\fR N
+last record to export
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+verbose
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+be somewhat more quiet
+.TP
+\fB\-n\fR, \fB\-\-dry\-run\fR
+do not make any changes
+.TP
+\fB\-\-debug\fR
+set debugging flags
+.TP
+\fB\-\-debug\-all\fR
+enable full debugging
+.PP
+Please report bugs to <http://bugs.gnupg.org>.
+.SH COPYRIGHT
+Copyright \(co 2016 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/debian/rules b/debian/rules
index e42206a..78c1d3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,11 @@ override_dh_auto_build-arch:
dh_auto_build --builddirectory=build-gpgv-udeb
ln build-gpgv-udeb/g10/gpgv2 build-gpgv-udeb/g10/gpgv
dh_auto_build --builddirectory=build
+ # try to re-generate manpages if we can do so (otherwise, ship the pre-generated ones):
+ help2man --no-info -n "List, export, import Keybox data" \
+ -o debian/kbxutil.1 build/kbx/kbxutil || true
+ help2man --no-info -n "Check a passphrase on stdin against the patternfile" \
+ -o debian/gpg-check-pattern.1 build/tools/gpg-check-pattern || true
override_dh_auto_build-indep:
mkdir -p build-gpgv-win32
@@ -70,16 +75,5 @@ override_dh_auto_install-indep:
install build-gpgv-win32/g10/gpgv2.exe debian/gpgv-win32/usr/share/win32/gpgv.exe
strip debian/gpgv-win32/usr/share/win32/gpgv.exe
-override_dh_installman:
- if [ -x debian/tmp/usr/bin/kbxutil ]; then \
- help2man --no-info -n "List, export, import Keybox data" \
- -o debian/kbxutil.1 debian/tmp/usr/bin/kbxutil; \
- fi
- if [ -x debian/tmp/usr/lib/gnupg2/gpg-check-pattern ]; then \
- help2man --no-info -n "Check a passphrase on stdin against the patternfile" \
- -o debian/gpg-check-pattern.1 debian/tmp/usr/lib/gnupg2/gpg-check-pattern; \
- fi
- dh_installman
-
override_dh_auto_test:
if ! dh_auto_test; then echo xxx; cat tests/openpgp/gpgtar.test.log; echo xxx; false; fi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list