[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                               |    1 
 patches/dev300/filter-fix-build-FCFGMerge.cfg.diff |  139 ---------------------
 2 files changed, 140 deletions(-)

New commits:
commit aa0077a6b94564aed4249941e3d0e6487e23ce22
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 28 16:46:12 2011 +0200

    pushed filter-fix-build-FCFGMerge.cfg.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f43c439..2a704d1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1256,7 +1256,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 [ Fixes ]
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
 
-filter-fix-build-FCFGMerge.cfg.diff, rodo
 store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # fixes crasher in xml parser
diff --git a/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff b/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff
deleted file mode 100644
index c43357e..0000000
--- a/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff
+++ /dev/null
@@ -1,139 +0,0 @@
----
- filter/source/config/tools/merge/FCFGMerge.cfg |  125 ++++++++++++++++++++++++
- 1 files changed, 125 insertions(+), 0 deletions(-)
- create mode 100644 filter/source/config/tools/merge/FCFGMerge.cfg
-
-diff --git filter/source/config/tools/merge/FCFGMerge.cfg filter/source/config/tools/merge/FCFGMerge.cfg
-new file mode 100644
-index 0000000..7e71e9c
---- /dev/null
-+++ filter/source/config/tools/merge/FCFGMerge.cfg
-@@ -0,0 +1,125 @@
-+#*************************************************************************
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2008 by Sun Microsystems, Inc.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# $RCSfile: FCFGMerge.cfg,v $
-+#
-+# $Revision: 1.5 $
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org.  If not, see
-+# <http://www.openoffice.org/license.html>
-+# for a copy of the LGPLv3 License.
-+#
-+#*************************************************************************
-+
-+#************************************************
-+# Specify the verbose mode of this tool.
-+# 1 = show errors only
-+# 2 = show errors/warnings (default)
-+# 3 = show errors/warnings and some generic infos
-+# 4 = show anything (including detailed infos)
-+#
-+# [OPTIONAL]
-+#************************************************
-+
-+loglevel = 2
-+
-+#************************************************
-+# This extension is used for all XML files. It doesnt
-+# matter if its used for reading fragments or writing
-+# XML packages.
-+# Must be given without any additional signes like "."
-+# or "*."!
-+#
-+# [REQUIRED]
-+#************************************************
-+
-+extension_xcu=xcu
-+
-+#************************************************
-+# This extension is used for all Package files. It doesnt
-+# matter if its used for reading such files or writing
-+# it.
-+# Must be given without any additional signes like "."
-+# or "*."!
-+#
-+# [REQUIRED]
-+#************************************************
-+
-+extension_pkg=pkg
-+
-+#************************************************
-+# These values are used to generate a correct XML
-+# header.
-+# Note: The property "xmlpackage" must be specified
-+#       via command line. There exists more then one
-+#      	possible value.
-+#
-+# [REQUIRED]
-+#************************************************
-+
-+xmlversion	=	1.0
-+xmlencoding	=	UTF-8
-+xmlpath		=	org.openoffice.TypeDetection
-+#xmlpackage	=
-+
-+#************************************************
-+# These values are used to name the configuration
-+# sets inside the generated XCM file for different
-+# item groups like e.g. types, filters etcpp.
-+#
-+# [REQUIRED]
-+#************************************************
-+
-+setname_types 			    = Types
-+setname_filters 			  = Filters
-+setname_frameloaders 	  = FrameLoaders
-+setname_contenthandlers = ContentHandlers
-+
-+subdir_types 			    	= types
-+subdir_filters 			  	= filters
-+subdir_frameloaders 	  = frameloaders
-+subdir_contenthandlers 	= contenthandlers
-+
-+#************************************************
-+# This delimiter is used to split every
-+# item list of the package configuration files
-+# (which are temp. created  by the make proccess)
-+# into its tokens.
-+#
-+# [REQUIRED]
-+#************************************************
-+delimiter=,
-+
-+#************************************************
-+# Enable/disable removing of leading/trailing withespaces
-+# during splitting stringlists.
-+#
-+# [REQUIRED]
-+#************************************************
-+trim=true
-+
-+#************************************************
-+# Enable/disable removing of leading/trailing "-signs
-+# during splitting stringlists.
-+#
-+# [REQUIRED]
-+#************************************************
-+decode=false
--- 
-1.7.0.1
-