ooo-build r12020 - in trunk: . bin desktop desktop/mimetypes desktop/mimetypes/16x16 desktop/mimetypes/22x22 desktop/mimetypes/24x24 desktop/mimetypes/32x32 desktop/mimetypes/48x48

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 27 13:31:53 2008
New Revision: 12020
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12020&view=rev

Log:
2008-03-27  Petr Mladek  <pmladek suse cz>

	* M      ooo-build/bin/package-ooo
	* desktop/mimetypes/16x16/application-vnd.openofficeorg.extension.png:
	* desktop/mimetypes/24x24/application-vnd.openofficeorg.extension.png:
	* desktop/mimetypes/22x22/application-vnd.openofficeorg.extension.png:
	* desktop/mimetypes/32x32/application-vnd.openofficeorg.extension.png:
	* desktop/mimetypes/48x48/application-vnd.openofficeorg.extension.png:
	  GNOME MIME icons for application/vnd.openofficeorg.extension;
	  thanks to Jakub Stainer
	* bin/package-ooo(NovellOnly): install the above GNOME MIME icons;
	  they should go to a GNOME package in the future; This is why they
	  are installed only for the Novell vendor now; feel free to use
	  them for other distros as well



Added:
   trunk/desktop/mimetypes/   (props changed)
   trunk/desktop/mimetypes/16x16/   (props changed)
   trunk/desktop/mimetypes/16x16/Makefile.am
   trunk/desktop/mimetypes/16x16/application-vnd.openofficeorg.extension.png   (contents, props changed)
   trunk/desktop/mimetypes/22x22/   (props changed)
   trunk/desktop/mimetypes/22x22/Makefile.am
   trunk/desktop/mimetypes/22x22/application-vnd.openofficeorg.extension.png   (contents, props changed)
   trunk/desktop/mimetypes/24x24/   (props changed)
   trunk/desktop/mimetypes/24x24/Makefile.am
   trunk/desktop/mimetypes/24x24/application-vnd.openofficeorg.extension.png   (contents, props changed)
   trunk/desktop/mimetypes/32x32/   (props changed)
   trunk/desktop/mimetypes/32x32/Makefile.am
   trunk/desktop/mimetypes/32x32/application-vnd.openofficeorg.extension.png   (contents, props changed)
   trunk/desktop/mimetypes/48x48/   (props changed)
   trunk/desktop/mimetypes/48x48/Makefile.am
   trunk/desktop/mimetypes/48x48/application-vnd.openofficeorg.extension.png   (contents, props changed)
   trunk/desktop/mimetypes/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/configure.in
   trunk/desktop/Makefile.am

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Mar 27 13:31:53 2008
@@ -202,6 +202,17 @@
 	   which update-mime-database >/dev/null 2>&1 ; then
 	    update-mime-database /usr/share/mime || :
 	fi
+
+	# extra MIME type icons
+	if test "z$VENDORNAME" = "zNovell" ; then
+	    icondir=/usr/share/icons/hicolor
+	    for size in 16x16 22x22 24x24 32x32 48x48 ; do
+		mkdir -p $OODESTDIR/$icondir/$size/mimetypes
+		# note that the scalable directory includes .svg icons
+		cp $TOOLSDIR/desktop/mimetypes/$size/*.[ps][nv]g \
+		   $OODESTDIR/$icondir/$size/mimetypes/
+	    done
+	fi
 	
 	if test "z$VENDORNAME" = "zNovell" ; then
 		# add GNOME MIME info and the application registry the old way

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Mar 27 13:31:53 2008
@@ -1122,6 +1122,12 @@
 desktop/32x32/Makefile
 desktop/48x48/Makefile
 desktop/scalable/Makefile
+desktop/mimetypes/Makefile
+desktop/mimetypes/16x16/Makefile
+desktop/mimetypes/22x22/Makefile
+desktop/mimetypes/24x24/Makefile
+desktop/mimetypes/32x32/Makefile
+desktop/mimetypes/48x48/Makefile
 distro-configs/Makefile
 distro-configs/Ark.conf
 distro-configs/Common.conf

Modified: trunk/desktop/Makefile.am
==============================================================================
--- trunk/desktop/Makefile.am	(original)
+++ trunk/desktop/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -1,4 +1,4 @@
-SUBDIRS=16x16 22x22 24x24 32x32 48x48 scalable
+SUBDIRS=16x16 22x22 24x24 32x32 48x48 scalable mimetypes
 
 desktop_in_files = ${wildcard *.desktop.in.in}
 

Added: trunk/desktop/mimetypes/16x16/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/16x16/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)

Added: trunk/desktop/mimetypes/16x16/application-vnd.openofficeorg.extension.png
==============================================================================
Binary file. No diff available.

Added: trunk/desktop/mimetypes/22x22/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/22x22/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)

Added: trunk/desktop/mimetypes/22x22/application-vnd.openofficeorg.extension.png
==============================================================================
Binary file. No diff available.

Added: trunk/desktop/mimetypes/24x24/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/24x24/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)

Added: trunk/desktop/mimetypes/24x24/application-vnd.openofficeorg.extension.png
==============================================================================
Binary file. No diff available.

Added: trunk/desktop/mimetypes/32x32/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/32x32/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)

Added: trunk/desktop/mimetypes/32x32/application-vnd.openofficeorg.extension.png
==============================================================================
Binary file. No diff available.

Added: trunk/desktop/mimetypes/48x48/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/48x48/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.png)

Added: trunk/desktop/mimetypes/48x48/application-vnd.openofficeorg.extension.png
==============================================================================
Binary file. No diff available.

Added: trunk/desktop/mimetypes/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/desktop/mimetypes/Makefile.am	Thu Mar 27 13:31:53 2008
@@ -0,0 +1,2 @@
+SUBDIRS=16x16 22x22 24x24 32x32 48x48
+