Merge branch 'release-0.10' into release-0.10-debian-squeeze

Conflicts:
	debian/changelog
	debian/control

diff --cc Makefile
Simple merge

diff --cc debian/changelog
index c3bbd8bd89ed76c241385d672ddcb8a2b7fae374,acef673061a1f095e1e64f9f660d7d422c8a2582..0d7ff8eb2b0c77ac0cffa512af71030eb30178ad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,27 +1,27 @@@
 -mythtv-status (0.10.4-1) unstable; urgency=low
++mythtv-status (0.10.4-1~bpo60+1) unstable; urgency=low
+ 
+   * New upstream release (Closes: #724166, #709377, #709449).
+   * Remove an extraneous hypen in our postinst (Cloases: #704436)
+     Thank you Francois Marier for the patch.
+   * Update standards version to 3.9.4, remove obsolete control field
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Mon, 28 Oct 2013 23:03:44 +1300
+ 
+ mythtv-status (0.10.3-1) unstable; urgency=low
+ 
+   * New upstream release (Closes: LP#1096252).
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Tue, 29 Jan 2013 16:37:53 +1300
+ 
+ mythtv-status (0.10.2-3) unstable; urgency=low
+ 
+   * Fix the use of motd as a facility name, shouldn't be $motd.
+     Reported by Julian Cristau, thank you.
+   * Don't abort the init.d if we can't remove /var/run/motd.orig.
+ 
+  -- Andrew Ruthven <andrew@etc.gen.nz>  Thu, 20 Dec 2012 10:29:31 +1300
+ 
 -mythtv-status (0.10.2-2) unstable; urgency=low
 +mythtv-status (0.10.2-2~bpo60+1) unstable; urgency=low
  
    * Handle a stale temp file more gracefully (Closes: #681684) 
    * base-files 6.11 in Wheezy uses /var/run/motd.dynamic (Closes: #688034)