[27145] in Source-Commits
/svn/athena r25973 - in trunk/debathena/scripts/build-server: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri May 10 12:06:27 2013
Date: Fri, 10 May 2013 12:06:19 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201305101606.r4AG6J5b018457@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-05-10 12:06:19 -0400 (Fri, 10 May 2013)
New Revision: 25973
Removed:
trunk/debathena/scripts/build-server/packages
Modified:
trunk/debathena/scripts/build-server/debian/control
trunk/debathena/scripts/build-server/debian/debathena-build-server.transform
Log:
- Remove 'packages', this info is now in the control file
- Add Conflicts/Provides fields for c-p-d
- Update the transform file to use a leading '.' for the scripts
Modified: trunk/debathena/scripts/build-server/debian/control
===================================================================
--- trunk/debathena/scripts/build-server/debian/control 2013-05-10 15:36:55 UTC (rev 25972)
+++ trunk/debathena/scripts/build-server/debian/control 2013-05-10 16:06:19 UTC (rev 25973)
@@ -16,6 +16,8 @@
subversion,
debathena-debian-dev,
${misc:Depends}
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
Description: Suite of tools to create a Debathena build server
This package includes a set of scripts, tools, and dependencies
necessary to create a Debathena build server. You probably don't
Modified: trunk/debathena/scripts/build-server/debian/debathena-build-server.transform
===================================================================
--- trunk/debathena/scripts/build-server/debian/debathena-build-server.transform 2013-05-10 15:36:55 UTC (rev 25972)
+++ trunk/debathena/scripts/build-server/debian/debathena-build-server.transform 2013-05-10 16:06:19 UTC (rev 25973)
@@ -1,2 +1,4 @@
-/etc/pam.d/schroot.debathena modify_etc_pam.d_schroot
-/etc/approx/approx.conf.debathena modify_etc_approx_approx.conf
+# The initial dot is necessary to make it clear this is a script in
+# the root of the package, not a command in $PATH
+/etc/pam.d/schroot.debathena ./modify_etc_pam.d_schroot
+/etc/approx/approx.conf.debathena ./modify_etc_approx_approx.conf
