[23429] in Source-Commits
/svn/athena r23082 - in trunk/debathena: config/afs-config/debian config/nsswitch-config/debian meta/locker
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Mon Jul 14 23:00:00 2008
Date: Mon, 14 Jul 2008 22:59:26 -0400 (EDT)
From: broder@MIT.EDU
Message-Id: <200807150259.WAA01132@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2008-07-14 22:59:25 -0400 (Mon, 14 Jul 2008)
New Revision: 23082
Modified:
trunk/debathena/config/afs-config/debian/CellServDB.athena
trunk/debathena/config/afs-config/debian/CellServDB.debathena
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/nsswitch-config/debian/changelog
trunk/debathena/config/nsswitch-config/debian/control
trunk/debathena/config/nsswitch-config/debian/control.in
trunk/debathena/meta/locker/debathena-locker.equivs
Log:
Adjust debathena-nsswitch-config, debathena-afs-config, and debathena-locker
for addition of debathena-pyhesiodfs.
Modified: trunk/debathena/config/afs-config/debian/CellServDB.athena
===================================================================
--- trunk/debathena/config/afs-config/debian/CellServDB.athena 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/afs-config/debian/CellServDB.athena 2008-07-15 02:59:25 UTC (rev 23082)
@@ -184,15 +184,16 @@
128.2.10.28 #vice28.fs.andrew.cmu.edu.
128.2.32.44 #new-vice12.fs.andrew.cmu.edu.
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
+128.2.204.149 #barium.club.cc.cmu.edu
128.237.157.11 #sodium.club.cc.cmu.edu.
128.237.157.13 #potassium.club.cc.cmu.edu.
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
128.2.40.134 #afs.chem.cmu.edu.
128.2.40.140 #afs2.chem.cmu.edu.
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
-128.2.194.178 #cherry.srv.cs.cmu.edu.
-128.2.194.179 #pumpkin.srv.cs.cmu.edu.
-128.2.194.180 #strawberry.srv.cs.cmu.edu.
+128.2.184.215 #pumpkin.srv.cs.cmu.edu
+128.2.201.46 #strawberry.srv.cs.cmu.edu
+128.2.201.48 #cherry.srv.cs.cmu.edu
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
128.2.129.7 #porok.ece.cmu.edu.
128.2.129.8 #vicio.ece.cmu.edu.
@@ -200,11 +201,11 @@
>scotch.ece.cmu.edu #CMU ECE CALCM research group
128.2.134.82 #lagavulin.ece.cmu.edu.
>qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell
-204.194.25.7 #afs1.qatar.cmu.edu.
-204.194.25.8 #afs2.qatar.cmu.edu.
+86.36.46.6 #afs1.qatar.cmu.edu
+86.36.46.7 #afs2.qatar.cmu.edu
>sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab
-128.2.56.129 #nihao.sbp.ri.cmu.edu.
-128.2.56.136 #youtheman.sbp.ri.cmu.edu.
+128.2.179.12 #nihao.sbp.ri.cmu.edu
+128.2.179.113 #youtheman.sbp.ri.cmu.edu
>msc.cornell.edu #Cornell University Materials Science Center
128.84.231.242 #miranda.ccmr.cornell.edu.
128.84.241.35 #co.ccmr.cornell.edu.
Modified: trunk/debathena/config/afs-config/debian/CellServDB.debathena
===================================================================
--- trunk/debathena/config/afs-config/debian/CellServDB.debathena 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/afs-config/debian/CellServDB.debathena 2008-07-15 02:59:25 UTC (rev 23082)
@@ -184,15 +184,16 @@
128.2.10.28 #vice28.fs.andrew.cmu.edu.
128.2.32.44 #new-vice12.fs.andrew.cmu.edu.
>club.cc.cmu.edu #Carnegie Mellon University Computer Club
+128.2.204.149 #barium.club.cc.cmu.edu
128.237.157.11 #sodium.club.cc.cmu.edu.
128.237.157.13 #potassium.club.cc.cmu.edu.
>chem.cmu.edu #Carnegie Mellon University - Chemistry Dept.
128.2.40.134 #afs.chem.cmu.edu.
128.2.40.140 #afs2.chem.cmu.edu.
>cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci.
-128.2.194.178 #cherry.srv.cs.cmu.edu.
-128.2.194.179 #pumpkin.srv.cs.cmu.edu.
-128.2.194.180 #strawberry.srv.cs.cmu.edu.
+128.2.184.215 #pumpkin.srv.cs.cmu.edu
+128.2.201.46 #strawberry.srv.cs.cmu.edu
+128.2.201.48 #cherry.srv.cs.cmu.edu
>ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept.
128.2.129.7 #porok.ece.cmu.edu.
128.2.129.8 #vicio.ece.cmu.edu.
@@ -200,11 +201,11 @@
>scotch.ece.cmu.edu #CMU ECE CALCM research group
128.2.134.82 #lagavulin.ece.cmu.edu.
>qatar.cmu.edu #Carnegie Mellon University - Qatar Campus Cell
-204.194.25.7 #afs1.qatar.cmu.edu.
-204.194.25.8 #afs2.qatar.cmu.edu.
+86.36.46.6 #afs1.qatar.cmu.edu
+86.36.46.7 #afs2.qatar.cmu.edu
>sbp.ri.cmu.edu #Carnegie Mellon University - Sensor Based Planning Lab
-128.2.56.129 #nihao.sbp.ri.cmu.edu.
-128.2.56.136 #youtheman.sbp.ri.cmu.edu.
+128.2.179.12 #nihao.sbp.ri.cmu.edu
+128.2.179.113 #youtheman.sbp.ri.cmu.edu
>msc.cornell.edu #Cornell University Materials Science Center
128.84.231.242 #miranda.ccmr.cornell.edu.
128.84.241.35 #co.ccmr.cornell.edu.
Modified: trunk/debathena/config/afs-config/debian/changelog
===================================================================
--- trunk/debathena/config/afs-config/debian/changelog 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/afs-config/debian/changelog 2008-07-15 02:59:25 UTC (rev 23082)
@@ -1,3 +1,11 @@
+debathena-afs-config (1.5) unstable; urgency=low
+
+ * Change Recommends from debathena-afuse-automounter to the more generic
+ debathena-mit-automounter.
+ * Update CellServDB to reflect changes.
+
+ -- Evan Broder <broder@mit.edu> Fri, 11 Jul 2008 17:52:15 -0400
+
debathena-afs-config (1.4) unstable; urgency=low
* Change Recommends from debathena-autofs-config to
Modified: trunk/debathena/config/afs-config/debian/control
===================================================================
--- trunk/debathena/config/afs-config/debian/control 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/afs-config/debian/control 2008-07-15 02:59:25 UTC (rev 23082)
@@ -8,7 +8,7 @@
Package: debathena-afs-config
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
-Recommends: debathena-afuse-automounter
+Recommends: debathena-mit-automounter
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: AFS configuration for Debian-Athena
Modified: trunk/debathena/config/afs-config/debian/control.in
===================================================================
--- trunk/debathena/config/afs-config/debian/control.in 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/afs-config/debian/control.in 2008-07-15 02:59:25 UTC (rev 23082)
@@ -8,7 +8,7 @@
Package: debathena-afs-config
Architecture: all
Depends: openafs-client, debathena-kerberos-config, debathena-machtype, openafs-krb5, ${misc:Depends}
-Recommends: debathena-afuse-automounter
+Recommends: debathena-mit-automounter
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: AFS configuration for Debian-Athena
Modified: trunk/debathena/config/nsswitch-config/debian/changelog
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/changelog 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/nsswitch-config/debian/changelog 2008-07-15 02:59:25 UTC (rev 23082)
@@ -1,3 +1,10 @@
+debathena-nsswitch-config (1.10) unstable; urgency=low
+
+ * Change from depending on debathena-afuse-automounter to the more
+ generic debathena-mit-automounter.
+
+ -- Evan Broder <broder@mit.edu> Thu, 10 Jul 2008 22:29:52 -0400
+
debathena-nsswitch-config (1.9) unstable; urgency=low
* Convert to use config-package.mk interface, new in config-package-
Modified: trunk/debathena/config/nsswitch-config/debian/control
===================================================================
--- trunk/debathena/config/nsswitch-config/debian/control 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/nsswitch-config/debian/control 2008-07-15 02:59:25 UTC (rev 23082)
@@ -7,9 +7,9 @@
Package: debathena-nsswitch-config
Architecture: all
-Depends: debathena-hesiod-config, debathena-afuse-automounter, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
+Depends: debathena-hesiod-config, debathena-mit-automounter, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, debathena-afuse-automounter (<= 1.4)
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-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/config/nsswitch-config/debian/control.in 2008-07-15 02:59:25 UTC (rev 23082)
@@ -7,9 +7,9 @@
Package: debathena-nsswitch-config
Architecture: all
-Depends: debathena-hesiod-config, debathena-afuse-automounter, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
+Depends: debathena-hesiod-config, debathena-mit-automounter, libnss-nonlocal (>= 1.3~), libnss-afspag, ${misc:Depends}
Provides: ${diverted-files}
-Conflicts: ${diverted-files}
+Conflicts: ${diverted-files}, debathena-afuse-automounter (<= 1.4)
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/meta/locker/debathena-locker.equivs
===================================================================
--- trunk/debathena/meta/locker/debathena-locker.equivs 2008-07-15 02:57:45 UTC (rev 23081)
+++ trunk/debathena/meta/locker/debathena-locker.equivs 2008-07-15 02:59:25 UTC (rev 23082)
@@ -3,10 +3,9 @@
Standards-Version: 3.6.2
Package: debathena-locker
-Version: 0.2.6
+Version: 0.2.7
Maintainer: Debian-Athena Project <debathena@mit.edu>
Depends: debathena-afs-config,
- debathena-afuse-automounter,
debathena-athdir,
debathena-athrun,
debathena-attach,
@@ -18,6 +17,7 @@
debathena-kerberos-config,
debathena-lert,
debathena-machtype,
+ debathena-mit-automounter,
debathena-quota,
debathena-quota-config,
debathena-tcsh-config,
@@ -25,6 +25,7 @@
debathena-zephyr-config
Recommends: debathena-bash,
debathena-tcsh
+Conflicts: debathena-afuse-automounter (<= 1.4)
Copyright: ../common/copyright
Readme: ../common/README-meta.in
Description: Metapackage providing Athena locker support
