move manpages to section 1

diff --git a/Makefile.am b/Makefile.am
index fdd429d5f388741ff15b0ca8fa80ba46532159a9..5ef360e0549af1bcb1df49e0304b503ea7124267 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,12 +10,12 @@ pdns/named.conf.parsertest regression-tests/zones/unit.test
 
 ACLOCAL_AMFLAGS = -I m4
 
-man8_MANS=pdns/docs/pdns_control.8 pdns/docs/pdnssec.8 pdns/docs/pdns_server.8 \
-  pdns/docs/zone2ldap.8 pdns/docs/zone2sql.8
+man1_MANS=pdns/docs/pdns_control.1 pdns/docs/pdnssec.1 pdns/docs/pdns_server.1 \
+  pdns/docs/zone2ldap.1 pdns/docs/zone2sql.1
 
 if TOOLS
-  man8_MANS += pdns/docs/dnsreplay.8 pdns/docs/dnsscope.8 pdns/docs/dnswasher.8
-  man1_MANS = pdns/docs/dnstcpbench.1 pdns/docs/dnsdist.1
+  man1_MANS += pdns/docs/dnsreplay.1 pdns/docs/dnsscope.1 pdns/docs/dnswasher.1
+  man1_MANS += pdns/docs/dnstcpbench.1 pdns/docs/dnsdist.1
 endif
 
 pdns/docs/dnstcpbench.1:

diff --git a/debian-pdns/rules b/debian-pdns/rules
index d0554c65577472dfe5b4004c9a71b52a990ae9f2..5db17e815a9a7f7513ff080d7e5ab41c4e50e614 100755 (executable)
--- a/debian-pdns/rules
+++ b/debian-pdns/rules
@@ -88,6 +88,7 @@ binary-main-prepare:
        rm -f "$(tmpdir)"/usr/bin/zone2ldap
        rm -rf "$(tmpdir)"/usr/lib
        rm -f "$(tmpdir)"/usr/share/man/man8/zone2ldap.8
+       rm -f "$(tmpdir)"/usr/share/man/man1/zone2ldap.1
        strip --remove-section=.comment --remove-section=.note \
                --strip-unneeded \
                "$(tmpdir)"/usr/bin/zone2sql \

diff --git a/pdns.spec b/pdns.spec
index fbc58ba2006522c58b3ec5674cb2a18d46d12a63..2d65d516284356fbe731c54ab3135c5b415cf2b8 100644 (file)
--- a/pdns.spec
+++ b/pdns.spec
@@ -30,10 +30,10 @@ backend'.
 "/usr/bin/zone2json"
 "/usr/bin/pdnssec"
 #"/usr/bin/zone2ldap"
-"/usr/share/man/man8/pdns_control.8"
-"/usr/share/man/man8/pdns_server.8"
-"/usr/share/man/man8/zone2sql.8"
-"/usr/share/man/man8/pdnssec.8"
+"/usr/share/man/man1/pdns_control.1"
+"/usr/share/man/man1/pdns_server.1"
+"/usr/share/man/man1/zone2sql.1"
+"/usr/share/man/man1/pdnssec.1"
 "/usr/share/doc/pdns/*.sql"
 
 %dir "/etc/powerdns/"
@@ -66,8 +66,8 @@ These are the tools
 "/usr/bin/nproxy"
 "/usr/bin/nsec3dig"
 "/usr/bin/saxfr"
-"/usr/share/man/man8/dnsreplay.8"
-"/usr/share/man/man8/dnsscope.8"
-"/usr/share/man/man8/dnswasher.8"
+"/usr/share/man/man1/dnsreplay.1"
+"/usr/share/man/man1/dnsscope.1"
+"/usr/share/man/man1/dnswasher.1"
 "/usr/share/man/man1/dnstcpbench.1"
 "/usr/share/man/man1/dnsdist.1"

diff --git a/pdns/docs/dnsreplay.8 b/pdns/docs/dnsreplay.1
similarity index 100%
rename from pdns/docs/dnsreplay.8
rename to pdns/docs/dnsreplay.1

diff --git a/pdns/docs/dnsscope.8 b/pdns/docs/dnsscope.1
similarity index 100%
rename from pdns/docs/dnsscope.8
rename to pdns/docs/dnsscope.1

diff --git a/pdns/docs/dnswasher.8 b/pdns/docs/dnswasher.1
similarity index 100%
rename from pdns/docs/dnswasher.8
rename to pdns/docs/dnswasher.1

diff --git a/pdns/docs/pdns_control.8 b/pdns/docs/pdns_control.1
similarity index 100%
rename from pdns/docs/pdns_control.8
rename to pdns/docs/pdns_control.1

diff --git a/pdns/docs/pdns_server.8 b/pdns/docs/pdns_server.1
similarity index 100%
rename from pdns/docs/pdns_server.8
rename to pdns/docs/pdns_server.1

diff --git a/pdns/docs/pdnssec.8 b/pdns/docs/pdnssec.1
similarity index 100%
rename from pdns/docs/pdnssec.8
rename to pdns/docs/pdnssec.1

diff --git a/pdns/docs/zone2ldap.8 b/pdns/docs/zone2ldap.1
similarity index 100%
rename from pdns/docs/zone2ldap.8
rename to pdns/docs/zone2ldap.1

diff --git a/pdns/docs/zone2sql.8 b/pdns/docs/zone2sql.1
similarity index 100%
rename from pdns/docs/zone2sql.8
rename to pdns/docs/zone2sql.1