[28248] in Source-Commits
dns-config commit: Tweak control file; switch to dh7 for c-p-d
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Jun 12 16:52:55 2014
Date: Thu, 12 Jun 2014 16:52:48 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201406122052.s5CKqmfO003938@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/dns-config/commit/d18f49229cdd8aca8203aec3c8a4923d3b4399e4
commit d18f49229cdd8aca8203aec3c8a4923d3b4399e4
Author: Jonathan Reed <jdreed@mit.edu>
Date: Tue Jun 10 10:15:35 2014 -0400
Tweak control file; switch to dh7 for c-p-d
- Drop "Conflicts" for bind9, because APT doesn't like that transaction
- Switch to dh7 and update build-depends
- Clarify in Description that this is now for cluster-only
debian/changelog | 8 ++++++++
debian/control | 10 +++++-----
debian/rules | 12 ++++++------
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 375bb0f..1e3f726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debathena-dns-config (1.10) unstable; urgency=low
+
+ * Do not Conflict bind9, instead just let APT decide to autoremove it later
+ * Convert to dh7
+ * Update the description to clarify that this is now for cluster-only
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 10 Jun 2014 10:15:22 -0400
+
debathena-dns-config (1.9) unstable; urgency=low
* Don't restart dnsmasq in the postinst, it might not work (Trac: #1131)
diff --git a/debian/control b/debian/control
index ff28735..cc4dab6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: debathena-dns-config
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, config-package-dev (>= 5.0~)
+Build-Depends: debhelper (>= 7.0.50~), config-package-dev (>= 5.0~)
Standards-Version: 3.9.3
Package: debathena-dns-config
Architecture: all
Depends: dnsmasq, resolvconf, ${misc:Depends}
-Conflicts: bind9
Description: Sets up a local caching nameserver using dnsmasq
- This package sets up a local caching nameserver for better DNS lookup
- security and scalability than we can get by using the MIT resolvers
- directly.
+ This package sets up a local caching nameserver using dnsmasq. It is
+ intended for use primarily on IS&T-managed public workstations, but may
+ be used on other workstations with a static IP address configured by
+ ifupdown. Install this package at your own risk.
diff --git a/debian/rules b/debian/rules
index 3e42d23..c6ca5f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
-# We used to divert /etc/bind/named.conf
-DEB_DIVERT_EXTENSION = .debathena
-DEB_UNDIVERT_FILES_debathena-dns-config += \
- /etc/bind/named.conf.options.debathena
+%:
+ dh $@ --with config-package
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+# In version 1.10 we stopped using bind9
+# (and thus stopped diverting its config)
+override_dh_configpackage:
+ dh_configpackage --undisplace /etc/bind/named.conf.options.debathena
