[26538] in Source-Commits
Re: /svn/athena r25610 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Wed Jul 4 20:13:00 2012
Date: Wed, 4 Jul 2012 20:12:56 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201207031756.q63HuAOC022863@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1207042002520.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Tue, 3 Jul 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-07-03 13:56:10 -0400 (Tue, 03 Jul 2012)
> New Revision: 25610
>
> Modified:
> trunk/debathena/meta/extra-software/debian/changelog
> trunk/debathena/meta/extra-software/debian/ooffice
> trunk/debathena/meta/extra-software/debian/rules
> Log:
> In extra-software:
> * include debhelper.mk before adding to the targets, not after.
> * Don't tell people to run "soffice", that's just stupid.
>
>
> Modified: trunk/debathena/meta/extra-software/debian/changelog
> ===================================================================
> --- trunk/debathena/meta/extra-software/debian/changelog 2012-07-03 15:44:50 UTC (rev 25609)
> +++ trunk/debathena/meta/extra-software/debian/changelog 2012-07-03 17:56:10 UTC (rev 25610)
> @@ -1,3 +1,10 @@
> +debathena-extra-software (1.4) unstable; urgency=low
> +
> + * include debhelper.mk before adding to the targets, not after.
> + * Don't tell people to run "soffice", that's just stupid.
> +
> + -- Jonathan Reed <jdreed@mit.edu> Tue, 03 Jul 2012 13:56:58 -0400
> +
> debathena-extra-software (1.3) unstable; urgency=low
>
> * Demote wmfire to a Recommendation because it doesn't exist in oneiric
>
> Modified: trunk/debathena/meta/extra-software/debian/ooffice
> ===================================================================
> --- trunk/debathena/meta/extra-software/debian/ooffice 2012-07-03 15:44:50 UTC (rev 25609)
> +++ trunk/debathena/meta/extra-software/debian/ooffice 2012-07-03 17:56:10 UTC (rev 25610)
> @@ -2,7 +2,7 @@
>
> msg="OpenOffice.org has been renamed to LibreOffice. You can launch it from
> the Applications menu, in the Office category. Or you can launch it by
> -typing 'soffice' in the Terminal window."
> +typing 'libreoffice' in the Terminal window."
>
> if [ -n "$DISPLAY" ]; then
> zenity --info --title="OpenOffice.org Renamed" --no-wrap --text="$msg"
> @@ -10,7 +10,7 @@
> cat <<EOF
> OpenOffice.org has been renamed to LibreOffice. You can launch it from
> the Applications menu, in the Office category. Or you can launch it by
> -typing 'soffice' in the Terminal window.
> +typing 'libreoffice' in the Terminal window.
Sure.
> EOF
> fi
> exit 0
>
> Modified: trunk/debathena/meta/extra-software/debian/rules
> ===================================================================
> --- trunk/debathena/meta/extra-software/debian/rules 2012-07-03 15:44:50 UTC (rev 25609)
> +++ trunk/debathena/meta/extra-software/debian/rules 2012-07-03 17:56:10 UTC (rev 25610)
> @@ -3,6 +3,8 @@
> HAVE_ICEDTEA = $(shell apt-cache show icedtea6-plugin 2>/dev/null | grep -q '^Version:' && echo y)
> HAVE_LIBREOFFICE = $(shell apt-cache show libreoffice 2>/dev/null | grep -q '^Version:' && echo y)
>
> +include /usr/share/cdbs/1/rules/debhelper.mk
> +
> ifeq ($(HAVE_ICEDTEA),y)
> binary-predeb/debathena-extra-software::
> echo "debathena-java-plugin=icedtea6-plugin" >> debian/debathena-extra-software.substvars
> @@ -18,4 +20,3 @@
> echo "debathena-cool-kids-office-suite=openoffice.org" >> debian/debathena-extra-software.substvars
> endif
>
> -include /usr/share/cdbs/1/rules/debhelper.mk
We need to run after the debhelper rule in order to check HAVE_ICEDTEA?
Perhaps we want to audit some other packages...
find . -type f -name rules | xargs grep -l binary-predeb|xargs grep -A2
debhelper.mk
and looking for entries with only a single line of output (i.e.,
debhelper.mk is included as the last line of rules) finds:
gdm-config
thirdparty-graphics
login-graphical
clients
thirdparty-{utilities,libraries,programming,text}
workstation
extra-software-nox
I'll ACK this commit for now.
-Ben
