[26270] in Source-Commits
Re: /svn/athena r25480 - trunk/debathena/meta/syslog/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon May 7 17:04:11 2012
Date: Mon, 7 May 2012 14:04:08 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205072029.q47KT9es025568@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1205071404050.21568@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ack
--
Geoffrey Thomas
geofft@mit.edu
On Mon, 7 May 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-05-07 16:29:09 -0400 (Mon, 07 May 2012)
> New Revision: 25480
>
> Modified:
> trunk/debathena/meta/syslog/debian/changelog
> trunk/debathena/meta/syslog/debian/rules
> Log:
> In syslog:
> * Deal with multi-arch by checking if aptitude supports the ~r expression
> * Only accept the first line that's returned from aptitude
>
>
> Modified: trunk/debathena/meta/syslog/debian/changelog
> ===================================================================
> --- trunk/debathena/meta/syslog/debian/changelog 2012-05-07 19:53:40 UTC (rev 25479)
> +++ trunk/debathena/meta/syslog/debian/changelog 2012-05-07 20:29:09 UTC (rev 25480)
> @@ -1,10 +1,10 @@
> debathena-syslog (1.1) unstable; urgency=low
>
> - * Deal with multi-arch by only accepting the first line aptitude
> - returns, and stripping out any arch component that may be there
> + * Deal with multi-arch by checking if aptitude supports the ~r expression
> + * Only accept the first line that's returned from aptitude
> * Comment out unused DEFAULT_SYSLOG variable in rules
>
> - -- Jonathan Reed <jdreed@mit.edu> Mon, 07 May 2012 15:46:35 -0400
> + -- Jonathan Reed <jdreed@mit.edu> Mon, 07 May 2012 16:28:33 -0400
>
> debathena-syslog (1.0) unstable; urgency=low
>
>
> Modified: trunk/debathena/meta/syslog/debian/rules
> ===================================================================
> --- trunk/debathena/meta/syslog/debian/rules 2012-05-07 19:53:40 UTC (rev 25479)
> +++ trunk/debathena/meta/syslog/debian/rules 2012-05-07 20:29:09 UTC (rev 25480)
> @@ -4,12 +4,17 @@
>
> APTITUDE_LOCKFILE = $(CURDIR)/debian/aptitude-lockfile
> APTITUDE = aptitude -o 'Aptitude::LockFile=$(APTITUDE_LOCKFILE)' -o 'Debug::NoLocking=yes'
> +MULTIARCH = $(shell $(APTITUDE) search '~Psystem-log-daemon~rnative' > /dev/null 2>&1 && echo "y")
>
> common-build-indep:: debian/deps
>
> debian/deps:
> echo -n "debathena-syslog-depends=" > $@
> - $(APTITUDE) search '~Psystem-log-daemon~pimportant' -F '%p' | cut -d ':' -f 1 | head -1 >> $@
> +ifeq ($(MULTIARCH),y)
> + $(APTITUDE) search '~Psystem-log-daemon~pimportant~rnative' -F '%p' | head -1 >> $@
> +else
> + $(APTITUDE) search '~Psystem-log-daemon~pimportant' -F '%p' | head -1 >> $@
> +endif
> echo >> $@
>
> # DEFAULT_SYSLOG = $(shell $(APTITUDE) search -F"%p" ~Psystem-log-daemon~pimportant)
>
>
