[26950] in Source-Commits
/svn/athena r25846 - trunk/debathena/config/zephyr-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Mar 8 13:48:34 2013
Date: Fri, 8 Mar 2013 13:48:27 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303081848.r28ImRIM027631@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-08 13:48:27 -0500 (Fri, 08 Mar 2013)
New Revision: 25846
Removed:
trunk/debathena/config/zephyr-config/debian/debathena-zephyr-config.debconf-hack
Modified:
trunk/debathena/config/zephyr-config/debian/changelog
trunk/debathena/config/zephyr-config/debian/control.in
trunk/debathena/config/zephyr-config/debian/rules
Log:
In zephyr-config:
* Drop debconf-hack (Trac: #1298) and Pre-Depend on
debathena-hesiod-config instead to workaround upstream bug
(zephyr.1ts.org #108)
* Bump compat level to 7 and Standards-Version
* Depend on debhelper 7.4.3+ for dh_installifdown and remove workaround
in rules file for older versions
Modified: trunk/debathena/config/zephyr-config/debian/changelog
===================================================================
--- trunk/debathena/config/zephyr-config/debian/changelog 2013-03-08 16:44:21 UTC (rev 25845)
+++ trunk/debathena/config/zephyr-config/debian/changelog 2013-03-08 18:48:27 UTC (rev 25846)
@@ -1,3 +1,14 @@
+debathena-zephyr-config (1.12) unstable; urgency=low
+
+ * Drop debconf-hack (Trac: #1298) and Pre-Depend on
+ debathena-hesiod-config instead to workaround upstream bug
+ (zephyr.1ts.org #108)
+ * Bump compat level to 7 and Standards-Version
+ * Depend on debhelper 7.4.3+ for dh_installifdown and remove workaround
+ in rules file for older versions
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 08 Mar 2013 13:35:51 -0500
+
debathena-zephyr-config (1.11) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/debathena/config/zephyr-config/debian/control.in
===================================================================
--- trunk/debathena/config/zephyr-config/debian/control.in 2013-03-08 16:44:21 UTC (rev 25845)
+++ trunk/debathena/config/zephyr-config/debian/control.in 2013-03-08 18:48:27 UTC (rev 25846)
@@ -2,14 +2,19 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@
-Standards-Version: 3.8.4
+Build-Depends: @cdbs@, debhelper (>= 7.4.3~)
+Standards-Version: 3.9.3
Package: debathena-zephyr-config
Architecture: all
-Depends: libzephyr4-krb5 | zephyr-clients (<< 3.0~), zephyr-clients (>= 3.0~) | libzephyr3-krb, zephyr-clients, debathena-kerberos-config, debathena-hesiod-config, ${misc:Depends}
+# Workaround for zephyr:108 / Trac: #1298
+Pre-Depends: debathena-hesiod-config
+Depends: libzephyr4-krb5 | zephyr-clients (<< 3.0~), zephyr-clients (>= 3.0~) | libzephyr3-krb, zephyr-clients, debathena-kerberos-config, ${misc:Depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Zephyr configuration for Debathena
- This package configures Zephyr for the Debathena system by
- setting up the default Zephyr servers.
+ This package configures Zephyr for the Debathena system by setting up
+ Zephyr to use Hesiod SLOC information to identify the zephyr servers.
+ This package relies on a correct Hesiod configuration. If you
+ manually configure Hesiod, you are encouraged to also configure
+ Zephyr manually, unless you know what you're doing.
Modified: trunk/debathena/config/zephyr-config/debian/rules
===================================================================
--- trunk/debathena/config/zephyr-config/debian/rules 2013-03-08 16:44:21 UTC (rev 25845)
+++ trunk/debathena/config/zephyr-config/debian/rules 2013-03-08 18:48:27 UTC (rev 25846)
@@ -5,12 +5,4 @@
/etc/default/zephyr-clients.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
-include /usr/share/cdbs/1/rules/debconf-divert.mk
-common-install-indep::
- if hash dh_installifupdown 2>/dev/null; then \
- dh_installifupdown; \
- else \
- dh_installdirs etc/network/if-up.d; \
- install -p debian/debathena-zephyr-config.if-up $(DEB_DESTDIR)/etc/network/if-up.d/debathena-zephyr-config; \
- fi
