From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 7 Jul 2012 02:09:08 +0000 (+1200)
Subject: Add changelog entries for Julian's patch and add him to the THANKS file.
X-Git-Tag: debian-sid-0.10.2-1~10
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c50269053e6385411162f5cf32e5784a215aa7d2;p=mythtv-status.git

Add changelog entries for Julian's patch and add him to the THANKS file.
---

diff --git a/ChangeLog b/ChangeLog
index 4154c85..36b03dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-07	Andrew Ruthven
+	Switch to using the exact mode when working out the time to the
+	next recording.  Also, if the next recording is in 1 Hour, 1 Minute
+	don't report it as "1 Hour, 1 Minutes".  Thank you to Julian Gilbey
+	for the patch fixing this.
+
 2012-07-06	Andrew Ruthven
 	Correctly handle UTF-8 in the output from MythTV.
 
diff --git a/THANKS b/THANKS
index f2d395f..c920ab5 100644
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,8 @@ I'd like to thank the following people:
  - Tom Metro - For a whole bunch of feedback.
  - Jan Schneider - For feedback on the email charset and encoding.
  - Steve Gunther - Doing some home work on the OSD declutter changes.
+ - Julian Gilbey - Fixing up some errors in reporting the next scheduled
+   recording.
  - The Debian translators - Especially the Portuguese guys - you rock!
  - All the MythTV developers for working on a great bit of software
  
diff --git a/debian/changelog b/debian/changelog
index f04884c..d02f01b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mythtv-status (0.10.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #680358)
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Sat, 07 Jul 2012 14:00:48 +1200
+
 mythtv-status (0.10.1-1) unstable; urgency=low
 
   * New upstream release.