From 3e8b126b6cb77a2e993152d5bbd0def604e8ba06 Mon Sep 17 00:00:00 2001
From: "Daniel Rentz [dr]" <daniel.rentz@oracle.com>
Date: Tue, 28 Dec 2010 17:59:34 +0100
Subject: dr77: post rebase fixes

---
 postprocess/packcomponents/makefile.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'postprocess')

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 537a62be4ba5..3ca8a15296b4 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -109,6 +109,7 @@ my_components = \
     log \
     mcnttype \
     migrationoo2 \
+    msfilter \
     msforms \
     mysql \
     odbc \
-- 
cgit 


From f37e09084c60834aca7413bcf0245e8be4bb07d3 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Thu, 6 Jan 2011 12:34:08 +0100
Subject: ause129: #i116325# don't process .<basename>.xcu, created on mac

---
 postprocess/packregistry/makefile.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'postprocess')

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index a6881783776a..4109bfdaae97 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -522,7 +522,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip -name \*.xcu -size +0c -print) \
+        find $(@:b).unzip -name [^.]\*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -541,7 +541,7 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+        find $(@:b).unzip fcfg_drivers_$*.unzip -name [^.]\*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
-- 
cgit