[ooo-build-commit] .: 2 commits - bin/package-ooo patches/dev300

[Petr Mladek]

 bin/package-ooo                     |   11 +++++++++--
 patches/dev300/piece-scripting.diff |   26 ++++++++++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

New commits:
commit 722308aa8dd136fa5d54fcdd354c0e078ef24b6c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 25 14:32:40 2010 +0100

    Generate separate file list for KDE3 and KDD4 subpackages
    
    * bin/package-ooo: put only KDE3 stuff into kde_list.txt; put KDE4 stuff
      into kde4_list.txt

diff --git a/bin/package-ooo b/bin/package-ooo
index 7c4b082..1e8ea14 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -620,10 +620,17 @@ if test "z$VENDORNAME" != "zDebian" ; then
 	test -f $OODESTDIR/gid_Module_Optional_Kde && cp $OODESTDIR/gid_Module_Optional_Kde kde_list.txt || :
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/program/kdefilepicker
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde.uno.so
-	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde[0-9]*l..so
+	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kdel..so
 	mv_file_between_flists kde_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libkabdrv1.so
 	add_used_directories kde_list.txt common_list.txt
-	
+
+	# create kde4 subpackage 
+	rm -f kde4_list.txt
+	mv_file_between_flists kde4_list.txt kde_list.txt    $OOINSTBASE/basis$VERSION/program/kde4be1.uno.so
+	mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/libvclplug_kde4l..so
+	mv_file_between_flists kde4_list.txt common_list.txt $OOINSTBASE/basis$VERSION/program/fps_kde4.uno.so
+	add_used_directories kde4_list.txt common_list.txt
+
 	# gnome subpackage
 	rm -f gnome_list.txt
 	test -f $OODESTDIR/gid_Module_Optional_Gnome && cp $OODESTDIR/gid_Module_Optional_Gnome gnome_list.txt || :
commit d606368ee9d6ded263fd79badf1785339e2303cd
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 23 14:17:15 2010 +0100

    Fix piece-scripting.diff for the new vba-fix-scripting-parallelbuild.diff
    
    * patches/dev300/piece-scripting.diff: fix to apply; modify also
      scripting/source/dlgprov/makefile.mk

diff --git a/patches/dev300/piece-scripting.diff b/patches/dev300/piece-scripting.diff
index 85dafb2..32d4b4e 100644
--- a/patches/dev300/piece-scripting.diff
+++ b/patches/dev300/piece-scripting.diff
@@ -1,14 +1,24 @@
---- scripting/source/vbaevents/makefile.mk
-+++ scripting/source/vbaevents/makefile.mk
-@@ -23,8 +23,9 @@
-         $(MISC)$/$(TARGET).don \
-         $(SLOTARGET)
+--- scripting/source/dlgprov/makefile.mk.old	2010-03-23 14:25:13.000000000 +0100
++++ scripting/source/dlgprov/makefile.mk	2010-03-23 15:10:03.000000000 +0100
+@@ -77,6 +77,7 @@ ALLTAR : \
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
  
 -$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
--        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
 +OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
 +$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
-+        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
          echo $@
- # ------------------------------------------------------------------
+--- scripting/source/vbaevents/makefile.mk.old	2010-03-23 13:43:40.000000000 +0100
++++ scripting/source/vbaevents/makefile.mk	2010-03-23 14:06:33.000000000 +0100
+@@ -57,6 +57,7 @@ ALLTAR : \
+ 
+ $(SLOFILES) : $(MISC)$/$(TARGET).don
  
+-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
+-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
++OOVBADIR=$(SOLARPIECE)$/$(INPATH)$/bin
++$(MISC)$/$(TARGET).don : $(OOVBADIR)$/oovbaapi.rdb
++        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(OOVBADIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
+         echo $@