- updated to 0.2.2

- removed obsolete patches

diff --git a/0002-Fix-autogen-failure-with-new-gettexts.patch b/0002-Fix-autogen-failure-with-new-gettexts.patch
deleted file mode 100644 (file)
index 6bdba0e..0000000
--- a/0002-Fix-autogen-failure-with-new-gettexts.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2ea73cad2ddc2f55f2c76d786168f39da1648e21 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:44:29 +0000
-Subject: [PATCH 02/11] Fix autogen failure with new gettexts
-
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2f8ca5f..f06d7cd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,12 +54,10 @@ AC_SUBST(LT_AGE)
- dnl ---------------------------------------------------------------------------
- dnl - gettext stuff
- dnl ---------------------------------------------------------------------------
--AM_GNU_GETTEXT_VERSION([0.17])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo])
-+AM_GLIB_GNU_GETTEXT
- 
- dnl ---------------------------------------------------------------------------
- dnl - Use strict options (default enabled for devs, disabled in releases)
--- 
-1.8.4.5
-

diff --git a/0003-Do-not-use-deprecated-widgets-in-the-spectro-tool.patch b/0003-Do-not-use-deprecated-widgets-in-the-spectro-tool.patch
deleted file mode 100644 (file)
index 4f9fffc..0000000
--- a/0003-Do-not-use-deprecated-widgets-in-the-spectro-tool.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 1ae89ebf02a97afa31f88f1c2dc00a538b0c7974 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:46:02 +0000
-Subject: [PATCH 03/11] Do not use deprecated widgets in the spectro tool
-
----
- configure.ac          |  2 +-
- src/ch-spectro-util.c | 20 ++++++++++----------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f06d7cd..dd48161 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -118,7 +118,7 @@ dnl - Check library dependencies
- dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.10 gobject-2.0 gmodule-2.0 gio-2.0 >= 2.25.9)
- PKG_CHECK_MODULES(GUSB, gusb >= 0.1.2)
--PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.91.0)
-+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.12.0)
- PKG_CHECK_MODULES(COLORD, colord >= 0.1.31)
- PKG_CHECK_MODULES(COLORD_GTK, colord-gtk >= 0.1.24)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4)
-diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c
-index 7f5c989..8dab826 100644
---- a/src/ch-spectro-util.c
-+++ b/src/ch-spectro-util.c
-@@ -297,8 +297,8 @@ ch_util_add_graphs (ChCcmxPrivate *priv)
-                     NULL);
-       gtk_box_pack_start (box, priv->graph_raw, TRUE, TRUE, 0);
-       gtk_widget_set_margin_top (priv->graph_raw, 6);
--      gtk_widget_set_margin_left (priv->graph_raw, 12);
--      gtk_widget_set_margin_right (priv->graph_raw, 12);
-+      gtk_widget_set_margin_start (priv->graph_raw, 12);
-+      gtk_widget_set_margin_end (priv->graph_raw, 12);
-       gtk_widget_set_size_request (priv->graph_raw, 800, 450);
-       gtk_widget_show (priv->graph_raw);
- 
-@@ -316,8 +316,8 @@ ch_util_add_graphs (ChCcmxPrivate *priv)
-                     NULL);
-       gtk_box_pack_start (box, priv->graph_dark_cal, TRUE, TRUE, 0);
-       gtk_widget_set_margin_top (priv->graph_raw, 6);
--      gtk_widget_set_margin_left (priv->graph_dark_cal, 12);
--      gtk_widget_set_margin_right (priv->graph_dark_cal, 12);
-+      gtk_widget_set_margin_start (priv->graph_dark_cal, 12);
-+      gtk_widget_set_margin_end (priv->graph_dark_cal, 12);
-       gtk_widget_set_size_request (priv->graph_dark_cal, 800, 450);
-       gtk_widget_show (priv->graph_dark_cal);
- 
-@@ -335,8 +335,8 @@ ch_util_add_graphs (ChCcmxPrivate *priv)
-                     NULL);
-       gtk_box_pack_start (box, priv->graph_cmf, TRUE, TRUE, 0);
-       gtk_widget_set_margin_top (priv->graph_raw, 6);
--      gtk_widget_set_margin_left (priv->graph_cmf, 12);
--      gtk_widget_set_margin_right (priv->graph_cmf, 12);
-+      gtk_widget_set_margin_start (priv->graph_cmf, 12);
-+      gtk_widget_set_margin_end (priv->graph_cmf, 12);
-       gtk_widget_set_size_request (priv->graph_cmf, 800, 450);
-       gtk_widget_show (priv->graph_cmf);
- 
-@@ -354,8 +354,8 @@ ch_util_add_graphs (ChCcmxPrivate *priv)
-                     NULL);
-       gtk_box_pack_start (box, priv->graph_temp_comp, TRUE, TRUE, 0);
-       gtk_widget_set_margin_top (priv->graph_raw, 6);
--      gtk_widget_set_margin_left (priv->graph_temp_comp, 12);
--      gtk_widget_set_margin_right (priv->graph_temp_comp, 12);
-+      gtk_widget_set_margin_start (priv->graph_temp_comp, 12);
-+      gtk_widget_set_margin_end (priv->graph_temp_comp, 12);
-       gtk_widget_set_size_request (priv->graph_temp_comp, 800, 450);
-       gtk_widget_show (priv->graph_temp_comp);
- 
-@@ -373,8 +373,8 @@ ch_util_add_graphs (ChCcmxPrivate *priv)
-                     NULL);
-       gtk_box_pack_start (box, priv->graph_result, TRUE, TRUE, 0);
-       gtk_widget_set_margin_top (priv->graph_raw, 6);
--      gtk_widget_set_margin_left (priv->graph_result, 12);
--      gtk_widget_set_margin_right (priv->graph_result, 12);
-+      gtk_widget_set_margin_start (priv->graph_result, 12);
-+      gtk_widget_set_margin_end (priv->graph_result, 12);
-       gtk_widget_set_size_request (priv->graph_result, 800, 450);
-       gtk_widget_show (priv->graph_result);
- }
--- 
-1.8.4.5
-

diff --git a/0004-Load-the-colorhug-spectro-utils-data-file-from-a-GRe.patch b/0004-Load-the-colorhug-spectro-utils-data-file-from-a-GRe.patch
deleted file mode 100644 (file)
index 466f095..0000000
--- a/0004-Load-the-colorhug-spectro-utils-data-file-from-a-GRe.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3a944c520c0d55d7dcb7a5dfba917eb916005801 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:46:51 +0000
-Subject: [PATCH 04/11] Load the colorhug-spectro-utils data file from a
- GResource
-
----
- src/Makefile.am                    | 14 ++++++++++++--
- src/ch-spectro-util.c              |  6 +++---
- src/colorhug-spectro.gresource.xml |  6 ++++++
- 3 files changed, 21 insertions(+), 5 deletions(-)
- create mode 100644 src/colorhug-spectro.gresource.xml
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e04a4fd..db780d7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,6 +22,8 @@ colorhug_spectro_util_SOURCES =                              \
-       ch-graph-widget.h                               \
-       ch-point-obj.c                                  \
-       ch-point-obj.h                                  \
-+      ch-spectro-resources.c                          \
-+      ch-spectro-resources.h                          \
-       ch-spectro-util.c
- 
- colorhug_spectro_util_LDADD =                         \
-@@ -140,15 +142,23 @@ ch-ccmx-resources.c: colorhug-ccmx.gresource.xml ../data/ch-ccmx.ui
- ch-ccmx-resources.h: colorhug-ccmx.gresource.xml
-       glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name ch $(srcdir)/colorhug-ccmx.gresource.xml
- 
-+ch-spectro-resources.c: colorhug-spectro.gresource.xml ../data/ch-spectro-util.ui
-+      glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --c-name ch $(srcdir)/colorhug-spectro.gresource.xml
-+ch-spectro-resources.h: colorhug-spectro.gresource.xml
-+      glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --c-name ch $(srcdir)/colorhug-spectro.gresource.xml
-+
- BUILT_SOURCES =                                               \
-       ch-ccmx-resources.c                             \
-       ch-ccmx-resources.h                             \
-       ch-flash-resources.c                            \
--      ch-flash-resources.h
-+      ch-flash-resources.h                            \
-+      ch-spectro-resources.c                          \
-+      ch-spectro-resources.h
- 
- EXTRA_DIST =                                          \
-       colorhug-ccmx.gresource.xml                     \
--      colorhug-flash.gresource.xml
-+      colorhug-flash.gresource.xml                    \
-+      colorhug-spectro.gresource.xml
- 
- MAINTAINERCLEANFILES =                                        \
-       $(srcdir)/libchshared.a
-diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c
-index 8dab826..5a559d6 100644
---- a/src/ch-spectro-util.c
-+++ b/src/ch-spectro-util.c
-@@ -393,9 +393,9 @@ ch_util_startup_cb (GApplication *application, ChCcmxPrivate *priv)
- 
-       /* get UI */
-       priv->builder = gtk_builder_new ();
--      retval = gtk_builder_add_from_file (priv->builder,
--                                          CH_DATA "/ch-spectro-util.ui",
--                                          &error);
-+      retval = gtk_builder_add_from_resource (priv->builder,
-+                                              "/com/hughski/colorhug/ch-spectro-util.ui",
-+                                              &error);
-       if (retval == 0) {
-               g_warning ("failed to load ui: %s",
-                          error->message);
-diff --git a/src/colorhug-spectro.gresource.xml b/src/colorhug-spectro.gresource.xml
-new file mode 100644
-index 0000000..7059857
---- /dev/null
-+++ b/src/colorhug-spectro.gresource.xml
-@@ -0,0 +1,6 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<gresources>
-+ <gresource prefix="/com/hughski/colorhug">
-+ <file compressed="true">ch-spectro-util.ui</file>
-+ </gresource>
-+</gresources>
--- 
-1.8.4.5
-

diff --git a/0005-trivial-Fix-thinko-when-ColorHug-1-and-2-are-connect.patch b/0005-trivial-Fix-thinko-when-ColorHug-1-and-2-are-connect.patch
deleted file mode 100644 (file)
index 8b5388e..0000000
--- a/0005-trivial-Fix-thinko-when-ColorHug-1-and-2-are-connect.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3f7f81657efc6fe88183ff6b720842852c3d7569 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:47:17 +0000
-Subject: [PATCH 05/11] trivial: Fix thinko when ColorHug 1 and 2 are connected
- at the same time
-
----
- src/ch-spectro-util.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/ch-spectro-util.c b/src/ch-spectro-util.c
-index 5a559d6..212dd7b 100644
---- a/src/ch-spectro-util.c
-+++ b/src/ch-spectro-util.c
-@@ -493,8 +493,7 @@ ch_util_device_removed_cb (GUsbDeviceList *list,
-       g_debug ("Removed: %i:%i",
-                g_usb_device_get_vid (device),
-                g_usb_device_get_pid (device));
--      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE ||
--          ch_device_get_mode (device) == CH_DEVICE_MODE_LEGACY) {
-+      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) {
-               if (priv->device != NULL)
-                       g_object_unref (priv->device);
-               priv->device = NULL;
--- 
-1.8.4.5
-

diff --git a/0006-trivial-remove-some-cruft-in-the-configure-file.patch b/0006-trivial-remove-some-cruft-in-the-configure-file.patch
deleted file mode 100644 (file)
index 92d6e1d..0000000
--- a/0006-trivial-remove-some-cruft-in-the-configure-file.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d66ef60901f346a132526c2fdfd73b9905d9a666 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:47:51 +0000
-Subject: [PATCH 06/11] trivial: remove some cruft in the configure file
-
----
- configure.ac | 34 ++--------------------------------
- 1 file changed, 2 insertions(+), 32 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,13 +1,7 @@
--# Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+# Copyright (C) 2011-2014 Richard Hughes <richard@hughsie.com>
- AC_PREREQ(2.63)
- 
--m4_define([ch_major_version], [0])
--m4_define([ch_minor_version], [2])
--m4_define([ch_micro_version], [1])
--m4_define([ch_version],
--          [ch_major_version.ch_minor_version.ch_micro_version])
--
--AC_INIT([colorhug-client],[ch_version],[http://www.hughsie.com])
-++AC_INIT([colorhug-client],[0.2.1],[http://www.hughsie.com])
- AC_CONFIG_SRCDIR(src)
- AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
- AC_CONFIG_HEADERS([config.h])
-@@ -27,30 +21,6 @@
- GOBJECT_INTROSPECTION_CHECK([0.9.8])
- YELP_HELP_INIT
- 
--# use this in ch-version.h
--CH_MAJOR_VERSION=ch_major_version
--CH_MINOR_VERSION=ch_minor_version
--CH_MICRO_VERSION=ch_micro_version
--AC_SUBST(CH_MAJOR_VERSION)
--AC_SUBST(CH_MINOR_VERSION)
--AC_SUBST(CH_MICRO_VERSION)
--
--# libtool versioning - this applies to libcolorhug
--#
--# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
--#
--# increment;
--# CURRENT     If the API or ABI interface has changed (reset REVISION to 0)
--# REVISION    If the API and ABI remains the same, but bugs are fixed.
--# AGE         If libzif can be linked into executables which can be
--#             built with previous versions of this library. Don't use.
--LT_CURRENT=1
--LT_REVISION=3
--LT_AGE=0
--AC_SUBST(LT_CURRENT)
--AC_SUBST(LT_REVISION)
--AC_SUBST(LT_AGE)
--
- dnl ---------------------------------------------------------------------------
- dnl - gettext stuff
- dnl ---------------------------------------------------------------------------

diff --git a/0007-Support-getting-and-setting-the-DAC-value-on-hardwar.patch b/0007-Support-getting-and-setting-the-DAC-value-on-hardwar.patch
deleted file mode 100644 (file)
index 939f2e1..0000000
--- a/0007-Support-getting-and-setting-the-DAC-value-on-hardwar.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 769e72db68215d0014cc4594d2eb204fe5a4c7d9 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:48:08 +0000
-Subject: [PATCH 07/11] Support getting and setting the DAC value on hardware
- type 2
-
----
- configure.ac  |  2 +-
- src/ch-main.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 76 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3ac3c8f..0c8dbeb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -89,7 +89,7 @@ dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.10 gobject-2.0 gmodule-2.0 gio-2.0 >= 2.25.9)
- PKG_CHECK_MODULES(GUSB, gusb >= 0.1.2)
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.12.0)
--PKG_CHECK_MODULES(COLORD, colord >= 0.1.31)
-+PKG_CHECK_MODULES(COLORD, colord >= 1.1.6)
- PKG_CHECK_MODULES(COLORD_GTK, colord-gtk >= 0.1.24)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4)
- PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
-diff --git a/src/ch-main.c b/src/ch-main.c
-index cd6fbba..06cc620 100644
---- a/src/ch-main.c
-+++ b/src/ch-main.c
-@@ -2374,6 +2374,71 @@ out:
- }
- 
- /**
-+ * ch_util_get_dac_value:
-+ **/
-+static gboolean
-+ch_util_get_dac_value (ChUtilPrivate *priv, gchar **values, GError **error)
-+{
-+      gboolean ret;
-+      gdouble dac_value = 0.0f;
-+
-+      /* get from HW */
-+      ch_device_queue_get_dac_value (priv->device_queue,
-+                                     priv->device,
-+                                     &dac_value);
-+      ret = ch_device_queue_process (priv->device_queue,
-+                                     CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE,
-+                                     NULL,
-+                                     error);
-+      if (!ret)
-+              goto out;
-+
-+      g_print ("DAC value: %f\n", dac_value);
-+out:
-+      return ret;
-+}
-+
-+/**
-+ * ch_util_set_dac_value:
-+ **/
-+static gboolean
-+ch_util_set_dac_value (ChUtilPrivate *priv, gchar **values, GError **error)
-+{
-+      gboolean ret;
-+      gdouble dac_value;
-+
-+      /* parse */
-+      if (g_strv_length (values) != 1) {
-+              ret = FALSE;
-+              g_set_error_literal (error, 1, 0,
-+                                   "invalid input, expect 'value'");
-+              goto out;
-+      }
-+      dac_value = g_ascii_strtod (values[0], NULL);
-+      if (dac_value < -0x7fff || dac_value > 0x7fff) {
-+              ret = FALSE;
-+              g_set_error (error, 1, 0,
-+                           "invalid dac value %f",
-+                           dac_value);
-+              goto out;
-+      }
-+
-+      /* set to HW */
-+      ch_device_queue_set_dac_value (priv->device_queue,
-+                                     priv->device,
-+                                     dac_value);
-+      ret = ch_device_queue_process (priv->device_queue,
-+                                     CH_DEVICE_QUEUE_PROCESS_FLAGS_NONE,
-+                                     NULL,
-+                                     error);
-+      if (!ret)
-+              goto out;
-+
-+out:
-+      return ret;
-+}
-+
-+/**
-  * ch_util_get_adc_vrefs:
-  **/
- static gboolean
-@@ -3252,6 +3317,16 @@ main (int argc, char *argv[])
-                    _("Sets the pre scale constant"),
-                    ch_util_set_pre_scale);
-       ch_util_add (priv->cmd_array,
-+                   "get-dac-value",
-+                   /* TRANSLATORS: command description */
-+                   _("Gets the DAC value"),
-+                   ch_util_get_dac_value);
-+      ch_util_add (priv->cmd_array,
-+                   "set-dac-value",
-+                   /* TRANSLATORS: command description */
-+                   _("Sets the DAC value"),
-+                   ch_util_set_dac_value);
-+      ch_util_add (priv->cmd_array,
-                    "get-post-scale",
-                    /* TRANSLATORS: command description */
-                    _("Gets the post scale constant"),
--- 
-1.8.4.5
-

diff --git a/0008-trivial-Only-use-the-latest-released-GTK-version.patch b/0008-trivial-Only-use-the-latest-released-GTK-version.patch
deleted file mode 100644 (file)
index e2e76b6..0000000
--- a/0008-trivial-Only-use-the-latest-released-GTK-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8652b3d3517efdc5fa659d0c7abd7968ccb0d1e4 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 8 Jan 2014 17:49:29 +0000
-Subject: [PATCH 08/11] trivial: Only use the latest released GTK version
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0c8dbeb..32181d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,7 @@ dnl - Check library dependencies
- dnl ---------------------------------------------------------------------------
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.31.10 gobject-2.0 gmodule-2.0 gio-2.0 >= 2.25.9)
- PKG_CHECK_MODULES(GUSB, gusb >= 0.1.2)
--PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.12.0)
-+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.11.2)
- PKG_CHECK_MODULES(COLORD, colord >= 1.1.6)
- PKG_CHECK_MODULES(COLORD_GTK, colord-gtk >= 0.1.24)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4)
--- 
-1.8.4.5
-

diff --git a/0009-Rename-ColorHug-Spectro-to-ColorHug-for-trademark-re.patch b/0009-Rename-ColorHug-Spectro-to-ColorHug-for-trademark-re.patch
deleted file mode 100644 (file)
index ec2c7e9..0000000
--- a/0009-Rename-ColorHug-Spectro-to-ColorHug-for-trademark-re.patch
+++ /dev/null
@@ -1,994 +0,0 @@
-From f971b635f5d27cdffaf19821910a4ece7b38267a Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 17 Jan 2014 19:43:22 +0000
-Subject: [PATCH 09/11] Rename 'ColorHug Spectro' to 'ColorHug+' for trademark
- reasons
-
----
- data/ch-spectro-util.ui               |  2 +-
- data/colorhug-spectro-util.desktop.in |  4 ++--
- po/cs_CZ.po                           |  6 +++---
- po/da.po                              |  6 +++---
- po/de.po                              |  6 +++---
- po/de_DE.po                           | 10 +++++-----
- po/el_GR.po                           |  6 +++---
- po/en_GB.po                           | 12 ++++++------
- po/en_US.po                           | 12 ++++++------
- po/es_ES.po                           |  6 +++---
- po/et.po                              |  6 +++---
- po/fa.po                              |  6 +++---
- po/fi.po                              |  6 +++---
- po/fr_FR.po                           | 12 ++++++------
- po/hu.po                              | 12 ++++++------
- po/it_IT.po                           |  6 +++---
- po/ja_JP.po                           |  6 +++---
- po/lv.po                              | 12 ++++++------
- po/nb.po                              |  6 +++---
- po/nl_NL.po                           |  6 +++---
- po/nn.po                              | 12 ++++++------
- po/pl.po                              |  6 +++---
- po/pt.po                              |  6 +++---
- po/pt_BR.po                           |  8 ++++----
- po/pt_PT.po                           |  6 +++---
- po/ro.po                              |  6 +++---
- po/ru.po                              |  6 +++---
- po/sv.po                              |  6 +++---
- po/tr.po                              | 12 ++++++------
- po/uk.po                              | 10 +++++-----
- po/zh_TW.po                           | 12 ++++++------
- src/ch-ccmx.c                         |  6 +++---
- src/ch-flash.c                        |  8 ++++----
- src/ch-spectro-util.c                 |  4 ++--
- 34 files changed, 128 insertions(+), 128 deletions(-)
-
---- a/data/ch-spectro-util.ui
-+++ b/data/ch-spectro-util.ui
-@@ -11,7 +11,7 @@
-   <object class="GtkDialog" id="dialog_util">
-     <property name="can_focus">False</property>
-     <property name="border_width">12</property>
--    <property name="title" translatable="yes">ColorHug Spectro Utility</property>
-+    <property name="title" translatable="yes">ColorHug+ Utility</property>
-     <property name="resizable">False</property>
-     <property name="type_hint">dialog</property>
-     <property name="deletable">False</property>
---- a/data/colorhug-spectro-util.desktop.in
-+++ b/data/colorhug-spectro-util.desktop.in
-@@ -1,6 +1,6 @@
- [Desktop Entry]
--_Name=ColorHug Spectro Utility
--_Comment=Play with the ColorHug Spectro
-+_Name=ColorHug+ Utility
-+_Comment=Play with the ColorHug+
- Icon=colorhug-spectro-util
- Exec=colorhug-spectro-util %F
- Terminal=false
---- a/po/cs_CZ.po
-+++ b/po/cs_CZ.po
-@@ -101,7 +101,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Nevypínejte ani neodpojujte zařízení od počítače."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -188,7 +188,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Aktualizuj firmware na ColorHug kolorimetru"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -509,7 +509,7 @@
- msgstr "Zjištěn ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/da.po
-+++ b/po/da.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Afbryd ikke enheden og sluk ikke computeren"
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Opdater firmware på ColorHug colorimeter"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr "ColorHug Detekteret"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/de.po
-+++ b/po/de.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr ""
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Die Firmware des ColorHug updaten"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr ""
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/de_DE.po
-+++ b/po/de_DE.po
-@@ -102,7 +102,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Lassen die das Gerät eingesteckt und schalten Sie den Computer nicht aus."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -189,8 +189,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "ColorHug Kolorimeter Firmware aktualisieren"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Spiele mit dem ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Spiele mit dem ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Ob wir die Firmware aktualisieren sollten, um sie zu testen."
-@@ -510,8 +510,8 @@
- msgstr "ColorHug gefunden"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro gefunden"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ gefunden"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/el_GR.po
-+++ b/po/el_GR.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr ""
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr ""
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr ""
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/en_GB.po
-+++ b/po/en_GB.po
-@@ -99,8 +99,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Do not unplug the device and do not turn off the computer."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ Utility"
- 
- msgid "Auto update:"
- msgstr "Auto update:"
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Update the firmware on the ColorHug colorimeter"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Play with the ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Whether we should update to test firmware"
-@@ -507,8 +507,8 @@
- msgstr "ColorHug Detected"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ Detected"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/en_US.po
-+++ b/po/en_US.po
-@@ -98,8 +98,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Do not unplug the device and do not turn off the computer."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ Utility"
- 
- msgid "Auto update:"
- msgstr "Auto update:"
-@@ -185,8 +185,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Update the firmware on the ColorHug colorimeter"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Play with the ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Whether we should update to test firmware"
-@@ -506,8 +506,8 @@
- msgstr "ColorHug Detected"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ Detected"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/es_ES.po
-+++ b/po/es_ES.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "No desconecte el dispositivo y no apague el ordenador."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Actualizar el firmware del colorímetro ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "ColorHug detectado"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/et.po
-+++ b/po/et.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr ""
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr ""
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr ""
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/fa.po
-+++ b/po/fa.po
-@@ -98,7 +98,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr ""
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -185,7 +185,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr ""
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -506,7 +506,7 @@
- msgstr ""
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/fi.po
-+++ b/po/fi.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Älä irrota laitetta tai sammuta tietokonetta."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Päivitä ColorHug-värimittarin sisäinen ohjelmisto"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "ColorHug havaittu"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/fr_FR.po
-+++ b/po/fr_FR.po
-@@ -101,8 +101,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Ne pas débrancher l'appareil et ne pas éteindre l'ordinateur."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "Outil ColorHug Spectro"
-+msgid "ColorHug+ Utility"
-+msgstr "Outil ColorHug+"
- 
- msgid "Auto update:"
- msgstr "Mise à jour automatique:"
-@@ -188,8 +188,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Mettre à jour le micrologiciel du colorimètre ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Jouer avec ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Jouer avec ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Option de mise à jour vers un micrologiciel de test"
-@@ -509,8 +509,8 @@
- msgstr "ColorHug détecté"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro détecté"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ détecté"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/hu.po
-+++ b/po/hu.po
-@@ -99,8 +99,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Ne húzza ki és ne kapcsolja ki a számítógépét."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro kisalkalmazás"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ kisalkalmazás"
- 
- msgid "Auto update:"
- msgstr "Automatikus frissítés:"
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Frissítse a firmware-t a ColorHug koloriméteren"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "játék a ColorHug Spectro-val"
-+msgid "Play with the ColorHug+"
-+msgstr "játék a ColorHug+-val"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Mindenképp frissítenie kell, hogy tesztelni tudja a firmware-t"
-@@ -507,8 +507,8 @@
- msgstr "ColorHug észlelve"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro észlelve"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ észlelve"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/it_IT.po
-+++ b/po/it_IT.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Non scollegare il dispositivo e non spegnere il computer."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr "Utilità spettro ColorHug"
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Aggiorna il firmware nel colorimetro ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr "ColorHug rilevato"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/ja_JP.po
-+++ b/po/ja_JP.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "注意！でバイスを抜いたりコンピュタの電源を切ったりするべからず"
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "ファームウェア バジョンを最新する"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "ファームウェア一覧の容量は０です"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/lv.po
-+++ b/po/lv.po
-@@ -99,8 +99,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Neatvienojiet ierīci un neizslēdziet datoru."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro utilīta"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ utilīta"
- 
- msgid "Auto update:"
- msgstr "Automātiski atjaunināt:"
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Atjaunināt aparātprogrammatūru uz ColorHug krāsu mērītāja"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Spēlēties ar ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Spēlēties ar ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Vai vajadzētu atjaunināt uz testa aparātprogrammatūru"
-@@ -507,8 +507,8 @@
- msgstr "Atrasts ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "Ir atklāts ColorHug Spectro"
-+msgid "ColorHug+ Detected"
-+msgstr "Ir atklāts ColorHug+"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/nb.po
-+++ b/po/nb.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "La enheten være koblet til og datamaskinen være påslått."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Oppdater firmwaren på Colorhug-kolorimeteret"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "Colorhug funnet"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/nl_NL.po
-+++ b/po/nl_NL.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Verbreek de verbinding met het apparaat niet en zet de computer niet uit."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Werk de firmware van de ColorHug colorimeter bij"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr "ColorHug gedetecteerd"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/nn.po
-+++ b/po/nn.po
-@@ -101,8 +101,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "La eininga vera kopla til og datamaskinen vera påslått."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro-verktøy"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+-verktøy"
- 
- msgid "Auto update:"
- msgstr "Autooppdater:"
-@@ -188,8 +188,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Oppdater fastvaren på ColorHug-kolorimeteret"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Leik med ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Leik med ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Om me skal oppdatera til testfastvaren"
-@@ -509,8 +509,8 @@
- msgstr "ColorHug oppdaga"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro oppdaga"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ oppdaga"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/pl.po
-+++ b/po/pl.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Nie należy odłączać urządzenia ani wyłączać komputera."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr "Narzędzie spektrometrii ColorHug"
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Aktualizuje oprogramowanie sprzętowe kolorymetru ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr "Zabawa ze spektrometrią ColorHug"
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "Wykryto urządzenie ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr "Wykryto spektrometrię ColorHug"
- 
- #. TRANSLATORS: fake hardware
---- a/po/pt_BR.po
-+++ b/po/pt_BR.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Não remova o dispositivo e não desligue o computador."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr "Utilitário ColoHug Spectro"
- 
- msgid "Auto update:"
-@@ -187,8 +187,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Atualizar o firmware no colorímetro do ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Jogar com o ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Jogar com o ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Quando se deve fazer upgrade para firmware de teste"
-@@ -508,7 +508,7 @@
- msgstr "ColorHug Detectado"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr "Espectro ColorHug detectado"
- 
- #. TRANSLATORS: fake hardware
---- a/po/pt_PT.po
-+++ b/po/pt_PT.po
-@@ -98,7 +98,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr ""
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -185,7 +185,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr ""
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -506,7 +506,7 @@
- msgstr ""
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/ro.po
-+++ b/po/ro.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Nu deconectați dispozitivul și nu opriți computerul."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -186,7 +186,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Actualizarea firmware-ului de pe colorimetrul ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -507,7 +507,7 @@
- msgstr "Detectat ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/ru.po
-+++ b/po/ru.po
-@@ -100,7 +100,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Не отключайте устройство и\nне выключайте компьютер."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -187,7 +187,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Обновить прошивку в колориметре ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -508,7 +508,7 @@
- msgstr "Обнаружен ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/sv.po
-+++ b/po/sv.po
-@@ -98,7 +98,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Koppla inte ur enheten och stäng inte av datorn."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr ""
- 
- msgid "Auto update:"
-@@ -185,7 +185,7 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Uppdatera mjukvaran på ColorHug färgometern"
- 
--msgid "Play with the ColorHug Spectro"
-+msgid "Play with the ColorHug+"
- msgstr ""
- 
- msgid "Whether we should update to test firmware"
-@@ -506,7 +506,7 @@
- msgstr "ColorHug Detekterad"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
-+msgid "ColorHug+ Detected"
- msgstr ""
- 
- #. TRANSLATORS: fake hardware
---- a/po/tr.po
-+++ b/po/tr.po
-@@ -99,8 +99,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Cihazı çıkarmayın ve bilgisayarı kapatmayınız."
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro Aracı"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ Aracı"
- 
- msgid "Auto update:"
- msgstr "Otomatik Güncelleme"
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "ColorHug Renkmetre yazılımını güncelle"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "ColorHug Spectro ile oynayın"
-+msgid "Play with the ColorHug+"
-+msgstr "ColorHug+ ile oynayın"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Biz test yazılımı güncellemesi varsa günceller yada yoksa güncelleme yapılmaz."
-@@ -507,8 +507,8 @@
- msgstr "Colorhug tespit Edildi."
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "ColorHug Spectro Algılandı"
-+msgid "ColorHug+ Detected"
-+msgstr "ColorHug+ Algılandı"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/uk.po
-+++ b/po/uk.po
-@@ -99,7 +99,7 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "Не від’єднуйте пристрій від комп’ютера і не вимикайте комп’ютер."
- 
--msgid "ColorHug Spectro Utility"
-+msgid "ColorHug+ Utility"
- msgstr "Службова програма Spectro ColorHug"
- 
- msgid "Auto update:"
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "Оновлює мікропрограму на колориметрі ColorHug"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "Погратися з ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "Погратися з ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "Чи слід виконувати оновлення для перевірки мікрокоду"
-@@ -507,8 +507,8 @@
- msgstr "Виявлено ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "Виявлено ColorHug Spectro"
-+msgid "ColorHug+ Detected"
-+msgstr "Виявлено ColorHug+"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/po/zh_TW.po
-+++ b/po/zh_TW.po
-@@ -99,8 +99,8 @@
- msgid "Do not unplug the device and do not turn off the computer."
- msgstr "請不要拔除裝置，也不要關閉電腦。"
- 
--msgid "ColorHug Spectro Utility"
--msgstr "ColorHug Spectro 公用程式"
-+msgid "ColorHug+ Utility"
-+msgstr "ColorHug+ 公用程式"
- 
- msgid "Auto update:"
- msgstr "自動更新："
-@@ -186,8 +186,8 @@
- msgid "Update the firmware on the ColorHug colorimeter"
- msgstr "更新 ColorHug 色度計上的韌體"
- 
--msgid "Play with the ColorHug Spectro"
--msgstr "把玩 ColorHug Spectro"
-+msgid "Play with the ColorHug+"
-+msgstr "把玩 ColorHug+"
- 
- msgid "Whether we should update to test firmware"
- msgstr "是否應更新至測試用韌體"
-@@ -507,8 +507,8 @@
- msgstr "偵測到 ColorHug"
- 
- #. TRANSLATORS: first release hardware
--msgid "ColorHug Spectro Detected"
--msgstr "偵測到 ColorHug Spectro"
-+msgid "ColorHug+ Detected"
-+msgstr "偵測到 ColorHug+"
- 
- #. TRANSLATORS: fake hardware
- msgid "Emulated ColorHug Detected"
---- a/src/ch-ccmx.c
-+++ b/src/ch-ccmx.c
-@@ -510,9 +510,9 @@
-       case CH_DEVICE_MODE_FIRMWARE:
-               str = "colorhug";
-               break;
--      case CH_DEVICE_MODE_BOOTLOADER_SPECTRO:
--      case CH_DEVICE_MODE_FIRMWARE_SPECTRO:
--              str = "colorhug-spectro";
-+      case CH_DEVICE_MODE_BOOTLOADER_PLUS:
-+      case CH_DEVICE_MODE_FIRMWARE_PLUS:
-+              str = "colorhug-plus";
-               break;
-       default:
-               str = "unknown";
---- a/src/ch-flash.c
-+++ b/src/ch-flash.c
-@@ -721,9 +721,9 @@
-       case CH_DEVICE_MODE_FIRMWARE:
-               str = "colorhug";
-               break;
--      case CH_DEVICE_MODE_BOOTLOADER_SPECTRO:
--      case CH_DEVICE_MODE_FIRMWARE_SPECTRO:
--              str = "colorhug-spectro";
-+      case CH_DEVICE_MODE_BOOTLOADER_PLUS:
-+      case CH_DEVICE_MODE_FIRMWARE_PLUS:
-+              str = "colorhug-plus";
-               break;
-       default:
-               str = "unknown";
-@@ -1035,7 +1035,7 @@
-               break;
-       case 0x02:
-               /* TRANSLATORS: first release hardware */
--              str = g_strdup (_("ColorHug Spectro Detected"));
-+              str = g_strdup (_("ColorHug+ Detected"));
-               break;
-       case 0xff:
-               /* TRANSLATORS: fake hardware */
---- a/src/ch-spectro-util.c
-+++ b/src/ch-spectro-util.c
-@@ -476,7 +476,7 @@
-       g_debug ("Added: %i:%i",
-                g_usb_device_get_vid (device),
-                g_usb_device_get_pid (device));
--      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) {
-+      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_PLUS) {
-               priv->device = g_object_ref (device);
-               ch_util_got_device (priv);
-       }
-@@ -493,7 +493,7 @@
-       g_debug ("Removed: %i:%i",
-                g_usb_device_get_vid (device),
-                g_usb_device_get_pid (device));
--      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_SPECTRO) {
-+      if (ch_device_get_mode (device) == CH_DEVICE_MODE_FIRMWARE_PLUS) {
-               if (priv->device != NULL)
-                       g_object_unref (priv->device);
-               priv->device = NULL;

diff --git a/colorhug-client.spec b/colorhug-client.spec
index 1701409dc3744fe24346b1d4a3d1cdf882f61d9f..281988b015947c8dacb3b4202a0f32ee4446c786 100644 (file)
--- a/colorhug-client.spec
+++ b/colorhug-client.spec
@@ -1,28 +1,20 @@
 Summary:       Tools for the Hughski Colorimeter
 Summary(pl.UTF-8):     Narzędzia do kolorymetrów Hughski
 Name:          colorhug-client
-Version:       0.2.1
-Release:       2
+Version:       0.2.2
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 2f54a15b354cd39d8b58572e9899fd88
-Patch0:                0002-Fix-autogen-failure-with-new-gettexts.patch
-Patch1:                0003-Do-not-use-deprecated-widgets-in-the-spectro-tool.patch
-Patch2:                0004-Load-the-colorhug-spectro-utils-data-file-from-a-GRe.patch
-Patch3:                0005-trivial-Fix-thinko-when-ColorHug-1-and-2-are-connect.patch
-Patch4:                0006-trivial-remove-some-cruft-in-the-configure-file.patch
-Patch5:                0007-Support-getting-and-setting-the-DAC-value-on-hardwar.patch
-Patch6:                0008-trivial-Only-use-the-latest-released-GTK-version.patch
-Patch7:                0009-Rename-ColorHug-Spectro-to-ColorHug-for-trademark-re.patch
+# Source0-md5: cc3a1885c1618cc991c9de7e2849bd4d
 URL:           http://hughski.com/
-BuildRequires: colord-devel >= 0.1.31
+BuildRequires: colord-devel >= 1.2.3
 BuildRequires: colord-gtk-devel >= 0.1.24
 BuildRequires: docbook-utils
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: glib2-devel >= 1:2.31.10
 BuildRequires: gobject-introspection-devel >= 0.9.8
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.11.2
 BuildRequires: intltool >= 0.50.0
 BuildRequires: lcms2-devel
 BuildRequires: libcanberra-gtk3-devel >= 0.10
@@ -32,7 +24,7 @@ BuildRequires:        pkgconfig
 BuildRequires: sqlite3-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      colord-libs >= 0.1.31
+Requires:      colord-libs >= 1.2.3
 Requires:      glib2 >= 1:2.31.10
 Requires:      libgusb >= 0.1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,7 +53,7 @@ Summary(pl.UTF-8):    Graficzne narzędzia do kolorymetrów Hughski
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires:      colord-gtk >= 0.1.24
-Requires:      gtk+3 >= 3.0.0
+Requires:      gtk+3 >= 3.11.2
 Requires:      libcanberra-gtk3 >= 0.10
 
 %description gui
@@ -95,14 +87,6 @@ Bashowe uzupełnianie składni dla poleceń terminalowych ColorHuga.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal} -I m4
@@ -129,10 +113,11 @@ mv $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
 mv $RPM_BUILD_ROOT%{_localedir}/{it_IT,it}
 mv $RPM_BUILD_ROOT%{_localedir}/{ja_JP,ja}
 mv $RPM_BUILD_ROOT%{_localedir}/{nl_NL,nl}
-mv $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
 # empty version of pl which already exists
 %{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pl_PL
-# program not packaged (unfinished as of 0.1.13)
+# just a copy of pt (only header differs)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pt_PT
+# program not packaged (unfinished as of 0.2.2)
 %{__rm} $RPM_BUILD_ROOT%{_desktopdir}/colorhug-spectro-util.desktop
 
 %find_lang %{name}