[gnome-color-manager] Rename the calibration UI file and fix up make distcheck



commit 9c6d2205c43783ddea2b56b3470cb48aa9b7b21b
Author: Richard Hughes <richard hughsie com>
Date:   Thu Oct 29 23:40:35 2009 +0000

    Rename the calibration UI file and fix up make distcheck

 contrib/gnome-color-manager.spec.in      |    4 +++-
 data/Makefile.am                         |    2 +-
 data/{gcm-import.ui => gcm-calibrate.ui} |    0
 po/POTFILES.in                           |    4 +++-
 src/gcm-calibrate.c                      |    2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/contrib/gnome-color-manager.spec.in b/contrib/gnome-color-manager.spec.in
index 47f354f..e644c15 100644
--- a/contrib/gnome-color-manager.spec.in
+++ b/contrib/gnome-color-manager.spec.in
@@ -19,6 +19,7 @@ Requires:  gtk2 >= %{gtk2_version}
 Requires:  gnome-icon-theme
 Requires:  unique >= %{unique_version}
 Requires:  shared-mime-info
+Requires:  vte
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -26,6 +27,7 @@ BuildRequires: gnome-doc-utils >= 0.3.2
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: libtool
+BuildRequires: vte-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: unique-devel >= %{unique_version}
 BuildRequires: intltool
@@ -97,7 +99,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_datadir}/gnome-color-manager
 %dir %{_datadir}/gnome-color-manager/profiles
 %{_datadir}/gnome-color-manager/profiles/*.ic?
-%{_datadir}/gnome-color-manager/gcm-prefs.ui
+%{_datadir}/gnome-color-manager/gcm-*.ui
 #%{_datadir}/man/man1/*.1.gz
 #%{_datadir}/gnome/help/gnome-color-manager
 #%{_datadir}/omf/gnome-color-manager
diff --git a/data/Makefile.am b/data/Makefile.am
index 2719f88..9d0eeb4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,7 +15,7 @@ desktop_in_files =					\
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 pkgdata_DATA =						\
-	gcm-import.ui					\
+	gcm-calibrate.ui				\
 	gcm-prefs.ui
 
 EXTRA_DIST =						\
diff --git a/data/gcm-import.ui b/data/gcm-calibrate.ui
similarity index 100%
rename from data/gcm-import.ui
rename to data/gcm-calibrate.ui
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6c6e1ab..6fd079d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,9 @@
+data/gcm-calibrate.ui
 data/gcm-import.desktop.in
-data/gcm-prefs.ui
 data/gcm-prefs.desktop.in
+data/gcm-prefs.ui
 data/gnome-color-manager.schemas.in
+src/gcm-calibrate.c
 src/gcm-import.c
 src/gcm-prefs.c
 src/gcm-utils.c
diff --git a/src/gcm-calibrate.c b/src/gcm-calibrate.c
index b3ccb2a..366f29e 100644
--- a/src/gcm-calibrate.c
+++ b/src/gcm-calibrate.c
@@ -635,7 +635,7 @@ gcm_calibrate_init (GcmCalibrate *calibrate)
 
 	/* get UI */
 	calibrate->priv->builder = gtk_builder_new ();
-	retval = gtk_builder_add_from_file (calibrate->priv->builder, GCM_DATA "/gcm-import.ui", &error);
+	retval = gtk_builder_add_from_file (calibrate->priv->builder, GCM_DATA "/gcm-calibrate.ui", &error);
 	if (retval == 0) {
 		egg_warning ("failed to load ui: %s", error->message);
 		g_error_free (error);



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