[23206] in Source-Commits
/svn/athena r22867 - trunk/debathena/config/ssh-server-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 20:41:57 2008
Date: Sun, 6 Apr 2008 20:41:24 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070041.UAA03769@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 20:41:24 -0400 (Sun, 06 Apr 2008)
New Revision: 22867
Modified:
trunk/debathena/config/ssh-server-config/debian/changelog
trunk/debathena/config/ssh-server-config/debian/control
trunk/debathena/config/ssh-server-config/debian/control.in
trunk/debathena/config/ssh-server-config/debian/rules
Log:
Modified: trunk/debathena/config/ssh-server-config/debian/changelog
===================================================================
--- trunk/debathena/config/ssh-server-config/debian/changelog 2008-04-07 00:36:46 UTC (rev 22866)
+++ trunk/debathena/config/ssh-server-config/debian/changelog 2008-04-07 00:41:24 UTC (rev 22867)
@@ -1,3 +1,9 @@
+debathena-ssh-server-config (1.1) unstable; urgency=low
+
+ * Convert (partially) to the new config-package-dev interface.
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 19:24:20 -0400
+
debathena-ssh-server-config (1.0debathena4) unstable; urgency=low
* Restart ssh on installation.
Modified: trunk/debathena/config/ssh-server-config/debian/control
===================================================================
--- trunk/debathena/config/ssh-server-config/debian/control 2008-04-07 00:36:46 UTC (rev 22866)
+++ trunk/debathena/config/ssh-server-config/debian/control 2008-04-07 00:41:24 UTC (rev 22867)
@@ -2,13 +2,14 @@
Section: debathena-config/net
Priority: extra
Maintainer: Debian-Athena Project <debathena@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), debathena-config-build-common, debathena-ssh-server | openssh-server (>= 1:4.3) | ssh-krb5
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, debathena-ssh-server | openssh-server (>= 1:4.3) | ssh-krb5
Standards-Version: 3.7.2
Package: debathena-ssh-server-config
Architecture: all
Depends: debathena-pam-config, openssh-server (>= 1:4.3) | ssh-krb5, ${misc:Depends}
-Conflicts: debathena-sshd-config (<< 1.0)
+Provides: ${diverted-files}
+Conflicts: debathena-sshd-config (<< 1.0), ${diverted-files}
Replaces: debathena-sshd-config (<< 1.0)
Description: sshd configuration for Debian-Athena
This package configures the ssh daemon to support Kerberos
Modified: trunk/debathena/config/ssh-server-config/debian/control.in
===================================================================
--- trunk/debathena/config/ssh-server-config/debian/control.in 2008-04-07 00:36:46 UTC (rev 22866)
+++ trunk/debathena/config/ssh-server-config/debian/control.in 2008-04-07 00:41:24 UTC (rev 22867)
@@ -8,7 +8,8 @@
Package: debathena-ssh-server-config
Architecture: all
Depends: debathena-pam-config, openssh-server (>= 1:4.3) | ssh-krb5, ${misc:Depends}
-Conflicts: debathena-sshd-config (<< 1.0)
+Provides: ${diverted-files}
+Conflicts: debathena-sshd-config (<< 1.0), ${diverted-files}
Replaces: debathena-sshd-config (<< 1.0)
Description: sshd configuration for Debian-Athena
This package configures the ssh daemon to support Kerberos
Modified: trunk/debathena/config/ssh-server-config/debian/rules
===================================================================
--- trunk/debathena/config/ssh-server-config/debian/rules 2008-04-07 00:36:46 UTC (rev 22866)
+++ trunk/debathena/config/ssh-server-config/debian/rules 2008-04-07 00:41:24 UTC (rev 22867)
@@ -1,10 +1,11 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-ssh-server-config += \
+DEB_DIVERT_EXTENSION = .debathena
+DEB_DIVERT_FILES_debathena-ssh-server-config += \
/etc/ssh/sshd_config.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/debathena-divert.mk
+include /usr/share/cdbs/1/rules/replace-files.mk
ifeq ($(shell dpkg --compare-versions \
"`dpkg-query --showformat='$${Version}' --show openssh-server`" ">=" 1:4.3 && echo y),y)
