[26668] in Source-Commits
Re: /svn/athena r25684 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Aug 1 17:54:29 2012
Date: Wed, 1 Aug 2012 17:54:26 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201208012015.q71KFS6l019357@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1208011753310.22690@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
I guess so...looks okay.
-Ben
On Wed, 1 Aug 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-08-01 16:15:28 -0400 (Wed, 01 Aug 2012)
> New Revision: 25684
>
> Modified:
> trunk/debathena/meta/login-graphical/debian/changelog
> trunk/debathena/meta/login-graphical/debian/control.in
> trunk/debathena/meta/login-graphical/debian/rules
> Log:
> In login-graphical:
> * Recommend thunderbird-config for everything (and stop building on
> Hardy). We need thunderbird-config to stop thunderbird from shoving
> entire inboxes in AFS. Users who want local thunderbird caches need
> to install manual-thunderbird-config. (Trac: #1107)
>
>
> Modified: trunk/debathena/meta/login-graphical/debian/changelog
> ===================================================================
> --- trunk/debathena/meta/login-graphical/debian/changelog 2012-08-01 16:55:30 UTC (rev 25683)
> +++ trunk/debathena/meta/login-graphical/debian/changelog 2012-08-01 20:15:28 UTC (rev 25684)
> @@ -1,3 +1,12 @@
> +debathena-login-graphical (1.3) unstable; urgency=low
> +
> + * Recommend thunderbird-config for everything (and stop building on
> + Hardy). We need thunderbird-config to stop thunderbird from shoving
> + entire inboxes in AFS. Users who want local thunderbird caches need
> + to install manual-thunderbird-config. (Trac: #1107)
> +
> + -- Jonathan Reed <jdreed@mit.edu> Wed, 01 Aug 2012 16:15:16 -0400
> +
> debathena-login-graphical (1.2) unstable; urgency=low
>
> * Maybe depend on lightdm-config.
>
> Modified: trunk/debathena/meta/login-graphical/debian/control.in
> ===================================================================
> --- trunk/debathena/meta/login-graphical/debian/control.in 2012-08-01 16:55:30 UTC (rev 25683)
> +++ trunk/debathena/meta/login-graphical/debian/control.in 2012-08-01 20:15:28 UTC (rev 25684)
> @@ -6,6 +6,7 @@
> Standards-Version: 3.9.1
>
> Package: debathena-login-graphical
> +X-Debathena-No-Build: hardy
> Architecture: all
> Depends: debathena-login,
> debathena-gdm-config,
> @@ -23,7 +24,7 @@
> ${debathena-maybe-lightdm-config},
> ${misc:Depends}
> Recommends: ubuntu-desktop,
> - ${debathena-thunderbird-config-recommends},
> + debathena-thunderbird-config,
> Description: Athena graphical login configuration
> This package allows Athena users to login through the Athena greeter
> and configures graphical software to integrate with the Athena
>
> Modified: trunk/debathena/meta/login-graphical/debian/rules
> ===================================================================
> --- trunk/debathena/meta/login-graphical/debian/rules 2012-08-01 16:55:30 UTC (rev 25683)
> +++ trunk/debathena/meta/login-graphical/debian/rules 2012-08-01 20:15:28 UTC (rev 25684)
> @@ -1,20 +1,8 @@
> #!/usr/bin/make -f
>
> -TBIRD_VERSION = $(shell apt-cache policy thunderbird 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
> -TBIRD_3_1 = $(shell dpkg --compare-versions '$(TBIRD_VERSION)' ge '3.1~' && echo y)
> -ICED_VERSION = $(shell apt-cache policy icedove 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
> -ICED_3_1 = $(shell dpkg --compare-versions '$(ICED_VERSION)' ge '3.1~' && ech\
> -o y)
> LIGHTDM_VERSION = $(shell apt-cache policy lightdm 2>/dev/null | awk '/^ Candidate/ { print $$2 }' | fgrep -vx '(none)')
> HAVE_LIGHTDM_106 = $(shell dpkg --compare-versions '$(LIGHTDM_VERSION)' ge '1.0.6~' && echo y)
>
> -ifneq ($(TBIRD_3_1),y)
> -ifneq ($(ICED_3_1),y)
> -binary-predeb/debathena-login-graphical::
> - echo "debathena-thunderbird-config-recommends=debathena-thunderbird-config" >> debian/debathena-login-graphical.substvars
> -endif
> -endif
> -
> ifeq ($(HAVE_LIGHTDM_106),y)
> binary-predeb/debathena-login-graphical::
> echo "debathena-maybe-lightdm-config=debathena-lightdm-config" >> debian/debathena-login-graphical.substvars
>
>
