[Libreoffice-commits] .: 2 commits - packimages/pack

[Lubos Lunak]

 packimages/pack/makefile.mk |   24 ------------------------
 1 file changed, 24 deletions(-)

New commits:
commit 80a7125d0c0aa9343711c3c79f895432c8378a0c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Dec 3 18:16:55 2010 +0100

    crystal icon set no longer comes as a tarball

diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index 69b813a..d8d75df 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -43,8 +43,6 @@ 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
 
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-
 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
 
 $(IMAGES) $(CUSTOM_IMAGES) : $(SORTED_LIST)
@@ -68,14 +66,3 @@ images_% : $(RES)$/img$/commandimagelist.ilst
 # make sure to have one to keep packing happy
 $(COMMONBIN)$/images_brand.zip:
     @$(TOUCH) $@
-
-# unpack the Crystal icon set
-$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
-    cd $(MISC) && gzip -d -c $(CRYSTAL_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
-    chmod -R g+w $(MISC)$/crystal
-.ENDIF
-    @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
-# dependencies
-images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
commit 1455bbc171f158965a4ab30a32ec5d13382bb889
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri Dec 3 18:07:53 2010 +0100

    oxygen icon set no longer comes as a tarball

diff --git a/packimages/pack/makefile.mk b/packimages/pack/makefile.mk
index addce4f..69b813a 100644
--- a/packimages/pack/makefile.mk
+++ b/packimages/pack/makefile.mk
@@ -44,7 +44,6 @@ CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
 CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
 
 CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
 
 ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
 
@@ -78,15 +77,5 @@ $(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
 .ENDIF
     @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
 
-# unpack the Oxygen icon set
-$(MISC)$/oxygen.flag : $(OXYGEN_TARBALL)
-    cd $(MISC) && gzip -d -c $(OXYGEN_TARBALL) | ( tar -xf - ) && $(TOUCH) $(@:f)
-.IF "$(GUI)"=="UNX"
-    chmod -R g+w $(MISC)$/oxygen
-.ENDIF
-    @$(TYPE) $@ || echo "ERROR: unpacking $(CRYSTAL_TARBALL) failed"
-
 # dependencies
 images_crystal : $(MISC)$/crystal.flag $(RES)$/img$/commandimagelist.ilst
-
-images_oxygen : $(MISC)$/oxygen.flag $(RES)$/img$/commandimagelist.ilst