From: Bert Hubert Date: Thu, 12 Dec 2002 20:32:12 +0000 (+0000) Subject: wichert updates X-Git-Tag: pdns-2.9.2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=455c0a6759042835f0b11afdc68ea4918f498d9d;p=thirdparty%2Fpdns.git wichert updates git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@70 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/debian/control b/debian/control index 135a525008..402ba6616c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: extra Standards-Version: 3.5.8 Maintainer: Wichert Akkerman -Build-Depends: automake1.5, autoconf, libtool, flex, bison, docbook-utils, libmysqlclient10-dev, postgresql-dev +Build-Depends: automake1.5, autoconf, libtool, flex, bison, docbook-utils, libmysqlclient10-dev, postgresql-dev, tdb-dev Package: pdns Architecture: any diff --git a/debian/pdns-backend-bind.lintian b/debian/pdns-backend-bind.lintian deleted file mode 100644 index 689de5bb7b..0000000000 --- a/debian/pdns-backend-bind.lintian +++ /dev/null @@ -1,4 +0,0 @@ -pdns-backend-bind: non-dev-pkg-with-shlib-symlink usr/lib/libbindbackend.so.0.0.0 usr/lib/libbindbackend.so -pdns-backend-bind: no-shlibs-control-file usr/lib/libbindbackend.so.0.0.0 -pdns-backend-bind: no-copyright-file -pdns-backend-bind: postrm-unsafe-ldconfig diff --git a/debian/pdns-backend-general.postinst b/debian/pdns-backend-general.postinst deleted file mode 100755 index 3aa1a9203c..0000000000 --- a/debian/pdns-backend-general.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - - -if [ "$1" = "configure" -o "$1" = "abort-upgrade" ] ; then - ldconfig -fi diff --git a/debian/pdns-backend-general.postrm b/debian/pdns-backend-general.postrm deleted file mode 100755 index 6d8f92846a..0000000000 --- a/debian/pdns-backend-general.postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "remove" ] ; then - ldconfig -fi - diff --git a/debian/pdns-backend-mysql.lintian b/debian/pdns-backend-mysql.lintian deleted file mode 100644 index 72ac735a19..0000000000 --- a/debian/pdns-backend-mysql.lintian +++ /dev/null @@ -1,4 +0,0 @@ -pdns-backend-mysql: non-dev-pkg-with-shlib-symlink usr/lib/libmysqlbackend.so.0.0.0 usr/lib/libmysqlbackend.so -pdns-backend-mysql: no-shlibs-control-file usr/lib/libmysqlbackend.so.0.0.0 -pdns-backend-mysql: no-copyright-file -pdns-backend-mysql: postrm-unsafe-ldconfig diff --git a/debian/pdns-backend-oracle.lintian b/debian/pdns-backend-oracle.lintian deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/pdns-backend-pgmysql.lintian b/debian/pdns-backend-pgmysql.lintian deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/pdns-backend-pipe.lintian b/debian/pdns-backend-pipe.lintian deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/pdns-backend-xdb.lintian b/debian/pdns-backend-xdb.lintian deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/rules b/debian/rules index 00fba1a60d..1a0657a930 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f tmpdir := $(shell pwd)/debian/tmp -backends := mysql pipe xdb pgmysql oracle +backends := mysql pipe xdb pgmysql configure: ./bootstrap @@ -42,10 +42,7 @@ binary-doc: dpkg --build "$(tmpdir)" .. -build-main: configure - if [ -e build-backend ] ; then make distclean ; fi - rm -f build-backend - +build stamp-build: configure ./configure \ --prefix=/usr \ --libexecdir='$${prefix}/lib' \ @@ -56,10 +53,10 @@ build-main: configure --with-dynmodules="$(backends)" \ --with-modules="" make - touch build-main + touch stamp-build -binary-main: build-main +binary-main: stamp-build rm -f debian/substvars rm -rf "$(tmpdir)" "$(tmpdir)"-* install -d -m 755 -o root -g root "$(tmpdir)" @@ -107,9 +104,8 @@ binary-main: build-main dpkg --build "$(tmpdir)" .. -binary-backend: build-main - rm -f debian/substvars - rm -rf "$(tmpdir)" "$(tmpdir)"-* +binary-backend: stamp-build + rm -rf "$(tmpdir)" install -d -m 755 -o root -g root "$(tmpdir)" make DESTDIR="$(tmpdir)" install @@ -120,21 +116,14 @@ binary-backend: build-main set -e ; for be in $(backends) ; do \ rm -f debian/substvars ; \ + rm -rf "$(tmpdir)"-$$be ; \ pkg=pdns-backend-$$be ; \ install -d -m 755 -o root -g root "$(tmpdir)"-$$be/usr/lib/powerdns ; \ mv "$(tmpdir)"/usr/lib/powerdns/lib$$be* "$(tmpdir)"-$$be/usr/lib/powerdns ; \ install -d -m 755 -o root -g root "$(tmpdir)"-$$be/usr/share/doc ; \ ln -s pdns "$(tmpdir)"-$$be/usr/share/doc/$$pkg ; \ \ - install -d -m 755 -o root -g root "$(tmpdir)"-$$be/usr/share/lintian/overrides ; \ - install -p -m 644 -o root -g root debian/$$pkg.lintian \ - "$(tmpdir)"-$$be/usr/share/lintian/overrides/$$pkg ; \ - \ install -d -m 755 -o root -g root "$(tmpdir)"-$$be/DEBIAN ; \ - install -p -m 755 -o root -g root debian/pdns-backend-general.postinst \ - "$(tmpdir)"-$$be/DEBIAN/postinst ; \ - install -p -m 755 -o root -g root debian/pdns-backend-general.postrm \ - "$(tmpdir)"-$$be/DEBIAN/postrm ; \ dpkg-shlibdeps "$(tmpdir)"-$$be/usr/lib/powerdns/*.so ; \ dpkg-gencontrol -isp -p$$pkg -P"$(tmpdir)"-$$be ; \ dpkg --build "$(tmpdir)"-$$be .. ; \ @@ -146,7 +135,7 @@ binary-indep: binary-doc binary-arch: binary-main binary-backend clean: - rm -f debian/files debian/substvars build-backend build-main + rm -f debian/files debian/substvars stamp-build rm -rf "$(tmpdir)" "$(tmpdir)"-* -make distclean -make -C pdns/docs clean