[25901] in Source-Commits
Re: /svn/athena r25285 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Jul 27 11:21:02 2011
Date: Wed, 27 Jul 2011 11:20:55 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201107271505.p6RF5LIP015560@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1107271120540.25266@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK
--
Geoffrey Thomas
geofft@mit.edu
On Wed, 27 Jul 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-07-27 11:05:21 -0400 (Wed, 27 Jul 2011)
> New Revision: 25285
>
> Modified:
> trunk/debathena/config/cluster-login-config/debian/changelog
> trunk/debathena/config/cluster-login-config/debian/control.in
> trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
> trunk/debathena/config/cluster-login-config/debian/rules
> Log:
> In cluster-login-config:
> * Punt all the code to enable backports and pin libstdc++5
> * Clean up /etc/apt/preferences from the aforementioned code
>
>
> Modified: trunk/debathena/config/cluster-login-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 14:40:35 UTC (rev 25284)
> +++ trunk/debathena/config/cluster-login-config/debian/changelog 2011-07-27 15:05:21 UTC (rev 25285)
> @@ -1,9 +1,9 @@
> 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
> + * Punt all the code to enable backports and pin libstdc++5
> + * Clean up /etc/apt/preferences from the aforementioned code
>
> - -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 10:17:34 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Wed, 27 Jul 2011 11:05:13 -0400
>
> debathena-cluster-login-config (1.35.2) unstable; urgency=low
>
>
> Modified: trunk/debathena/config/cluster-login-config/debian/control.in
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/control.in 2011-07-27 14:40:35 UTC (rev 25284)
> +++ trunk/debathena/config/cluster-login-config/debian/control.in 2011-07-27 15:05:21 UTC (rev 25285)
> @@ -2,7 +2,7 @@
> Section: debathena-config/net
> Priority: extra
> Maintainer: Debathena Project <debathena@mit.edu>
> -Build-Depends: @cdbs@, system-services, debathena-gdm-config, lsb-release
> +Build-Depends: @cdbs@, system-services, debathena-gdm-config
> Standards-Version: 3.8.4
>
> Package: debathena-cluster-login-config
>
> 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 14:40:35 UTC (rev 25284)
> +++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2011-07-27 15:05:21 UTC (rev 25285)
> @@ -90,18 +90,11 @@
> 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
> + # /etc/apt/preferences was frobbed due to (LP:508545)
> + if 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~' && \
> - [ -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
> update-grub
> fi
>
> Modified: trunk/debathena/config/cluster-login-config/debian/rules
> ===================================================================
> --- trunk/debathena/config/cluster-login-config/debian/rules 2011-07-27 14:40:35 UTC (rev 25284)
> +++ trunk/debathena/config/cluster-login-config/debian/rules 2011-07-27 15:05:21 UTC (rev 25285)
> @@ -33,12 +33,6 @@
> 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 \
>
>
