deb: Split ixfrdist into it's own package

diff --git a/builder-support/debian/authoritative/debian-jessie/control b/builder-support/debian/authoritative/debian-jessie/control
index a39be1f3d52e157d157089d5ae7ddd43704992d7..35bbc1a8330288964901913363a4da943ae069ce 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/control
+++ b/builder-support/debian/authoritative/debian-jessie/control
@@ -84,6 +84,20 @@ Description: Tools for DNS debugging by PowerDNS
    * nsec3dig: Calculate the correctness of NSEC3 proofs
    * saxfr: AXFR zones and show extra information
 
+Package: pdns-ixfrdist
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Redistribute zones via AXFR and IXFR
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the ixfrdist tool that can redistribute multiple versions
+ of zones over AXFR and IXFR. This tool does not require any part of the
+ PowerDNS server components to work.
+
 Package: pdns-backend-bind
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install
new file mode 100644 (file)
index 0000000..86c3d41
--- /dev/null
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.install
@@ -0,0 +1,2 @@
+usr/bin/ixfrdist
+lib/systemd/system/ixfrdist.service

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages
new file mode 100644 (file)
index 0000000..c196430
--- /dev/null
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-ixfrdist.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/ixfrdist.1

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-tools.install b/builder-support/debian/authoritative/debian-jessie/pdns-tools.install
index b9eaaa9b4f3b6e972aab2f3e3f58b02fa5826cfd..6ca38a9e4397ade10bce8dc81e39252223330901 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-tools.install
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-tools.install
@@ -8,11 +8,9 @@ usr/bin/dnsscope
 usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/dumresp
-usr/bin/ixfrdist
 usr/bin/ixplore
 usr/bin/nproxy
 usr/bin/nsec3dig
 usr/bin/pdns_notify
 usr/bin/saxfr
 usr/bin/sdig
-lib/systemd/system/ixfrdist.service

diff --git a/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages b/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages
index 67b6f7d95fae66696bd4f04e259e5936ac1940ab..b8b70a83da965e2134a2ea3cddf87f76e2b43b55 100644 (file)
--- a/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages
+++ b/builder-support/debian/authoritative/debian-jessie/pdns-tools.manpages
@@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1
 debian/tmp/usr/share/man/man1/dnstcpbench.1
 debian/tmp/usr/share/man/man1/dnswasher.1
 debian/tmp/usr/share/man/man1/dumresp.1
-debian/tmp/usr/share/man/man1/ixfrdist.1
 debian/tmp/usr/share/man/man1/ixplore.1
 debian/tmp/usr/share/man/man1/nproxy.1
 debian/tmp/usr/share/man/man1/nsec3dig.1

diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control
index f0daf1c20a3469a2a180647cceeca8042054875d..790e9157844baee28cc57f08075fa817e8eea84a 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/control
+++ b/builder-support/debian/authoritative/debian-stretch/control
@@ -84,6 +84,20 @@ Description: Tools for DNS debugging by PowerDNS
    * nsec3dig: Calculate the correctness of NSEC3 proofs
    * saxfr: AXFR zones and show extra information
 
+Package: pdns-ixfrdist
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Redistribute zones via AXFR and IXFR
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the ixfrdist tool that can redistribute multiple versions
+ of zones over AXFR and IXFR. This tool does not require any part of the
+ PowerDNS server components to work.
+
 Package: pdns-backend-bind
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install
new file mode 100644 (file)
index 0000000..86c3d41
--- /dev/null
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.install
@@ -0,0 +1,2 @@
+usr/bin/ixfrdist
+lib/systemd/system/ixfrdist.service

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages
new file mode 100644 (file)
index 0000000..6858f39
--- /dev/null
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-ixfrdist.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/ixfrdist.1
+

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-tools.install b/builder-support/debian/authoritative/debian-stretch/pdns-tools.install
index b9eaaa9b4f3b6e972aab2f3e3f58b02fa5826cfd..6ca38a9e4397ade10bce8dc81e39252223330901 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-tools.install
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-tools.install
@@ -8,11 +8,9 @@ usr/bin/dnsscope
 usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/dumresp
-usr/bin/ixfrdist
 usr/bin/ixplore
 usr/bin/nproxy
 usr/bin/nsec3dig
 usr/bin/pdns_notify
 usr/bin/saxfr
 usr/bin/sdig
-lib/systemd/system/ixfrdist.service

diff --git a/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages b/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages
index 67b6f7d95fae66696bd4f04e259e5936ac1940ab..b8b70a83da965e2134a2ea3cddf87f76e2b43b55 100644 (file)
--- a/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages
+++ b/builder-support/debian/authoritative/debian-stretch/pdns-tools.manpages
@@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1
 debian/tmp/usr/share/man/man1/dnstcpbench.1
 debian/tmp/usr/share/man/man1/dnswasher.1
 debian/tmp/usr/share/man/man1/dumresp.1
-debian/tmp/usr/share/man/man1/ixfrdist.1
 debian/tmp/usr/share/man/man1/ixplore.1
 debian/tmp/usr/share/man/man1/nproxy.1
 debian/tmp/usr/share/man/man1/nsec3dig.1

diff --git a/builder-support/debian/authoritative/ubuntu-trusty/control b/builder-support/debian/authoritative/ubuntu-trusty/control
index c44df8d9002e761c04bde82212f2a47c4dc30b10..55a035a3fe3361bc8e27c839af2d04239caf038a 100644 (file)
--- a/builder-support/debian/authoritative/ubuntu-trusty/control
+++ b/builder-support/debian/authoritative/ubuntu-trusty/control
@@ -81,6 +81,20 @@ Description: Tools for DNS debugging by PowerDNS
    * nsec3dig: Calculate the correctness of NSEC3 proofs
    * saxfr: AXFR zones and show extra information
 
+Package: pdns-ixfrdist
+Architecture: any
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Description: Redistribute zones via AXFR and IXFR
+ PowerDNS is a versatile nameserver which supports a large number
+ of different backends ranging from simple zonefiles to relational
+ databases and load balancing/failover algorithms.
+ PowerDNS tries to emphasize speed and security.
+ .
+ This package contains the ixfrdist tool that can redistribute multiple versions
+ of zones over AXFR and IXFR. This tool does not require any part of the
+ PowerDNS server components to work.
+
 Package: pdns-backend-bind
 Architecture: any
 Depends: pdns-server (= ${binary:Version}),

diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install
new file mode 100644 (file)
index 0000000..7894b5c
--- /dev/null
+++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.install
@@ -0,0 +1,2 @@
+usr/bin/ixfrdist
+

diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages
new file mode 100644 (file)
index 0000000..6858f39
--- /dev/null
+++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-ixfrdist.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/ixfrdist.1
+

diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install
index 8ac4829ce7104aa8d59cafc2da3a2f8602bebe72..6ca38a9e4397ade10bce8dc81e39252223330901 100644 (file)
--- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install
+++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.install
@@ -8,7 +8,6 @@ usr/bin/dnsscope
 usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/dumresp
-usr/bin/ixfrdist
 usr/bin/ixplore
 usr/bin/nproxy
 usr/bin/nsec3dig

diff --git a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages
index 67b6f7d95fae66696bd4f04e259e5936ac1940ab..b8b70a83da965e2134a2ea3cddf87f76e2b43b55 100644 (file)
--- a/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages
+++ b/builder-support/debian/authoritative/ubuntu-trusty/pdns-tools.manpages
@@ -8,7 +8,6 @@ debian/tmp/usr/share/man/man1/dnsscope.1
 debian/tmp/usr/share/man/man1/dnstcpbench.1
 debian/tmp/usr/share/man/man1/dnswasher.1
 debian/tmp/usr/share/man/man1/dumresp.1
-debian/tmp/usr/share/man/man1/ixfrdist.1
 debian/tmp/usr/share/man/man1/ixplore.1
 debian/tmp/usr/share/man/man1/nproxy.1
 debian/tmp/usr/share/man/man1/nsec3dig.1

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild b/builder-support/dockerfiles/Dockerfile.debbuild
index ea2ea8cdf8abbb72bff4b6078921832655088df9..aa391f24dc407f205ec23417ff65a40c1dff1f5f 100644 (file)
--- a/builder-support/dockerfiles/Dockerfile.debbuild
+++ b/builder-support/dockerfiles/Dockerfile.debbuild
@@ -6,17 +6,17 @@ fi
 
 RUN PDNS_TEST_NO_IPV6=1 builder/helpers/build-debs.sh pdns-${BUILDER_VERSION}
 
-RUN mv pdns*${BUILDER_VERSION}*.deb /dist
+RUN mv pdns*.deb /dist
 @ENDIF
 
 @IF [ ! -z "$M_recursor" ]
 RUN builder/helpers/build-debs.sh pdns-recursor-${BUILDER_VERSION}
 
-RUN mv pdns-recursor*${BUILDER_VERSION}*.deb /dist
+RUN mv pdns-recursor*.deb /dist
 @ENDIF
 
 @IF [ ! -z "$M_dnsdist" ]
 RUN builder/helpers/build-debs.sh dnsdist-${BUILDER_VERSION}
 
-RUN mv dnsdist*${BUILDER_VERSION}*.deb /dist
+RUN mv dnsdist*.deb /dist
 @ENDIF