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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan 23 15:42:40 2008
New Revision: 11376
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11376&view=rev

Log:
2008-01-23  Rene Engelhard  <rene debian org>

        * patches/src680/svx-sdr-contact-visibility: remove CVS info
        * patches/src680/apply: apply svx-sdr-contact-visibility.diff only
          for < ooh680-m4
        * patches/src680/apply, patches/src680/stl-abi.diff: remove, obsolete


Removed:
   trunk/patches/src680/stl-abi.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/svx-sdr-contact-visibility.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Jan 23 15:42:40 2008
@@ -448,9 +448,11 @@
 # allow dmake create_patch produce diffable patches
 solenv-dmake-create_patch.diff, i#68917, fridrich
 
+[ Fixes < ooh680-m4 ]
 # fix visibility for controls
 svx-sdr-contact-visibility.diff, i#83611. noelpwer
 
+[ Fixes ]
 # look for libmawt.so on x86_64 too
 sun-java-amd64-jreextralibdir.diff
 
@@ -1453,10 +1455,6 @@
 system-stlport5_cppu.diff, i#78909
 
 
-[ GCCSTL ]
-#FIXME#stl-abi.diff
-
-
 [ CalcSolver ]
 SectionOwner => kyoshida
 SectionIssue => i#8808

Modified: trunk/patches/src680/svx-sdr-contact-visibility.diff
==============================================================================
--- trunk/patches/src680/svx-sdr-contact-visibility.diff	(original)
+++ trunk/patches/src680/svx-sdr-contact-visibility.diff	Wed Jan 23 15:42:40 2008
@@ -1,17 +1,5 @@
 --- svx/source/sdr/contact/viewcontactofunocontrol.cxx	2007-06-27 18:47:02+0000	1.8
 +++ svx/source/sdr/contact/viewcontactofunocontrol.cxx	2007-11-19 12:04:19+0000	1.8.204.4
-@@ -4,9 +4,9 @@
-  *
-  *  $RCSfile: viewcontactofunocontrol.cxx,v $
-  *
-- *  $Revision: 1.8 $
-+ *  $Revision: 1.8.204.4 $
-  *
-- *  last change: $Author: hr $ $Date: 2007/06/27 18:47:02 $
-+ *  last change: $Author: fs $ $Date: 2007/11/19 12:04:19 $
-  *
-  *  The Contents of this file are made available subject to
-  *  the terms of GNU Lesser General Public License Version 2.1.
 @@ -36,43 +36,22 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_svx.hxx"