[26237] in Source-Commits
/svn/athena r25468 - trunk/debathena/config/dns-config/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sat Apr 28 23:21:07 2012
Date: Sat, 28 Apr 2012 23:21:05 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201204290321.q3T3L5Cw017675@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2012-04-28 23:21:04 -0400 (Sat, 28 Apr 2012)
New Revision: 25468
Modified:
trunk/debathena/config/dns-config/debian/changelog
trunk/debathena/config/dns-config/debian/rules
Log:
In dns-config:
* Check for template named.conf.options in /usr/share/bind9, as it is
in e.g. Precise.
Modified: trunk/debathena/config/dns-config/debian/changelog
===================================================================
--- trunk/debathena/config/dns-config/debian/changelog 2012-04-26 05:21:37 UTC (rev 25467)
+++ trunk/debathena/config/dns-config/debian/changelog 2012-04-29 03:21:04 UTC (rev 25468)
@@ -1,3 +1,10 @@
+debathena-dns-config (1.6) unstable; urgency=low
+
+ * Check for template named.conf.options in /usr/share/bind9, as it is
+ in e.g. Precise.
+
+ -- Geoffrey Thomas <geofft@mit.edu> Sat, 28 Apr 2012 20:18:50 -0700
+
debathena-dns-config (1.5) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/debathena/config/dns-config/debian/rules
===================================================================
--- trunk/debathena/config/dns-config/debian/rules 2012-04-26 05:21:37 UTC (rev 25467)
+++ trunk/debathena/config/dns-config/debian/rules 2012-04-29 03:21:04 UTC (rev 25468)
@@ -3,5 +3,10 @@
DEB_DIVERT_EXTENSION = .debathena
DEB_TRANSFORM_FILES_debathena-dns-config += \
/etc/bind/named.conf.options.debathena
+ifneq ($(wildcard /usr/share/bind9/named.conf.options),)
+ DEB_CHECK_FILES_SOURCE_/etc/bind/named.conf.options.debathena = \
+ /usr/share/bind9/named.conf.options
+endif
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
