Merge tag 'upstream/1.0' into debian

Upstream version 1.0

1 files changed, 10 insertions, 14 deletions

diff --git a/autogen b/autogen
index 4ed7e23..a34a0b4 100755
--- a/autogen
+++ b/autogen
@@ -9,17 +9,13 @@ rm -rf autom4te.cache
 
 # Generate manual pages.
 version=`grep '^wallet' NEWS | head -1 | cut -d' ' -f2`
-pod2man --release="$version" --center=wallet client/wallet.pod \
-    > client/wallet.1
-pod2man --release="$version" --center=wallet client/wallet-rekey.pod \
-    > client/wallet-rekey.1
-pod2man --release="$version" --center=wallet -s 8 contrib/wallet-summary \
-    > contrib/wallet-summary.8
-pod2man --release="$version" --center=wallet -s 8 server/keytab-backend \
-    > server/keytab-backend.8
-pod2man --release="$version" --center=wallet -s 8 server/wallet-admin \
-    > server/wallet-admin.8
-pod2man --release="$version" --center=wallet -s 8 server/wallet-backend \
-    > server/wallet-backend.8
-pod2man --release="$version" --center=wallet -s 8 server/wallet-report \
-    > server/wallet-report.8
+for doc in client/wallet client/wallet-rekey ; do
+    pod2man --release="$version" --center=wallet \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc".pod > "$doc".1
+done
+for doc in contrib/wallet-summary contrib/wallet-unknown-hosts \
+           server/keytab-backend server/wallet-admin server/wallet-backend \
+           server/wallet-report ; do
+    pod2man --release="$version" --center=wallet --section=8 \
+        --name=`basename "$doc" | tr a-z A-Z` "$doc" > "$doc".8
+done