[ooo-build-commit] bin/piece bin/setup.in patches/dev300

[Petr Mladek]

 bin/piece/sys-setup.in               |    3 ---
 bin/setup.in                         |    3 ---
 patches/dev300/piece-packimages.diff |   10 ++++++----
 3 files changed, 6 insertions(+), 10 deletions(-)

New commits:
commit d144d41312c4fdcaed241276ba94477e9c64d377
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jun 29 13:19:01 2009 +0200

    Fix split build with Oxygen icon theme
    
    * patches/dev300/piece-packimages.diff: fix to apply
    
    * bin/piece/sys-setup.in, bin/setup.in: bin forgotten debug messages

diff --git a/bin/piece/sys-setup.in b/bin/piece/sys-setup.in
index 7b5d4a5..6ea823e 100755
--- a/bin/piece/sys-setup.in
+++ b/bin/piece/sys-setup.in
@@ -98,9 +98,6 @@ if test -n "$FORCE_OOO_LANGS" ; then
     WITH_LANG="$FORCE_OOO_LANGS"
 fi
 
-echo "Split OOo Environment:"
-set
-
 # some useful funtions
 
 # remove installed file even from the file list
diff --git a/bin/setup.in b/bin/setup.in
index d421e6d..ce2ad5d 100644
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -161,9 +161,6 @@ if test -n "$FORCE_OOO_LANGS" ; then
     OOO_LANGS="$FORCE_OOO_LANGS"
 fi
 
-echo "Normal OOo Environment:"
-set
-
 # setup paths
 PATH="$BUILDDIR/bin:$PATH:$TOOLSDIR/bin"
 
diff --git a/patches/dev300/piece-packimages.diff b/patches/dev300/piece-packimages.diff
index 0ed03d3..c53537a 100644
--- a/patches/dev300/piece-packimages.diff
+++ b/patches/dev300/piece-packimages.diff
@@ -1,6 +1,6 @@
 --- packimages/pack/makefile.mk
 +++ packimages/pack/makefile.mk
-@@ -38,16 +38,17 @@
+@@ -38,17 +38,18 @@
  RSCCUSTOMIMG*=$(PRJ)
  .INCLUDE: target.mk
  
@@ -8,7 +8,7 @@
  IMAGES := $(COMMONBIN)$/images.zip
  SORTED_LIST=$(RES)$/img$/sorted.lst
  # Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
- CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic
+ CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango classic oxygen
  CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
 -CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
 -CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
@@ -17,12 +17,14 @@
  
 -CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
 -CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
+-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images.tar.gz
 +CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz
 +CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
++OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images.tar.gz
  
  ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
  
-@@ -61,17 +62,17 @@
+@@ -62,17 +63,17 @@
  	@@-$(MKDIR) $(RES)$/img
  #+-$(RM) $@ $@.$(INPATH)
  .IF "$(use_shell)"!="4nt"
@@ -44,7 +46,7 @@
  
  # make sure to have one to keep packing happy
  $(COMMONBIN)$/images_brand.zip:
-@@ -79,7 +80,7 @@
+@@ -80,7 +81,7 @@
  
  # generate the HiContrast icon set
  $(MISC)$/hicontrast.flag .PHONY :