[26952] in Source-Commits
/svn/athena r25848 - trunk/debathena/config/kerberos-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Mar 8 14:58:10 2013
Date: Fri, 8 Mar 2013 14:58:03 -0500
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303081958.r28Jw3hU010282@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-08 14:58:03 -0500 (Fri, 08 Mar 2013)
New Revision: 25848
Removed:
trunk/debathena/config/kerberos-config/debian/transform_krb.conf.debathena
trunk/debathena/config/kerberos-config/debian/transform_krb.realms.debathena
Modified:
trunk/debathena/config/kerberos-config/debian/changelog
trunk/debathena/config/kerberos-config/debian/control.in
trunk/debathena/config/kerberos-config/debian/copyright
trunk/debathena/config/kerberos-config/debian/rules
Log:
In kerberos-config:
* Drop the krb4 conditionals in the rules file, we no longer have any
krb4 releases
* undivert /etc/krb.{realms,conf} from any previous krb4 versions (Trac:
#1060)
* Change debian/copyright to DEP5 format
Modified: trunk/debathena/config/kerberos-config/debian/changelog
===================================================================
--- trunk/debathena/config/kerberos-config/debian/changelog 2013-03-08 19:19:31 UTC (rev 25847)
+++ trunk/debathena/config/kerberos-config/debian/changelog 2013-03-08 19:58:03 UTC (rev 25848)
@@ -1,9 +1,17 @@
-debathena-kerberos-config (1.14) UNRELEASED; urgency=low
+debathena-kerberos-config (1.14) unstable; urgency=low
+ [ Geoffrey Thomas ]
* Spelling and grammar fixes.
- -- Geoffrey Thomas <geofft@mit.edu> Fri, 20 Jan 2012 19:29:56 -0500
+ [ Jonathan Reed ]
+ * Drop the krb4 conditionals in the rules file, we no longer have any
+ krb4 releases
+ * undivert /etc/krb.{realms,conf} from any previous krb4 versions (Trac:
+ #1060)
+ * Change debian/copyright to DEP5 format
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 08 Mar 2013 14:57:43 -0500
+
debathena-kerberos-config (1.13) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Modified: trunk/debathena/config/kerberos-config/debian/control.in
===================================================================
--- trunk/debathena/config/kerberos-config/debian/control.in 2013-03-08 19:19:31 UTC (rev 25847)
+++ trunk/debathena/config/kerberos-config/debian/control.in 2013-03-08 19:58:03 UTC (rev 25848)
@@ -3,11 +3,11 @@
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
Build-Depends: @cdbs@, krb5-user, krb5-config, debathena-maybe-krb4-config
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
Package: debathena-kerberos-config
Architecture: all
-Depends: krb5-config, krb5-user, krb5-clients, ntp | ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends}, ${debathena-krb4-depends}
+Depends: krb5-config, krb5-user, krb5-clients, ntp | ntp-server | time-daemon, ntpdate | time-daemon, ${misc:Depends}
Recommends: debathena-apparmor-config
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Modified: trunk/debathena/config/kerberos-config/debian/copyright
===================================================================
--- trunk/debathena/config/kerberos-config/debian/copyright 2013-03-08 19:19:31 UTC (rev 25847)
+++ trunk/debathena/config/kerberos-config/debian/copyright 2013-03-08 19:58:03 UTC (rev 25848)
@@ -1,12 +1,8 @@
-This package was created as part of the Debathena Project
-<http://debathena.mit.edu/> of the MIT Student Information Processing
-Board.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-The source code was obtained from the Athena SVN repository at
-<svn://debathena.mit.edu/athena/trunk>, and is licensed as follows:
-
- Copyright © 2007-2008 Tim Abbott and Anders Kaseorg
-
+Files: *
+Copyright: Copyright © 2007-2008 Tim Abbott and Anders Kaseorg
+License: Expat
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal in the Software without restriction,
@@ -26,6 +22,3 @@
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-
-The Debian packaging is Copyright © 2007-2008 Tim Abbott and Anders
-Kaseorg, and has the same license as the original software.
Modified: trunk/debathena/config/kerberos-config/debian/rules
===================================================================
--- trunk/debathena/config/kerberos-config/debian/rules 2013-03-08 19:19:31 UTC (rev 25847)
+++ trunk/debathena/config/kerberos-config/debian/rules 2013-03-08 19:58:03 UTC (rev 25848)
@@ -6,19 +6,10 @@
DEB_CHECK_FILES_SOURCE_/etc/krb5.conf.debathena = \
/usr/share/kerberos-configs/krb5.conf.template
-KRB5_VERSION = $(shell dpkg-query -W -f '$${Version}' krb5-user)
-ifeq ($(shell dpkg --compare-versions $(KRB5_VERSION) '<<' '1.7~' && echo y),y)
- DEB_TRANSFORM_FILES_debathena-kerberos-config += \
+# Undivert old krb.conf/krb.realms diversions, if any:
+DEB_UNDIVERT_FILES_debathena-kerberos-config += \
/etc/krb.conf.debathena \
/etc/krb.realms.debathena
- DEB_CHECK_FILES_SOURCE_/etc/krb.conf.debathena = \
- /usr/share/kerberos-configs/krb.conf.template
- binary-predeb/debathena-kerberos-config:: debathena-kerberos-config-substvars
- debathena-kerberos-config-substvars::
- echo "debathena-krb4-depends=krb4-config" \
- >> debian/debathena-kerberos-config.substvars
-endif
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
