Fixed issues preventing successful build

diff --git a/debian/control b/debian/control
index 926ff3f2a7fbfc5d0e8f7a061aae3b1587360775..3e3837d73e1beebe620ac3f5a09346d51b57f923 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: net
 Priority: extra
 Standards-Version: 3.9.2
 Maintainer: bert hubert <bert.hubert@netherlabs.nl>
-Build-Depends: autoconf, libtool, flex, bison, docbook-utils, libmysqlclient-dev, postgresql-dev | libpq-dev, libgdbm-dev, libsqlite3-dev, dpkg-dev (>= 1.10.17), libboost-dev (>=1.34), libboost-program-options-dev, libboost-serialization-dev, pkg-config, ragel, libbotan1.10-dev, liblua5.1-dev, dh-autoreconf, debhelper (>= 8), libcrypto++-dev
+Build-Depends: autoconf, libtool, flex, bison, docbook-utils, libmysqlclient-dev, postgresql-dev | libpq-dev, libgdbm-dev, libsqlite3-dev, dpkg-dev (>= 1.10.17), libboost-dev (>=1.34), libboost-program-options-dev, libboost-serialization-dev, pkg-config, ragel, libbotan1.10-dev, liblua5.1-dev, dh-autoreconf, debhelper (>= 8), libcrypto++-dev, xmlto, libboost-test-dev, dblatex, xmltex, automake, docbook-xml, libltdl-dev
 
 Package: pdns-server
 Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: pdns-doc
 Suggests: pdns-backend
 Description: extremely powerful and versatile nameserver
@@ -17,7 +17,7 @@ Description: extremely powerful and versatile nameserver
 
 Package: pdns-server-dbg
 Architecture: any
-Depends: pdns-server ${shlibs:Depends} ${misc:Depends}
+Depends: pdns-server, ${shlibs:Depends}, ${misc:Depends}
 Recommends: pdns-doc
 Suggests: pdns-backend
 Description: PowerDNS server with debugging symbols

diff --git a/debian/rules b/debian/rules
index 431a76644830029414c5285972d344c844065809..8ee853a8e27f3dd53ee7978b10967ad2ff22cfd0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ ifdef STATIC
                 --with-boost=/usr \
                 --enable-cryptopp \
                 --disable-recursor \
+                --enable-unit-tests \
                 --enable-static-binaries \
                --enable-static
 else
@@ -46,6 +47,7 @@ else
                --with-mysql-lib=/usr/lib/$(DEB_HOST_MULTIARCH) \
                --with-boost=/usr \
                --enable-cryptopp \
+                --enable-unit-tests \
                --disable-recursor
 endif
 
@@ -53,6 +55,6 @@ endif
 override_dh_strip:
        dh_strip --dbg-package=pdns-server-dbg
 
-override_dh_installdocs:
+override_dh_install:
        make -C pdns/docs
-       dh_installdocs 
+       dh_install -O--with-autotools_dev -O--parallel