[23096] in Source-Commits
/svn/athena r22759 - trunk/debathena/config/nsswitch-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Feb 17 23:34:33 2008
Date: Sun, 17 Feb 2008 23:34:05 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200802180434.XAA00839@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-02-17 23:34:04 -0500 (Sun, 17 Feb 2008)
New Revision: 22759
Removed:
trunk/debathena/config/nsswitch-config/debian/debathena-nsswitch-config.install
Modified:
trunk/debathena/config/nsswitch-config/debian/rules
Log:
The last nsswitch commit was an intermediate version. Here's the
version that actually works.
Deleted: trunk/debathena/config/nsswitch-config/debian/debathena-nsswitch-config.install
Modified: trunk/debathena/config/nsswitch-config/debian/rules
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/rules 2008-02-18 04:14:46 UTC (rev 22758)
+++ trunk/debathena/config/nsswitch-config/debian/rules 2008-02-18 04:34:04 UTC (rev 22759)
@@ -1,14 +1,11 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
- DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
+DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
/etc/nsswitch.conf.debathena
- DEBATHENA_REPLACE_CONFFILES_SOURCE_/etc/nsswitch.conf.debathena = \
+ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
+ DEBATHENA_CHECK_CONFFILES_SOURCE_/etc/nsswitch.conf.debathena = \
/usr/share/base-files/nsswitch.conf
-else
- DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
- /etc/nsswitch.conf.debathena
endif
include /usr/share/cdbs/1/rules/debhelper.mk
