[24032] in Source-Commits
/svn/athena r23641 - trunk/debathena/config/pam-config/debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Fri Mar 20 17:21:04 2009
X-Barracuda-Envelope-From: andersk@mit.edu
Date: Fri, 20 Mar 2009 17:20:55 -0400
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <200903202120.n2KLKtif031935@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2009-03-20 17:20:55 -0400 (Fri, 20 Mar 2009)
New Revision: 23641
Modified:
trunk/debathena/config/pam-config/debian/changelog
trunk/debathena/config/pam-config/debian/rules
Log:
In pam-config:
* Avoid a harmless OMINOUS WARNING on upgrades.
Modified: trunk/debathena/config/pam-config/debian/changelog
===================================================================
--- trunk/debathena/config/pam-config/debian/changelog 2009-03-18 23:26:02 UTC (rev 23640)
+++ trunk/debathena/config/pam-config/debian/changelog 2009-03-20 21:20:55 UTC (rev 23641)
@@ -1,3 +1,9 @@
+debathena-pam-config (1.14) unstable; urgency=low
+
+ * Avoid a harmless OMINOUS WARNING on upgrades.
+
+ -- Anders Kaseorg <andersk@mit.edu> Fri, 20 Mar 2009 17:16:23 -0400
+
debathena-pam-config (1.13) unstable; urgency=low
* Fix a missing "var=" in the pam_mktemp configuration for
Modified: trunk/debathena/config/pam-config/debian/rules
===================================================================
--- trunk/debathena/config/pam-config/debian/rules 2009-03-18 23:26:02 UTC (rev 23640)
+++ trunk/debathena/config/pam-config/debian/rules 2009-03-20 21:20:55 UTC (rev 23641)
@@ -66,7 +66,7 @@
ifneq ($(wildcard /etc/pam.d/sshd),)
debian-divert/debathena-pam-config::
- (echo "if [ \"\$$1\" = configure ] && [ -n \"\$$2\" ]; then"; \
+ (echo "if [ \"\$$1\" = configure ] && dpkg-divert --list /etc/pam.d/ssh | grep -xFq 'diversion of /etc/pam.d/ssh to /etc/pam.d/ssh.debathena-orig by $(cdbs_curpkg)'; then"; \
echo " undivert_unlink /etc/pam.d/ssh"; \
echo "fi") >> $(CURDIR)/debian/$(cdbs_curpkg).postinst.debhelper
endif
