ooo-build r13829 - in branches/ooo-build-3-0: . bin

[tml svn gnome org]

Author: tml
Date: Mon Sep  8 09:26:34 2008
New Revision: 13829
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13829&view=rev

Log:
2008-09-08  Tor Lillqvist  <tml novell com>

	* bin/unpack:
	* download.in: Download and unpack an updated ooo-windows-icons
	tarball with icon files renamed to match upstream.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/download.in

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Mon Sep  8 09:26:34 2008
@@ -466,9 +466,8 @@
 	# Add other Win32 "distros" here if they too want to use
 	# these icons
         NovellWin32*|GoOoWin32*)
-	    bzip2 -dc $SRCDIR/ooo-windows-icons-0.1.tar.bz2 | $GNUTAR xpf -
-	    rm ico/ooo-web-app.ico
-	    mv ico/ooo-*.ico $OOBUILDDIR/sysui/desktop/icons
+	    bzip2 -dc $SRCDIR/ooo-windows-icons-0.2.tar.bz2 | $GNUTAR xpf -
+	    mv ico/ooo3_*.ico $OOBUILDDIR/sysui/desktop/icons
 	    ;;
     esac
 else

Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in	(original)
+++ branches/ooo-build-3-0/download.in	Mon Sep  8 09:26:34 2008
@@ -80,7 +80,7 @@
 # SDK bits
     'unowinreg\.dll'                     => 'http://tools.openoffice.org/unowinreg_prebuild/680/',
 # Windows .ico icons
-    'ooo-windows-icons-.*'               => '@MIRROR@/SRC680',
+    'ooo-windows-icons-0.2.tar.bz2'     => '@MIRROR@/OOO300',
 # Updated libwpd
     'libwpd-*'                           => '@MIRROR@/libwpd',
 # MS Works importer bits
@@ -229,7 +229,7 @@
     #push @files, ( 'wintools.zip' );
 
     # Icons
-    push @files, ( 'ooo-windows-icons-0.1.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
+    push @files, ( 'ooo-windows-icons-0.2.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
 
 # We must use the prebuilt Mozilla bits as the compiler to use (MSVS2008) does not compile
 # Mozilla 1.7.5 as used here without love that hasn't been applied yet