Hi,
And please, please, please, please do not diff patches. Can you at the very
least provide the patch you're intending to submit and, optionally, a diff of
the changes.
It's almost impossible to see what's changing when you diff patches because you
get a lot of noise as a result.
Glynn
Laszlo (Laca) Peter wrote:
> Hi Ghee,
>
> When you're back from vacation...
>
> On Fri, 2006-11-17 at 14:49 +0000, Ghee Teo wrote:
>
>> Thanks to Laca for well spotted the automake file output. Saved soem 630
>> lines of patch :)
>
> There's still some extra stuff left, see below.
>
>> +# date:2006-09-17 bugster:6494571 owner:gheet type:bug
>
> Are you planning to upstream this patch?
>
>> +* Thu Nob 16 2006 - ghee.teo"sun.com
>
> s/"/@/
>
>> ++# Checks to see if we should compile with PAPI backend for GTK+
>> ++#
>> ++AC_MSG_CHECKING(libpapi)
>
>> ++# Check for a mediaLib 2.2 function since that is what the GTK+ mediaLib
>> ++# patch requires.
>
> This comment is wrong.
>
>> ++AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
>> ++if test $have_papi = yes; then
>> ++ AC_DEFINE(HAVE_PAPI)
>> ++fi
>> ++
>> ++AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
>> ++
>
>> +diff -urN gtk+-2.10.6/modules/printbackends/Makefile.am
>> ../SUNWgnome-base-libs-2.16.1.hacked/gtk+-2.10.6/modules/printbackends/Makefile.am
>> +--- gtk+-2.10.6/modules/printbackends/Makefile.am 2006-06-21
>> 18:16:56.000000000 +0000
>> ++++
>> ../SUNWgnome-base-libs-2.16.1.hacked/gtk+-2.10.6/modules/printbackends/Makefile.am
>> 2006-10-17 17:36:45.656005000 +0000
>> +@@ -1,7 +1,12 @@
>> +-SUBDIRS = file lpr
>> ++SUBDIRS = file lpr
>
> An extra space after lpr caused this line to be added
>
>> +diff -urN gtk+-2.10.6/modules/printbackends/Makefile.in
>> ../SUNWgnome-base-libs-2.16.1.hacked/gtk+-2.10.6/modules/printbackends/Makefile.in
>> +--- gtk+-2.10.6/modules/printbackends/Makefile.in 2006-10-03
>> 17:05:54.000000000 +0000
>> ++++
>> ../SUNWgnome-base-libs-2.16.1.hacked/gtk+-2.10.6/modules/printbackends/Makefile.in
>> 2006-10-17 17:36:45.656814000 +0000
>> +@@ -37,6 +37,7 @@
>> + POST_UNINSTALL = :
>> + host_triplet = @host@
>> + @HAVE_CUPS_TRUE at am__append_1 = cups
>> ++ at have_papi_t...@am__append_1 = papi
>> + ACLOCAL = @ACLOCAL@
>> + AMDEP_FALSE = @AMDEP_FALSE@
>> + AMDEP_TRUE = @AMDEP_TRUE@
>
> Another Makefile.in.
>
> These belong to a different (apparently unfinished) change:
>
>> Index: Solaris/ChangeLog
>> ===================================================================
>> --- Solaris/ChangeLog (revision 9760)
>> +++ Solaris/ChangeLog (working copy)
>> @@ -1,3 +1,9 @@
>> +2006-11-17 Ghee Seng Teo - SunSoft CDE <set EMAIL_ADDRESS environment
>> variable>
>> +
>> + reviewed by: <delete if not using a buddy>
>> +
>> + * SUNWgnome-display-mgr.spec:
>> +
>> 2006-11-17 Darren Kenny <darren.kenny at sun.com>
>>
>> * SUNWgnome-system-tools.spec, manpages/Makefile,
>> manpages/sman1/network-admin.1,
>> Index: Solaris/SUNWgnome-display-mgr.spec
>> ===================================================================
>> --- Solaris/SUNWgnome-display-mgr.spec (revision 9760)
>> +++ Solaris/SUNWgnome-display-mgr.spec (working copy)
>> @@ -164,6 +164,8 @@
>> %{_mandir}/man1/*
>> %{_mandir}/man1m/*
>>
>> +%rclass preserve -f r.preserve
>> +
>> %files root
>> %defattr (-, root, sys)
>> %attr (0755, root, sys) %dir %{_sysconfdir}
>
> Laca
>
