From afc68edc1a4e3fd271657b1fc673558108dff2f9 Mon Sep 17 00:00:00 2001
From: jeremypw <jeremy@elementary.org>
Date: Wed, 28 Mar 2018 16:10:16 +0100
Subject: [PATCH 1/2] New release info in appdata

---
 data/com.github.jeremypw.gnonograms.meson.in.appdata.xml | 9 +++++++++
 src/core/Gnonogram_solver.vala                           | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
index 9a14ab1..4e8a522 100644
--- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
+++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
@@ -23,6 +23,15 @@
         <category>LogicGame</category>
     </categories>
     <releases>
+        <release version="1.2.0" date="2018-03-28" urgency="low">
+            <description>
+                <ul>
+                    <li>Hint button</li>
+                    <li>Strikethrough completed blocks in clue label</li>
+                    <li>Some code refactoring and cleanup</li>
+                </ul>
+            </description>
+        </release>
         <release version="1.1.0" date="2018-02-16" urgency="low">
             <description>
                 <ul>
diff --git a/src/core/Gnonogram_solver.vala b/src/core/Gnonogram_solver.vala
index 851bad1..64fc87f 100644
--- a/src/core/Gnonogram_solver.vala
+++ b/src/core/Gnonogram_solver.vala
@@ -350,7 +350,7 @@ namespace Gnonograms {
                         guesser.cancel_previous_guess ();
                         state = SolverState.UNDEFINED;
                     } else {
-                        critical ("unexpected initial sState %s", initial_state.to_string ());
+                        critical ("unexpected initial state %s", initial_state.to_string ());
                         assert_not_reached ();
                     }
 

From 50b9f9bd2c66e62a76f44a92a8fa4b88d5211802 Mon Sep 17 00:00:00 2001
From: jeremypw <jeremy@elementary.org>
Date: Wed, 28 Mar 2018 17:01:59 +0100
Subject: [PATCH 2/2] New release info in changelog

---
 ...om.github.jeremypw.gnonograms.meson.in.appdata.xml |  5 ++++-
 debian/changelog                                      | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
index 4e8a522..f1bc4b6 100644
--- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
+++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
@@ -27,8 +27,11 @@
             <description>
                 <ul>
                     <li>Hint button</li>
-                    <li>Strikethrough completed blocks in clue label</li>
+                    <li>Strikethrough completed blocks in clue label (with option to disable)</li>
+                    <li>Clue label turns red if completed incorrectly (with option to disable)</li>
+                    <li>Additional shortcuts</li>
                     <li>Some code refactoring and cleanup</li>
+                    <li>Various bug fixes</li>
                 </ul>
             </description>
         </release>
diff --git a/debian/changelog b/debian/changelog
index b033f5a..6784e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+com.github.jeremypw.gnonograms (1.2.0) xenial; urgency=low
+
+  * Hint button
+  * Strikethrough completed blocks in clue label (with option to disable)
+  * Clue label turns red if completed incorrectly (with option to disable)
+  * Additional shortcuts
+  * Some code refactoring and cleanup
+  * Various bug fixes
+
+ -- Jeremy Wootten <jeremywootten@gmail.com>  Wed, 28 Mar 2018 17:01:00 +0000
+
 com.github.jeremypw.gnonograms (1.1.0) xenial; urgency=low
 
   * Save and restore move history