[23060] in Source-Commits
/svn/athena r22723 - trunk/debathena/config/afs-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Wed Jan 30 21:13:33 2008
Date: Wed, 30 Jan 2008 21:12:58 -0500 (EST)
From: tabbott@MIT.EDU
Message-Id: <200801310212.VAA14698@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:58 -0500 (Wed, 30 Jan 2008)
New Revision: 22723
Removed:
trunk/debathena/config/afs-config/debian/afs.conf.debathena
trunk/debathena/config/afs-config/debian/debathena-afs-config.dirs
Modified:
trunk/debathena/config/afs-config/debian/changelog
trunk/debathena/config/afs-config/debian/control
trunk/debathena/config/afs-config/debian/control.in
trunk/debathena/config/afs-config/debian/debathena-afs-config.install
trunk/debathena/config/afs-config/debian/rules
Log:
Deleted: trunk/debathena/config/afs-config/debian/afs.conf.debathena
Modified: trunk/debathena/config/afs-config/debian/changelog
===================================================================
--- trunk/debathena/config/afs-config/debian/changelog 2008-01-31 02:12:13 UTC (rev 22722)
+++ trunk/debathena/config/afs-config/debian/changelog 2008-01-31 02:12:58 UTC (rev 22723)
@@ -1,3 +1,10 @@
+debathena-afs-config (1.2debathena4) unstable; urgency=low
+
+ * Use new debathena-replace-conffiles system.
+ * Correctly remove afs.conf.debathena on clean.
+
+ -- Tim Abbott <tabbott@mit.edu> Wed, 30 Jan 2008 20:40:24 -0500
+
debathena-afs-config (1.2debathena3) unstable; urgency=low
* Restart AFS so AFS comes up correctly at installation, but don't let
Modified: trunk/debathena/config/afs-config/debian/control
===================================================================
--- trunk/debathena/config/afs-config/debian/control 2008-01-31 02:12:13 UTC (rev 22722)
+++ trunk/debathena/config/afs-config/debian/control 2008-01-31 02:12:58 UTC (rev 22723)
@@ -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~), wget, openafs-client
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common (>= 3.5~), debathena-config-build-common, debathena-config-build-common (>= 3.6~), wget, openafs-client
Standards-Version: 3.7.2
Package: debathena-afs-config
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
Recommends: debathena-autofs-config
+Provides: ${divert:Diverted}
+Conflicts: ${divert:Diverted}
Description: AFS configuration for Debian-Athena
This packages configures OpenAFS to access the Athena AFS cell.
Modified: trunk/debathena/config/afs-config/debian/control.in
===================================================================
--- trunk/debathena/config/afs-config/debian/control.in 2008-01-31 02:12:13 UTC (rev 22722)
+++ trunk/debathena/config/afs-config/debian/control.in 2008-01-31 02:12:58 UTC (rev 22723)
@@ -9,5 +9,7 @@
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
Recommends: debathena-autofs-config
+Provides: ${divert:Diverted}
+Conflicts: ${divert:Diverted}
Description: AFS configuration for Debian-Athena
This packages configures OpenAFS to access the Athena AFS cell.
Deleted: trunk/debathena/config/afs-config/debian/debathena-afs-config.dirs
Modified: trunk/debathena/config/afs-config/debian/debathena-afs-config.install
===================================================================
--- trunk/debathena/config/afs-config/debian/debathena-afs-config.install 2008-01-31 02:12:13 UTC (rev 22722)
+++ trunk/debathena/config/afs-config/debian/debathena-afs-config.install 2008-01-31 02:12:58 UTC (rev 22723)
@@ -1,4 +1,3 @@
-debian/afs.conf.debathena etc/openafs
debian/afs.conf.client.debathena etc/openafs
debian/CellAlias.debathena etc/openafs
debian/CellServDB.debathena etc/openafs
Modified: trunk/debathena/config/afs-config/debian/rules
===================================================================
--- trunk/debathena/config/afs-config/debian/rules 2008-01-31 02:12:13 UTC (rev 22722)
+++ trunk/debathena/config/afs-config/debian/rules 2008-01-31 02:12:58 UTC (rev 22723)
@@ -2,16 +2,16 @@
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
DEBATHENA_DIVERT_FILES_debathena-afs-config += \
- /etc/openafs/afs.conf.debathena \
/etc/openafs/afs.conf.client.debathena \
/etc/openafs/CellAlias.debathena \
/etc/openafs/CellServDB.debathena \
/etc/openafs/SuidCells.debathena \
/etc/openafs/ThisCell.debathena \
/etc/openafs/cacheinfo.debathena
+DEBATHENA_REPLACE_CONFFILES_debathena-afs-config += \
+ /etc/openafs/afs.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
+include /usr/share/cdbs/1/rules/debathena-replace-conffiles.mk
FROM_ATHENA = debian/CellAlias.debathena debian/CellServDB.debathena
@@ -28,16 +28,6 @@
diff -q $@.tmp $@ || mv $@.tmp $@
rm -f $@.tmp
-common-build-indep:: debian/afs.conf.debathena
-
-debian/afs.conf.debathena: $(call debathena_check_conffiles,/etc/openafs/afs.conf)
- if fgrep -q AFS_SYSNAME $< 2>/dev/null; then \
- perl -0pe 's/^.*AFS_SYSNAME=.*$$/AFS_SYSNAME="\$$(machtype -S) \$$(machtype -C | sed "s\/:\/ \/g")"/m or die;' $< >$@; \
- else \
- perl -0pe 's/^AFS_POST_INIT=.*$$/AFS_POST_INIT="fs sysname \$$(machtype -S) \$$(machtype -C | sed "s\/:\/ \/g")"/m or die' $< >$@; \
- fi
- perl -i -0pe 's/^OPTIONS=(AUTOMATIC|\$$MEDIUM)$$/OPTIONS="-stat 10000 -daemons 6 -volumes 200"/m or die;' $@
-
FORCE:
.PRECIOUS: $(patsubst %.debathena,%.athena,$(FROM_ATHENA))
