From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Wed, 3 Oct 2012 10:23:46 +0000 (+1300)
Subject: Merge branch 'release-0.10' into release-0.10-debian-squeeze
X-Git-Tag: debian-squeeze-0.10.2-2@bpo60+1~2
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58d61ca35e5e91fc0bccef839059fcdc187abe8b;p=mythtv-status.git
Merge branch 'release-0.10' into release-0.10-debian-squeeze
Conflicts:
debian/changelog
---
58d61ca35e5e91fc0bccef839059fcdc187abe8b
diff --cc debian/changelog
index 938ccb4,411c53b..ab4d59f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,24 +1,24 @@@
-mythtv-status (0.10.2-2) unstable; urgency=low
++mythtv-status (0.10.2-2~bpo-squeeze1) squeeze; urgency=low
+
+ * Handle a stale temp file more gracefully (Closes: #681684)
+ * base-files 6.11 in Wheezy uses /var/run/motd.dynamic (Closes: #688034)
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Tue, 02 Oct 2012 21:50:10 +1300
+
+ mythtv-status (0.10.2-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #680358)
+ * Danish debconf translation from Joe Dalton. (Closes: #680372)
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Sat, 07 Jul 2012 16:32:46 +1200
+
+ mythtv-status (0.10.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Thu, 14 Jun 2012 23:06:11 +1200
+
-mythtv-status (0.10.0-1) unstable; urgency=low
+mythtv-status (0.10.0-1~bpo-squeeze1) unstable; urgency=low
* New upstream release.
* Make sure we clean up /etc/default/mythtv-status on purge (Closes: #656224)