[25892] in Source-Commits
/svn/athena r25283 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jul 27 10:17:58 2011
Date: Wed, 27 Jul 2011 10:17:52 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201107271417.p6REHq2k004102@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 10:17:51 -0400 (Wed, 27 Jul 2011)
New Revision: 25283
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref
trunk/debathena/config/cluster-login-config/debian/rules
Log:
In cluster-login-config:
* Reduce pin priority of libstdc++5 to 200
* Don't enable lucid-backports or pinning on not-lucid
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 13:42:17 UTC (rev 25282)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 14:17:51 UTC (rev 25283)
@@ -1,3 +1,10 @@
+debathena-cluster-login-config (1.36) unstable; urgency=low
+
+ * Reduce pin priority of libstdc++5 to 200
+ * Don't enable lucid-backports or pinning on not-lucid
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 10:17:34 -0400
+
debathena-cluster-login-config (1.35.2) unstable; urgency=low
* Use the right variable in the postinst
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-07-27 13:42:17 UTC (rev 25282)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.install 2011-07-27 14:17:51 UTC (rev 25283)
@@ -2,8 +2,6 @@
debian/sshd_not_to_be_run etc/ssh
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-libstdcplusplus.pref etc/apt/preferences.d
debian/disable-suspend.pkla etc/polkit-1/localauthority/30-site.d
debian/disable-hibernate.pkla etc/polkit-1/localauthority/30-site.d
debian/50_debathena-cluster etc/grub.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-07-27 13:42:17 UTC (rev 25282)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 14:17:51 UTC (rev 25283)
@@ -89,12 +89,17 @@
rm_conffile debathena-cluster-login-config "/etc/init/ttymsg.conf"
fi
+ # Cleanup from previous installs
+ # Shouldn't have happened, but be paranoid
+ if [ "$(lsb_release -sc)" != "lucid" ] && grep -qxF "Package: libstdc++5" /etc/apt/preferences; then
+ rm /etc/apt/preferences
+ 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
+ if dpkg --compare-versions "$aptitude_vers" lt '0.6.3-3.2ubuntu1~' && \
+ [ -f /etc/apt/preferences.d/debathena-libstdcplusplus.pref ]; then
+ cp -f /etc/apt/preferences.d/debathena-libstdcplusplus.pref /etc/apt/preferences
fi
if dpkg --compare-versions "$2" lt 1.35.2~; then
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref 2011-07-27 13:42:17 UTC (rev 25282)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-libstdcplusplus.pref 2011-07-27 14:17:51 UTC (rev 25283)
@@ -4,4 +4,4 @@
Package: libstdc++5
Pin: release a=lucid-backports
-Pin-Priority: 500
+Pin-Priority: 200
Modified: trunk/debathena/config/cluster-login-config/debian/rules
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/rules 2011-07-27 13:42:17 UTC (rev 25282)
+++ trunk/debathena/config/cluster-login-config/debian/rules 2011-07-27 14:17:51 UTC (rev 25283)
@@ -33,6 +33,12 @@
DEB_DIVERT_FILES_debathena-cluster-login-config += \
/sbin/getty.debathena
+ifeq ($(shell lsb_relase -sc),lucid)
+ install/debathena-cluster-login-config::
+ dh_install debian/debathena-backports.list etc/apt/sources.list.d
+ dh_install debian/debathena-libstdcplusplus.pref etc/apt/preferences.d
+endif
+
ifeq ($(EVENT_D),y)
DEB_UNREMOVE_FILES_debathena-cluster-login-config += \
/etc/event.d/tty1 \
