[25906] in Source-Commits
/svn/athena r25290 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 27 12:21:19 2011
Date: Wed, 27 Jul 2011 12:21:13 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107271621.p6RGLDPq011524@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-07-27 12:21:13 -0400 (Wed, 27 Jul 2011)
New Revision: 25290
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
In cluster-login-config:
* Punt the conffiles we removed in 1.36
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 16:14:05 UTC (rev 25289)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 16:21:13 UTC (rev 25290)
@@ -1,3 +1,9 @@
+debathena-cluster-login-config (1.36.1) unstable; urgency=low
+
+ * Punt the conffiles we removed in 1.36
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 12:21:07 -0400
+
debathena-cluster-login-config (1.36) unstable; urgency=low
* Punt all the code to enable backports and pin libstdc++5
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 16:14:05 UTC (rev 25289)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 16:21:13 UTC (rev 25290)
@@ -89,10 +89,15 @@
rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
fi
- # Cleanup from previous installs
- # /etc/apt/preferences was frobbed due to (LP:508545)
- if grep -qxF "Package: libstdc++5" /etc/apt/preferences; then
- rm /etc/apt/preferences
+ if dpkg --compare-versions "$2" ge '1.36~'; then
+ # Cleanup from previous installs
+ # /etc/apt/preferences was frobbed due to (LP:508545)
+ if grep -qxF "Package: libstdc++5" /etc/apt/preferences 2>/dev/null; then
+ rm /etc/apt/preferences
+ fi
+ # Cleanup conffiles
+ rm -f /etc/apt/sources.list.d/debathena-backports.list
+ rm -f /etc/apt/preferences.d/debathena-libstdcplusplus.pref
fi
if dpkg --compare-versions "$2" lt 1.35.2~; then
