From df05cb0fea5b5ecc6a47939fea6c1f7e7eeb9eb8 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Fri, 3 Jun 2016 17:00:59 +0200 Subject: [PATCH] auth: sync a little with downstream debian Remove .Debian. from secpoll --- build-scripts/debian-authoritative/control.in | 2 +- build-scripts/debian-authoritative/rules | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in index 80e5e3946..47aa6de84 100644 --- 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 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 42348d2b4..b1e78bbab 100755 --- 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!' \ -- 2.40.0