[25577] in Source-Commits
/svn/athena r25095 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 20 15:45:37 2011
Date: Wed, 20 Apr 2011 15:45:30 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201104201945.p3KJjUdS029250@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-04-20 15:45:30 -0400 (Wed, 20 Apr 2011)
New Revision: 25095
Added:
trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref
Removed:
trunk/debathena/config/cluster-login-config/debian/debathena-libstdc++.pref
Modified:
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
Rename the .pref file per apt_preferences(5), and work around LP bug in which preferences.d is ignored by aptitude
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-04-20 01:31:06 UTC (rev 25094)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-04-20 19:45:30 UTC (rev 25095)
@@ -3,4 +3,4 @@
debian/getty.debathena sbin
debian/screensaver_logout.sh usr/share/debathena-cluster-login-config
debian/debathena-backports.list etc/apt/sources.list.d
-debian/debathena-libstdc++.pref etc/apt/preferences.d
+debian/debathena-libstdcplusplus.pref etc/apt/preferences.d
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-04-20 01:31:06 UTC (rev 25094)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-04-20 19:45:30 UTC (rev 25095)
@@ -89,6 +89,14 @@
rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
fi
+ # Sigh (LP:508545)
+ aptitude_vers="$(dpkg-query -W -f '${Version}' aptitude)"
+ if dpkg --compare-versions "$aptitude_vers" lt '0.6.3-3.2ubuntu1~'; then
+ if ! grep -qxF "Package: libstdc++5" /etc/apt/preferences; then
+ cat /etc/apt/preferences.d/debathena-libstdcplusplus.pref >> /etc/apt/preferences
+ fi
+ fi
+
# Shut down sshd and reload gdm.
if hash invoke-rc.d; then
invoke-rc.d ssh stop
Copied: trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref (from rev 25094, trunk/debathena/config/cluster-login-config/debian/debathena-libstdc++.pref)
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref (rev 0)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref 2011-04-20 19:45:30 UTC (rev 25095)
@@ -0,0 +1,7 @@
+Package: *
+Pin: release a=lucid-backports
+Pin-Priority: -1
+
+Package: libstdc++5
+Pin: release a=lucid-backports
+Pin-Priority: 500
