diff -Nru pdns-recursor-3.3/debian/changelog pdns-recursor-3.3/debian/changelog --- pdns-recursor-3.3/debian/changelog 2011-08-08 02:57:13.000000000 -0700 +++ pdns-recursor-3.3/debian/changelog 2011-11-11 00:05:52.000000000 -0800 @@ -1,3 +1,13 @@ +pdns-recursor (3.3-2~hardy1) hardy-backports; urgency=low + + * Backport to hardy: + - Use source format 1.0, and use quilt explicitly + - Drop debhelper build-dependency version + - Replace override_% syntax with old-style dh --before and dh --after + syntax + + -- Evan Broder Thu, 10 Nov 2011 23:47:14 -0800 + pdns-recursor (3.3-2) unstable; urgency=low * Fix my name in the init script and debian/control too. diff -Nru pdns-recursor-3.3/debian/control pdns-recursor-3.3/debian/control --- pdns-recursor-3.3/debian/control 2011-08-08 03:59:48.000000000 -0700 +++ pdns-recursor-3.3/debian/control 2011-11-11 00:05:52.000000000 -0800 @@ -3,7 +3,7 @@ Priority: extra Standards-Version: 3.9.2 Maintainer: Matthijs Möhlmann -Build-Depends: debhelper (>= 7.0.50~), quilt, dpkg-dev (>= 1.10.17), libboost-dev, libboost-serialization-dev, liblua5.1-0-dev +Build-Depends: debhelper (>= 7~), quilt, dpkg-dev (>= 1.10.17), libboost-dev, libboost-serialization-dev, liblua5.1-0-dev Vcs-Git: git://github.com/Signum/debian-pdns-recursor.git Package: pdns-recursor diff -Nru pdns-recursor-3.3/debian/rules pdns-recursor-3.3/debian/rules --- pdns-recursor-3.3/debian/rules 2011-08-08 10:18:14.000000000 -0700 +++ pdns-recursor-3.3/debian/rules 2011-11-11 00:05:52.000000000 -0800 @@ -5,11 +5,12 @@ # Use new build system %: - dh $@ --parallel + dh $@ --with quilt -override_dh_strip: +binary: build +binary: + dh $@ --before dh_installinit + dh_installinit --error-handler=initscript_error -- defaults 19 852 + dh $@ --after dh_installinit --before dh_strip dh_strip --dbg-package=pdns-recursor-dbg - -override_dh_installinit: - dh_installinit --error-handler=initscript_error -- defaults 19 85 - + dh $@ --remaining diff -Nru pdns-recursor-3.3/debian/source/format pdns-recursor-3.3/debian/source/format --- pdns-recursor-3.3/debian/source/format 2010-11-06 03:29:26.000000000 -0700 +++ pdns-recursor-3.3/debian/source/format 2011-11-11 00:05:52.000000000 -0800 @@ -1 +1 @@ -3.0 (quilt) +1.0