[23200] in Source-Commits
/svn/athena r22861 - trunk/debathena/config/ssh-client-config/debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 20:19:32 2008
Date: Sun, 6 Apr 2008 20:19:21 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804070019.UAA03446@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:19:20 -0400 (Sun, 06 Apr 2008)
New Revision: 22861
Added:
trunk/debathena/config/ssh-client-config/debian/transform_ssh_config.debathena
Removed:
trunk/debathena/config/ssh-client-config/debian/debathena-ssh-client-config.install
Modified:
trunk/debathena/config/ssh-client-config/debian/changelog
trunk/debathena/config/ssh-client-config/debian/control
trunk/debathena/config/ssh-client-config/debian/control.in
trunk/debathena/config/ssh-client-config/debian/rules
Log:
Modified: trunk/debathena/config/ssh-client-config/debian/changelog
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/changelog 2008-04-07 00:17:55 UTC (rev 22860)
+++ trunk/debathena/config/ssh-client-config/debian/changelog 2008-04-07 00:19:20 UTC (rev 22861)
@@ -1,3 +1,9 @@
+debathena-ssh-client-config (1.1) unstable; urgency=low
+
+ * Convert to the new config-package-dev interface
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 19:43:11 -0400
+
debathena-ssh-client-config (1.0debathena6) unstable; urgency=low
* Eliminate all GSSAPIAuthentication lines in /etc/ssh/ssh_config before
Modified: trunk/debathena/config/ssh-client-config/debian/control
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/control 2008-04-07 00:17:55 UTC (rev 22860)
+++ trunk/debathena/config/ssh-client-config/debian/control 2008-04-07 00:19:20 UTC (rev 22861)
@@ -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-config-build-common (>= 3.5~), debathena-ssh-client | openssh-client | ssh-krb5
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), config-package-dev, debathena-ssh-client | openssh-client | ssh-krb5
Standards-Version: 3.7.2
Package: debathena-ssh-client-config
Architecture: all
Depends: debathena-kerberos-config, openssh-client | ssh-krb5, ${misc:Depends}
-Conflicts: debathena-ssh-config (<< 1.0)
+Provides: ${diverted-files}
+Conflicts: debathena-ssh-config (<< 1.0), ${diverted-files}
Replaces: debathena-ssh-config (<< 1.0)
Description: SSH client configuration for Debian-Athena
This package configures the SSH client to automatically forward
Modified: trunk/debathena/config/ssh-client-config/debian/control.in
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/control.in 2008-04-07 00:17:55 UTC (rev 22860)
+++ trunk/debathena/config/ssh-client-config/debian/control.in 2008-04-07 00:19:20 UTC (rev 22861)
@@ -8,7 +8,8 @@
Package: debathena-ssh-client-config
Architecture: all
Depends: debathena-kerberos-config, openssh-client | ssh-krb5, ${misc:Depends}
-Conflicts: debathena-ssh-config (<< 1.0)
+Provides: ${diverted-files}
+Conflicts: debathena-ssh-config (<< 1.0), ${diverted-files}
Replaces: debathena-ssh-config (<< 1.0)
Description: SSH client configuration for Debian-Athena
This package configures the SSH client to automatically forward
Deleted: trunk/debathena/config/ssh-client-config/debian/debathena-ssh-client-config.install
Modified: trunk/debathena/config/ssh-client-config/debian/rules
===================================================================
--- trunk/debathena/config/ssh-client-config/debian/rules 2008-04-07 00:17:55 UTC (rev 22860)
+++ trunk/debathena/config/ssh-client-config/debian/rules 2008-04-07 00:19:20 UTC (rev 22861)
@@ -1,18 +1,9 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEBATHENA_DIVERT_FILES_debathena-ssh-client-config += \
+DEB_DIVERT_EXTENSION = .debathena
+
+DEB_REPLACE_FILES_debathena-ssh-client-config += \
/etc/ssh/ssh_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/debathena-check-conffiles.mk
-
-common-build-indep:: debian/ssh_config.debathena
-
-debian/ssh_config.debathena: $(call debathena_check_conffiles,/etc/ssh/ssh_config)
- perl -0pe ' \
- s/^\s*#?\s*GSSAPIAuthentication.*\n//mg; \
- s/$$/\n GSSAPIAuthentication yes/ or die;' $< > $@
-
-clean::
- rm -f debian/ssh_config.debathena
+include /usr/share/cdbs/1/rules/replace-files.mk
Added: trunk/debathena/config/ssh-client-config/debian/transform_ssh_config.debathena
Property changes on: trunk/debathena/config/ssh-client-config/debian/transform_ssh_config.debathena
___________________________________________________________________
Name: svn:executable
+ *
