[23220] in Source-Commits
/svn/athena r22881 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 22:32:04 2008
Date: Sun, 6 Apr 2008 22:31:36 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070231.WAA05419@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 22:31:35 -0400 (Sun, 06 Apr 2008)
New Revision: 22881
Removed:
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.dirs
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.install
Modified:
trunk/debathena/config/kerberos-config/debian/rules
trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena
Log:
debathena-kerberos-config: Fix mistakes in conversion to new
config-package-dev system.
Deleted: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.dirs
Deleted: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.install
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2008-04-07 02:28:10 UTC (rev 22880)
+++ trunk/debathena/config/kerberos-config/debian/rules 2008-04-07 02:31:35 UTC (rev 22881)
@@ -6,7 +6,9 @@
/etc/krb5.conf.debathena \
/etc/krb.conf.debathena \
/etc/krb.realms.debathena
-DEB_CHECK_FILES_SOURCE_krb5.conf = /usr/share/kerberos-configs/krb5.conf.template
-DEB_CHECK_FILES_SOURCE_krb.conf = /usr/share/kerberos-configs/krb.conf.template
+DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
+ /usr/share/kerberos-configs/krb5.conf.template
+DEB_CHECK_FILES_SOURCE_/etc/krb.conf.debathena = \
+ /usr/share/kerberos-configs/krb.conf.template
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/replace-files.mk
Modified: trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena
===================================================================
--- trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena 2008-04-07 02:28:10 UTC (rev 22880)
+++ trunk/debathena/config/kerberos-config/debian/transform_krb5.conf.debathena 2008-04-07 02:31:35 UTC (rev 22881)
@@ -1,5 +1,5 @@
#!/usr/bin/perl -p0
-s/^([ \t]*default_realm *=).*$$/\1 ATHENA.MIT.EDU/m or die;
+s/^([ \t]*default_realm *=).*$/\1 ATHENA.MIT.EDU/m or die;
s/(\[realms\][^[]*\n)[ \t]*NUMENOR\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/;
s/(\[realms\]\n)/\1\tNUMENOR.MIT.EDU = {\n\t\tkdc = numenor.mit.edu\n\t\tadmin_server = numenor.mit.edu\n\t}\n/ or die;
s/(\[realms\][^[]*\n)[ \t]*CSAIL\.MIT\.EDU\s*=\s*\{[^}]*\}\s*\n/\1/;
