ooo-build r11461 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Wed Jan 30 11:45:21 2008
New Revision: 11461
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11461&view=rev

Log:
apply scp2-package-glib2.diff in the modified circumstances

Modified:
   trunk/ChangeLog
   trunk/patches/src680/scp2-package-glib2.diff

Modified: trunk/patches/src680/scp2-package-glib2.diff
==============================================================================
--- trunk/patches/src680/scp2-package-glib2.diff	(original)
+++ trunk/patches/src680/scp2-package-glib2.diff	Wed Jan 30 11:45:21 2008
@@ -4,9 +4,9 @@
  cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
  cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
  cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
 +cp    scp2\source\glib2           nmake    -    all    cp_glib2 cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_glib2 NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_glib2 NULL
 --- /dev/null	2007-05-04 12:54:36.000000000 +0200
 +++ scp2/source/glib2/file_glib2.scp	2007-11-07 11:21:40.000000000 +0100
 @@ -0,0 +1,70 @@