[Libreoffice-commits] .: 2 commits - sysui/desktop

[David Tardon]

 sysui/desktop/share/create_tree.sh |    4 ++--
 sysui/desktop/share/makefile.mk    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 14fcbd54c96d9f46365f76f8df6b51d2e8074d74
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 8 13:16:32 2011 +0100

    install high-resolution icons

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 160b2db..fded41e 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -3,7 +3,7 @@ umask 022
 if [ "${KDEMAINDIR}" ]
 then
   echo Copying icons .. 
-  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/??x?? locolor} -name "*.png"`
+  for i in `cd ${ICON_SOURCE_DIR}; find ${ICON_THEMES:-hicolor/???x??? hicolor/??x?? locolor} -name "*.png"`
   do
     targetdir=${DESTDIR}/${KDEMAINDIR}/share/icons/`dirname $i`
     mkdir -p $targetdir
@@ -22,7 +22,7 @@ fi
 if [ "${GNOMEDIR}" ]
 then
   echo Copying GNOME icons ..
-  for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? -name "*.png"`
+  for i in `cd ${ICON_SOURCE_DIR}/hicolor; find ??x?? ???x??? -name "*.png"`
   do
     targetdir=${DESTDIR}/${GNOMEDIR}/share/icons/gnome/`dirname $i`
     mkdir -p $targetdir
commit eb1281d505e85448868c9fbd83ccdd209fcff813
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Mar 8 13:11:00 2011 +0100

    fix shebang

diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 898d7b0..45a1b11 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -220,7 +220,7 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/mimelnklist : ../mimetypes/{$(MIMELIST)}.deskto
 $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : makefile.mk
 $(COMMONMISC)$/{$(PRODUCTLIST)}$/create_tree.sh : $$(@:f)
     @@-$(MKDIRHIER) $(@:d)
-    @echo "#\!/bin/bash" > $@.$(INPATH)
+    @echo "#!/bin/bash" > $@.$(INPATH)
     @echo "PREFIX=$(UNIXFILENAME.$(@:d:d:f))" >> $@.$(INPATH)
     @echo "ICON_PREFIX=$(ICONPREFIX.$(@:d:d:f))" >> $@.$(INPATH)
     @echo "ICON_SOURCE_DIR=../../../desktop/icons" >> $@.$(INPATH)