From c8f9aee581422db703bb348424619ade69c162e8 Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Tue, 24 Jul 2007 19:54:51 +0000 Subject: [PATCH] Add a data sub-directory for non-code items 2007-07-24 Thomas Wood * data: Add a data sub-directory for non-code items svn path=/trunk/; revision=7875 --- capplets/appearance/ChangeLog | 4 ++ capplets/appearance/Makefile.am | 42 ++---------------- .../appearance/{ => data}/appearance.glade | 0 .../gnome-appearance-properties.desktop.in.in | 0 .../gnome-theme-installer.desktop.in.in | 0 .../{ => data}/gnome-theme-package.xml.in | 0 .../{ => data}/gtk-theme-thumbnailing.png | Bin .../{ => data}/icon-theme-thumbnailing.png | Bin .../appearance/{ => data}/subpixel-bgr.png | Bin .../appearance/{ => data}/subpixel-rgb.png | Bin .../appearance/{ => data}/subpixel-vbgr.png | Bin .../appearance/{ => data}/subpixel-vrgb.png | Bin .../{ => data}/theme-thumbnailing.png | Bin .../{ => data}/window-theme-thumbnailing.png | Bin 14 files changed, 7 insertions(+), 39 deletions(-) rename capplets/appearance/{ => data}/appearance.glade (100%) rename capplets/appearance/{ => data}/gnome-appearance-properties.desktop.in.in (100%) rename capplets/appearance/{ => data}/gnome-theme-installer.desktop.in.in (100%) rename capplets/appearance/{ => data}/gnome-theme-package.xml.in (100%) rename capplets/appearance/{ => data}/gtk-theme-thumbnailing.png (100%) rename capplets/appearance/{ => data}/icon-theme-thumbnailing.png (100%) rename capplets/appearance/{ => data}/subpixel-bgr.png (100%) rename capplets/appearance/{ => data}/subpixel-rgb.png (100%) rename capplets/appearance/{ => data}/subpixel-vbgr.png (100%) rename capplets/appearance/{ => data}/subpixel-vrgb.png (100%) rename capplets/appearance/{ => data}/theme-thumbnailing.png (100%) rename capplets/appearance/{ => data}/window-theme-thumbnailing.png (100%) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index fd5eb3fdc..1cb9f0b82 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,7 @@ +2007-07-24 Thomas Wood + + * data: Add a data sub-directory for non-code items + 2007-07-24 Jens Granseuer * appearance-style.c: (update_color_buttons_from_settings), diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am index bd06f3d60..65f2cecb8 100644 --- a/capplets/appearance/Makefile.am +++ b/capplets/appearance/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = data + # This is used in GNOMECC_CAPPLETS_CFLAGS cappletname = appearance @@ -42,36 +44,9 @@ gnome_appearance_properties_LDADD = \ gnome_appearance_properties_LDFLAGS = -export-dynamic gladedir = $(pkgdatadir)/glade -dist_glade_DATA = appearance.glade - pixmapdir = $(pkgdatadir)/pixmaps -dist_pixmap_DATA = \ - subpixel-bgr.png \ - subpixel-rgb.png \ - subpixel-vbgr.png \ - subpixel-vrgb.png \ - theme-thumbnailing.png \ - gtk-theme-thumbnailing.png \ - window-theme-thumbnailing.png \ - icon-theme-thumbnailing.png - wallpaperdir = $(datadir)/gnome-background-properties -@INTLTOOL_DESKTOP_RULE@ - -desktopdir = $(datadir)/applications -desktop_in_files = \ - gnome-appearance-properties.desktop.in \ - gnome-theme-installer.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -@INTLTOOL_XML_RULE@ - -xml_in_files = gnome-theme-package.xml.in - -mimedir = $(datadir)/mime/packages -mime_DATA = $(xml_in_files:.xml.in=.xml) - INCLUDES = \ $(METACITY_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \ @@ -82,15 +57,4 @@ INCLUDES = \ -DGNOMECC_PIXMAP_DIR="\"$(pixmapdir)\"" \ -DWALLPAPER_DATADIR="\"$(wallpaperdir)\"" -CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA) $(mime_DATA) -EXTRA_DIST = $(xml_in_files) - -install-data-hook: -if ENABLE_UPDATE_MIMEDB - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif - -uninstall-hook: -if ENABLE_UPDATE_MIMEDB - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif +CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) diff --git a/capplets/appearance/appearance.glade b/capplets/appearance/data/appearance.glade similarity index 100% rename from capplets/appearance/appearance.glade rename to capplets/appearance/data/appearance.glade diff --git a/capplets/appearance/gnome-appearance-properties.desktop.in.in b/capplets/appearance/data/gnome-appearance-properties.desktop.in.in similarity index 100% rename from capplets/appearance/gnome-appearance-properties.desktop.in.in rename to capplets/appearance/data/gnome-appearance-properties.desktop.in.in diff --git a/capplets/appearance/gnome-theme-installer.desktop.in.in b/capplets/appearance/data/gnome-theme-installer.desktop.in.in similarity index 100% rename from capplets/appearance/gnome-theme-installer.desktop.in.in rename to capplets/appearance/data/gnome-theme-installer.desktop.in.in diff --git a/capplets/appearance/gnome-theme-package.xml.in b/capplets/appearance/data/gnome-theme-package.xml.in similarity index 100% rename from capplets/appearance/gnome-theme-package.xml.in rename to capplets/appearance/data/gnome-theme-package.xml.in diff --git a/capplets/appearance/gtk-theme-thumbnailing.png b/capplets/appearance/data/gtk-theme-thumbnailing.png similarity index 100% rename from capplets/appearance/gtk-theme-thumbnailing.png rename to capplets/appearance/data/gtk-theme-thumbnailing.png diff --git a/capplets/appearance/icon-theme-thumbnailing.png b/capplets/appearance/data/icon-theme-thumbnailing.png similarity index 100% rename from capplets/appearance/icon-theme-thumbnailing.png rename to capplets/appearance/data/icon-theme-thumbnailing.png diff --git a/capplets/appearance/subpixel-bgr.png b/capplets/appearance/data/subpixel-bgr.png similarity index 100% rename from capplets/appearance/subpixel-bgr.png rename to capplets/appearance/data/subpixel-bgr.png diff --git a/capplets/appearance/subpixel-rgb.png b/capplets/appearance/data/subpixel-rgb.png similarity index 100% rename from capplets/appearance/subpixel-rgb.png rename to capplets/appearance/data/subpixel-rgb.png diff --git a/capplets/appearance/subpixel-vbgr.png b/capplets/appearance/data/subpixel-vbgr.png similarity index 100% rename from capplets/appearance/subpixel-vbgr.png rename to capplets/appearance/data/subpixel-vbgr.png diff --git a/capplets/appearance/subpixel-vrgb.png b/capplets/appearance/data/subpixel-vrgb.png similarity index 100% rename from capplets/appearance/subpixel-vrgb.png rename to capplets/appearance/data/subpixel-vrgb.png diff --git a/capplets/appearance/theme-thumbnailing.png b/capplets/appearance/data/theme-thumbnailing.png similarity index 100% rename from capplets/appearance/theme-thumbnailing.png rename to capplets/appearance/data/theme-thumbnailing.png diff --git a/capplets/appearance/window-theme-thumbnailing.png b/capplets/appearance/data/window-theme-thumbnailing.png similarity index 100% rename from capplets/appearance/window-theme-thumbnailing.png rename to capplets/appearance/data/window-theme-thumbnailing.png