Merge lp:~tgm4883/mythbuntu/mythbuntu-live-autostart into lp:~mythbuntu-dev/mythbuntu/mythbuntu-live-autostart

[Thomas Mashos]

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-17 03:49:04 +0000
+++ debian/changelog	2012-03-27 20:57:27 +0000
@@ -1,3 +1,10 @@
+mythbuntu-live-autostart (0.61) UNRELEASED; urgency=low
+
+  * Fixed -repos slide since it is built in now
+  * Remove mythtv-backend package if frontend only
+
+ -- Thomas Mashos <[e-mail]>  Tue, 27 Mar 2012 13:15:50 -0700
+
 mythbuntu-live-autostart (0.60) precise; urgency=low
 
   * Bump the mysql version referenced in the install type plugin to 5.5.

=== modified file 'ubiquity-slideshow/slides/repos.html'
--- ubiquity-slideshow/slides/repos.html	2011-10-08 19:29:13 +0000
+++ ubiquity-slideshow/slides/repos.html	2012-03-27 20:57:27 +0000
@@ -7,6 +7,7 @@
 <div class="content wrap-top"><ul>
 	<!-- Beware the size limit; the text here just about hits the limits. -->
 	<li>Mythbuntu developers offer a repository with the latest builds of MythTV, updated frequently.</li>
+	<li>Open the Mythbuntu Control Centre and select 'Repositories'</li>
 	<li>Select which version of MythTV you want to receive updates for.</li>
 	<li>These builds are built daily when there have been upstream fixes.</li>
 	<li>Visit <a href="http://www.mythbuntu.org/repos">Mythbuntu Repos</a> for more info.</li>

=== modified file 'ubiquity/plugins/myth-install-type.py'
--- ubiquity/plugins/myth-install-type.py	2012-01-17 03:48:39 +0000
+++ ubiquity/plugins/myth-install-type.py	2012-03-27 20:57:27 +0000
@@ -101,7 +101,7 @@
         packages=set()
         ## system role
         if 'Backend' not in self.type:
-            packages.add('libnet-upnp-perl') #causes mythtv-backend to be removed
+            packages.add('mythtv-backend')
             packages.add('php5-common')      #causes mythweb to be removed
             packages.add('libaprutil1')      #causes apache2 to be removed
         if 'Slave' in self.type or self.type == 'Frontend':