[23059] in Source-Commits
/svn/athena r22722 - trunk/debathena/config/nsswitch-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Wed Jan 30 21:12:46 2008
Date: Wed, 30 Jan 2008 21:12:13 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801310212.VAA14677@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-01-30 21:12:13 -0500 (Wed, 30 Jan 2008)
New Revision: 22722
Added:
trunk/debathena/config/nsswitch-config/debian/transform_nsswitch.conf.debathena
Modified:
trunk/debathena/config/nsswitch-config/debian/changelog
trunk/debathena/config/nsswitch-config/debian/control
trunk/debathena/config/nsswitch-config/debian/control.in
trunk/debathena/config/nsswitch-config/debian/rules
Log:
Modified: trunk/debathena/config/nsswitch-config/debian/changelog
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/changelog 2008-01-31 02:09:17 UTC (rev 22721)
+++ trunk/debathena/config/nsswitch-config/debian/changelog 2008-01-31 02:12:13 UTC (rev 22722)
@@ -1,3 +1,9 @@
+debathena-nsswitch-config (1.3debathena1) unstable; urgency=low
+
+ * Use debathena-replace-conffiles interface.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 30 Jan 2008 20:59:41 -0500
+
debathena-nsswitch-config (1.3) unstable; urgency=low
* require libnss-nonlocal (>=1.3~) for the nss-local-users group.
Modified: trunk/debathena/config/nsswitch-config/debian/control
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/control 2008-01-31 02:09:17 UTC (rev 22721)
+++ trunk/debathena/config/nsswitch-config/debian/control 2008-01-31 02:12:13 UTC (rev 22722)
@@ -2,12 +2,14 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-config-build-common (>= 3.5~)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-config-build-common (>= 3.5~), debathena-config-build-common (>= 3.6~)
Standards-Version: 3.7.2
Package: debathena-nsswitch-config
Architecture: all
Depends: debathena-hesiod-config, debathena-autofs-config, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
+Provides: ${divert:Diverted}
+Conflicts: ${divert:Diverted}
Description: nsswitch configuration for Debian-Athena
This packages configures nsswitch to get passwd information from
Athena Hesiod, using libnss-nonlocal, which prevents network users
Modified: trunk/debathena/config/nsswitch-config/debian/control.in
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/control.in 2008-01-31 02:09:17 UTC (rev 22721)
+++ trunk/debathena/config/nsswitch-config/debian/control.in 2008-01-31 02:12:13 UTC (rev 22722)
@@ -8,6 +8,8 @@
Package: debathena-nsswitch-config
Architecture: all
Depends: debathena-hesiod-config, debathena-autofs-config, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
+Provides: ${divert:Diverted}
+Conflicts: ${divert:Diverted}
Description: nsswitch configuration for Debian-Athena
This packages configures nsswitch to get passwd information from
Athena Hesiod, using libnss-nonlocal, which prevents network users
Modified: trunk/debathena/config/nsswitch-config/debian/rules
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/rules 2008-01-31 02:09:17 UTC (rev 22721)
+++ trunk/debathena/config/nsswitch-config/debian/rules 2008-01-31 02:12:13 UTC (rev 22722)
@@ -1,24 +1,16 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-nsswitch-config += \
- /etc/nsswitch.conf.debathena
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
-include /usr/share/cdbs/1/rules/debathena-check-conffiles.mk
-
-common-build-indep:: debian/nsswitch.conf.debathena
-
ifneq ($(wildcard /usr/share/base-files/nsswitch.conf),)
- NSSWITCH_CONF = /usr/share/base-files/nsswitch.conf
+ DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
+ /usr/share/base-files/nsswitch.conf.debathena
+ DEBATHENA_CONFFILE_DEST_/usr/share/base-files/nsswitch.conf.debathena = \
+ /etc/nsswitch.conf.debathena
else
- NSSWITCH_CONF = $(call debathena_check_conffiles,/etc/nsswitch.conf)
+ DEBATHENA_REPLACE_CONFFILES_debathena-nsswitch-config += \
+ /etc/nsswitch.conf.debathena
endif
-debian/nsswitch.conf.debathena: $(NSSWITCH_CONF)
- perl -0pe ' \
- s/^(passwd: .*)$$/$$1 nonlocal\npasswd_nonlocal: hesiod/m and \
- s/^(group: .*)$$/$$1 afspag nonlocal\ngroup_nonlocal: hesiod/m or die' $< > $@
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/debathena-replace-conffiles.mk
-clean::
- rm -f debian/nsswitch.conf.debathena
Added: trunk/debathena/config/nsswitch-config/debian/transform_nsswitch.conf.debathena
Property changes on: trunk/debathena/config/nsswitch-config/debian/transform_nsswitch.conf.debathena
___________________________________________________________________
Name: svn:executable
+ *
