auth: sync a little with downstream debian

Remove .Debian. from secpoll

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index 80e5e39466fbdf86d7fb0d06877f16ad139167ac..47aa6de84faff9bdf73089834753dbc1c09ab337 100644 (file)
--- a/build-scripts/debian-authoritative/control.in
+++ b/build-scripts/debian-authoritative/control.in
@@ -1,7 +1,7 @@
 Source: pdns
 Section: net
 Priority: extra
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
 Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, liblua5.2-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1) @LIBSYSTEMDDEV@

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 42348d2b458e000a78201b75329d113792cd47ae..b1e78bbabdb45c3bb39bf68d8ce2a04e44c84e70 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-# Vendor and version
-version := $(shell dpkg-parsechangelog -SVersion).$(shell dpkg-vendor --query Vendor)
-CXXFLAGS += -DPACKAGEVERSION='"$(version)"'
-
 # Backends
 backends := bind ldap pipe gmysql godbc gpgsql gsqlite3 geoip lua mydns remote random opendbx tinydns
 
@@ -75,8 +71,7 @@ override_dh_installinit:
 override_dh_install:
        dh_install
        ./pdns/pdns_server --no-config --config | sed \
-         -e 's!# daemon=.*!daemon=yes!' \
-         -e 's!# guardian=.*!guardian=yes!' \
+         -e 's!# module-dir=.*!!' \
          -e 's!# include-dir=.*!&\ninclude-dir=/etc/powerdns/pdns.d!' \
          -e 's!# launch=.*!&\nlaunch=!' \
          -e 's!# setgid=.*!setgid=pdns!' \