diff options
| author | LaMont Jones <lamont@debian.org> | 2013-10-29 21:50:32 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2013-10-29 21:50:32 -0600 |
| commit | c783774c1c3f8b3683b9e3be409f2aa35bc77f20 (patch) | |
| tree | 1e7ab0962ed79dc29334a615876b24c53b73ecce | |
| parent | eb08fd34202558f2eb77c6992876b3763b890136 (diff) | |
| parent | a83e01ed6af3f3fa0d41e90ded90d3020796e58e (diff) | |
| download | bind9-c783774c1c3f8b3683b9e3be409f2aa35bc77f20.tar.gz | |
merge ubuntu change
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/rules | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 323992c5..32d7a90a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -bind9 (1:9.9.4.dfsg-0.1) experimental; urgency=low +bind9 (1:9.9.4.dfsg-0.2) experimental; urgency=low * new upstream version + * merge Ubuntu diff. -- LaMont Jones <lamont@debian.org> Tue, 29 Oct 2013 15:13:49 -0600 +bind9 (1:9.9.3.dfsg.P2-4ubuntu1) saucy; urgency=low + + * Use dh_autotools-dev to update config.{sub,guess} for new ports. + + -- Adam Conrad <adconrad@ubuntu.com> Mon, 07 Oct 2013 23:09:45 -0600 + bind9 (1:9.9.3.dfsg.P2-4) unstable; urgency=low [Peter Marschall] diff --git a/debian/control b/debian/control index 0496cdd6..a4792f85 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: LaMont Jones <lamont@debian.org> Uploaders: Bdale Garbee <bdale@gag.com> -Build-Depends: libkrb5-dev, debhelper (>= 5), libssl-dev, libtool, bison, libdb-dev (>>4.6), libldap2-dev, libxml2-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], hardening-wrapper, libgeoip-dev (>= 1.4.6.dfsg-5), dpkg-dev (>= 1.15.5), python, python-argparse, dh-systemd +Build-Depends: libkrb5-dev, debhelper (>= 5), libssl-dev, libtool, bison, libdb-dev (>>4.6), libldap2-dev, libxml2-dev, libcap2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], hardening-wrapper, libgeoip-dev (>= 1.4.6.dfsg-5), dpkg-dev (>= 1.15.5), python, python-argparse, dh-systemd, autotools-dev Build-Conflicts: libdb4.2-dev Standards-Version: 3.7.3.0 XS-Vcs-Browser: http://git.debian.org/?p=users/lamont/bind9.git diff --git a/debian/rules b/debian/rules index 4a3a17b0..b60b42d6 100644 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,7 @@ endif configure: configure-stamp configure-stamp: dh_testdir + dh_autotools-dev_updateconfig ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ @@ -82,6 +83,7 @@ clean: rm -f debian/substvars lib/bind/include/isc/platform.h rm -f contrib/dlz/bin/dlzbdb/Makefile contrib/dlz/drivers/rules rm -f doc/arm/Bv9ARM.pdf + dh_autotools-dev_restoreconfig dh_clean newtemplate: |