Re: xorg-server: Changes to 'debian-unstable'
Julien Cristau wrote:
> On Tue, Jul 10, 2007 at 18:57:50 +0000, Brice Goglin wrote:
>
>
>> commit 16d97b30b91da02d5a3edc2b895cbd4a1995f62d
>> Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
>> Date: Mon Jul 9 19:06:05 2007 +0200
>>
>> Fix displaying of patches applied by quilt.
>>
>> As requested in bug #428090, we silence the output of quilt next
>> and display the output of quilt push/pop.
>>
>> diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
>> index 63dde45..2930c1e 100755
>> --- a/debian/xsfbs/xsfbs.mk
>> +++ b/debian/xsfbs/xsfbs.mk
>> @@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
>> echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
>> exit 1; \
>> fi; \
>> - if quilt next; then \
>> + if quilt next >/dev/null 2>&1; then \
>> echo -n "Applying patches..."; \
>> - if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
>> + if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \
>> echo "successful."; \
>> else \
>> echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
>>
>
> Hi,
>
> this change is broken: the "if" now tests whether tee was successful, so
> nothing detects if patching worked. Please fix or revert.
>
Fixed and pulled in packages that already pulled the buggy code (xorg,
xorg-server, nv, savage, and xterm). sorry about that.
Brice
Reply to: