[27018] in Source-Commits
/svn/athena r25899 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 3 16:40:03 2013
Date: Wed, 3 Apr 2013 16:39:56 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304032039.r33Kdu2c004495@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-03 16:39:55 -0400 (Wed, 03 Apr 2013)
New Revision: 25899
Added:
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.transform
trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/control
trunk/debathena/config/kerberos-config/debian/copyright
trunk/debathena/config/kerberos-config/debian/rules
Log:
In kerberos-config:
* Drop Build-dependency on maybe-krb4-config
* Switch from CDBS to dh7
* Fix syntax error in copyright file
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2013-04-03 19:55:46 UTC (rev 25898)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2013-04-03 20:39:55 UTC (rev 25899)
@@ -3,8 +3,11 @@
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Drop Build-dependency on maybe-krb4-config
+ * Switch from CDBS to dh7
+ * Fix syntax error in copyright file
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:38:38 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 16:39:41 -0400
debathena-kerberos-config (1.14) unstable; urgency=low
Modified: trunk/debathena/config/kerberos-config/debian/control
===================================================================
--- trunk/debathena/config/kerberos-config/debian/control 2013-04-03 19:55:46 UTC (rev 25898)
+++ trunk/debathena/config/kerberos-config/debian/control 2013-04-03 20:39:55 UTC (rev 25899)
@@ -2,7 +2,7 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: cdbs, debhelper, dh-buildinfo, config-package-dev (>= 5.0~), krb5-user, krb5-config, debathena-maybe-krb4-config
+Build-Depends: debhelper (>= 7.0~), dh-buildinfo, config-package-dev (>= 5.0~), krb5-user, krb5-config
Standards-Version: 3.9.3
Package: debathena-kerberos-config
Modified: trunk/debathena/config/kerberos-config/debian/copyright
===================================================================
--- trunk/debathena/config/kerberos-config/debian/copyright 2013-04-03 19:55:46 UTC (rev 25898)
+++ trunk/debathena/config/kerberos-config/debian/copyright 2013-04-03 20:39:55 UTC (rev 25899)
@@ -10,10 +10,10 @@
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
-
+ .
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
-
+ .
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
Added: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.transform
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.transform (rev 0)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.transform 2013-04-03 20:39:55 UTC (rev 25899)
@@ -0,0 +1 @@
+/etc/krb5.conf.debathena </usr/share/kerberos-configs/krb5.conf.template debian/transform_krb5.conf.debathena
Added: trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace
===================================================================
--- trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace (rev 0)
+++ trunk/debathena/config/kerberos-config/debian/debathena-kerberos-config.undisplace 2013-04-03 20:39:55 UTC (rev 25899)
@@ -0,0 +1,2 @@
+/etc/krb.conf.debathena
+/etc/krb.realms.debathena
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2013-04-03 19:55:46 UTC (rev 25898)
+++ trunk/debathena/config/kerberos-config/debian/rules 2013-04-03 20:39:55 UTC (rev 25899)
@@ -1,15 +1,4 @@
#!/usr/bin/make -f
-DEB_DIVERT_EXTENSION = .debathena
-DEB_TRANSFORM_FILES_debathena-kerberos-config += \
- /etc/krb5.conf.debathena
-DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
- /usr/share/kerberos-configs/krb5.conf.template
-
-# Undivert old krb.conf/krb.realms diversions, if any:
-DEB_UNDIVERT_FILES_debathena-kerberos-config += \
- /etc/krb.conf.debathena \
- /etc/krb.realms.debathena
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/config-package.mk
+%:
+ dh $@ --with=config-package
