[gnome-color-manager: 1/3] Do not install the demo ICC files, and instead depend on the shared-color-profiles package



commit 4e9649e555b1ca1ae1a30b72f86c580708da6c60
Author: Richard Hughes <richard hughsie com>
Date:   Wed Dec 9 15:58:49 2009 +0000

    Do not install the demo ICC files, and instead depend on the shared-color-profiles package

 configure.ac                        |    1 -
 contrib/gnome-color-manager.spec.in |    3 +--
 data/Makefile.am                    |    3 +--
 data/profiles/AdobeGammaTest.icm    |  Bin 2756 -> 0 bytes
 data/profiles/Makefile.am           |    8 --------
 data/profiles/bluish.icc            |  Bin 3966 -> 0 bytes
 data/tests/AdobeGammaTest.icm       |  Bin 30 -> 2756 bytes
 data/tests/bluish.icc               |  Bin 22 -> 3966 bytes
 src/gcm-utils.c                     |    3 ---
 9 files changed, 2 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6c904b8..8ce99b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,6 @@ src/Makefile
 help/Makefile
 man/Makefile
 data/Makefile
-data/profiles/Makefile
 data/tests/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index 94a4d52..b5ef593 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -23,6 +23,7 @@ Requires:  dbus-glib >= %{dbus_glib_version}
 Requires:  dbus-x11
 Requires:  vte
 Requires:  argyllcms
+Requires:  shared-color-profiles
 Requires(post):   scrollkeeper
 Requires(pre):    GConf2
 Requires(post):   GConf2
@@ -109,8 +110,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/gcm-*
 %dir %{_datadir}/gnome-color-manager
-%dir %{_datadir}/gnome-color-manager/profiles
-%{_datadir}/gnome-color-manager/profiles/*.ic?
 %{_datadir}/gnome-color-manager/gcm-*.ui
 %{_datadir}/man/man1/*.1.gz
 %{_datadir}/gnome/help/gnome-color-manager
diff --git a/data/Makefile.am b/data/Makefile.am
index 754f97a..a4b6e6e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = 						\
 	tests						\
-	icons						\
-	profiles
+	icons
 
 @INTLTOOL_SCHEMAS_RULE@
 schemadir = $(sysconfdir)/gconf/schemas
diff --git a/data/tests/AdobeGammaTest.icm b/data/tests/AdobeGammaTest.icm
deleted file mode 120000
index 910f2ae..e5f1246
--- a/data/tests/AdobeGammaTest.icm
+++ /dev/null
@@ -1 +0,0 @@
-../profiles/AdobeGammaTest.icm
\ No newline at end of file
diff --git a/data/tests/AdobeGammaTest.icm b/data/tests/AdobeGammaTest.icm
new file mode 100644
index 910f2ae..e5f1246
Binary files /dev/null and b/data/tests/AdobeGammaTest.icm differ
diff --git a/data/tests/bluish.icc b/data/tests/bluish.icc
deleted file mode 120000
index 22ee77b..2aa16c4
--- a/data/tests/bluish.icc
+++ /dev/null
@@ -1 +0,0 @@
-../profiles/bluish.icc
\ No newline at end of file
diff --git a/data/tests/bluish.icc b/data/tests/bluish.icc
new file mode 100644
index 22ee77b..2aa16c4
Binary files /dev/null and b/data/tests/bluish.icc differ
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index 1c89cdb..995b9eb 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -433,9 +433,6 @@ gcm_utils_get_profile_filenames (void)
 	gcm_utils_get_profile_filenames_for_directory (array, "/usr/share/color/icc");
 	gcm_utils_get_profile_filenames_for_directory (array, "/usr/local/share/color/icc");
 
-	/* get gnome-color-manager test profiles */
-	gcm_utils_get_profile_filenames_for_directory (array, GCM_DATA "/profiles");
-
 	/* get per-user profiles */
 	user = g_build_filename (g_get_home_dir (), "/.color/icc", NULL);
 	gcm_utils_get_profile_filenames_for_directory (array, user);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]