[Libreoffice-commits] .: Branch 'libreoffice-3-4' - bin/unpack

[Tor Lillqvist]

 bin/unpack |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 6540a25fd3fed233532e95b0ee509dfd35af8951
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu May 5 13:38:19 2011 +0300

    No need to overwrite "upstream" icons any more, bnc#685515

diff --git a/bin/unpack b/bin/unpack
index deb7c63..30073cd 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -213,7 +213,6 @@ fi
 	NovellWin32*|GoOoWin32*)
 	    check_file $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
 	    check_file $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
-	    check_file $SRCDIR/ooo-windows-icons-0.2.tar.bz2
 	    ;;
     esac
 
@@ -527,19 +526,6 @@ if test "z$BUILD_WIN32" != "z"; then
             fi
             ;;
     esac
-
-    # Icons.
-    # Just plunk them on top of the upstream ones for now. I'm
-    # too lazy to add configury to make it optional and to check for
-    # existence of the tarball, etc.
-    case "$DISTRO" in
-	# Add other Win32 "distros" here if they too want to use
-	# these icons
-        NovellWin32*|GoOoWin32*)
-	    bzip2 -dc $SRCDIR/ooo-windows-icons-0.2.tar.bz2 | $GNUTAR xf -
-	    mv ico/ooo3_*.ico $OOBUILDDIR/sysui/desktop/icons
-	    ;;
-    esac
 else
 
     if test -f $SRCDIR/$BUILD_MOZILLA_SOURCE; then