mythbuntu-dev team mailing list archive
-
mythbuntu-dev team
-
Mailing list archive
-
Message #00075
[Merge] lp:~tgm4883/mythbuntu/mythbuntu-live-autostart into lp:~mythbuntu-dev/mythbuntu/mythbuntu-live-autostart
Thomas Mashos has proposed merging lp:~tgm4883/mythbuntu/mythbuntu-live-autostart into lp:~mythbuntu-dev/mythbuntu/mythbuntu-live-autostart.
Requested reviews:
mythbuntu-dev (mythbuntu-dev)
For more details, see:
https://code.launchpad.net/~tgm4883/mythbuntu/mythbuntu-live-autostart/+merge/78731
--
https://code.launchpad.net/~tgm4883/mythbuntu/mythbuntu-live-autostart/+merge/78731
Your team mythbuntu-dev is requested to review the proposed merge of lp:~tgm4883/mythbuntu/mythbuntu-live-autostart into lp:~mythbuntu-dev/mythbuntu/mythbuntu-live-autostart.
=== modified file 'debian/changelog'
--- debian/changelog 2011-10-05 05:10:04 +0000
+++ debian/changelog 2011-10-08 19:37:23 +0000
@@ -1,3 +1,9 @@
+mythbuntu-live-autostart (0.58) UNRELEASED; urgency=low
+
+ * Updated ubiquity slideshow Fixes (LP: #870908)
+
+ -- Thomas Mashos <thomas@xxxxxxxxxx> Sat, 08 Oct 2011 12:28:10 -0700
+
mythbuntu-live-autostart (0.58) oneiric; urgency=low
* Fix hang at myth-drivers ubiquity plugin. (LP: #867856)
=== modified file 'ubiquity-slideshow/slides/documentation.html'
--- ubiquity-slideshow/slides/documentation.html 2010-03-28 20:24:08 +0000
+++ ubiquity-slideshow/slides/documentation.html 2011-10-08 19:37:23 +0000
@@ -4,8 +4,8 @@
<div class="content wrap-top"><ul>
<li>All this is just the beginning!</li>
- <li>Ask your questions in the <a href="http://ubuntuforums.org/forumdisplay.php?f=301">Mythbuntu forums</a>, where advanced users help people just like you.</li>
- <li>More information can be found in the <a href="http://www.mythbuntu.org/installation_manual">Mythbuntu Installation Manual.</a></li>
+ <li>Ask questions in the <a href="http://ubuntuforums.org/forumdisplay.php?f=301">Mythbuntu forums</a>, where advanced users help people just like you.</li>
+ <li>More information can be found in the <a href="http://www.mythbuntu.org/wiki/installation-guide">Mythbuntu Installation Manual.</a></li>
<li class="special">The installation will finish soon, we hope that you enjoy using Mythbuntu!</li>
</ul></div>
=== modified file 'ubiquity-slideshow/slides/index.html'
--- ubiquity-slideshow/slides/index.html 2010-05-13 02:44:46 +0000
+++ ubiquity-slideshow/slides/index.html 2011-10-08 19:37:23 +0000
@@ -31,9 +31,9 @@
<div><a href="welcome.html" class="load"></a></div>
<div><a href="mcc.html" class="load"></a></div>
<div><a href="dyk1.html" class="load"></a></div>
- <div><a href="auto-builds.html" class="load"></a></div>
+ <div><a href="repos.html" class="load"></a></div>
<div><a href="dyk2.html" class="load"></a></div>
- <div><a href="testing.html" class="load"></a></div>
+ <div><a href="updates.html" class="load"></a></div>
<div><a href="dyk3.html" class="load"></a></div>
<div><a href="documentation.html" class="load"></a></div>
</div>
=== renamed file 'ubiquity-slideshow/slides/auto-builds.html' => 'ubiquity-slideshow/slides/repos.html'
--- ubiquity-slideshow/slides/auto-builds.html 2010-05-13 02:44:46 +0000
+++ ubiquity-slideshow/slides/repos.html 2011-10-08 19:37:23 +0000
@@ -1,6 +1,6 @@
<!-- Assume that this slide has been linked to a CSS stylesheet at "link/general.css" -->
-<div class="header"><h1 class="title">Keep up to Date</h1></div>
+<div class="header"><h1 class="title">Upgrade MythTV without upgrading the distribution</h1></div>
<div class="main">
@@ -9,7 +9,7 @@
<li>Mythbuntu developers offer a repository with the latest builds of MythTV, updated frequently.</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/auto-builds">Mythbuntu Auto Builds</a> for more info.</li>
+ <li>Visit <a href="http://www.mythbuntu.org/repos">Mythbuntu Repos</a> for more info.</li>
</ul></div>
</div>
=== renamed file 'ubiquity-slideshow/slides/testing.html' => 'ubiquity-slideshow/slides/updates.html'
--- ubiquity-slideshow/slides/testing.html 2010-03-28 19:36:42 +0000
+++ ubiquity-slideshow/slides/updates.html 2011-10-08 19:37:23 +0000
@@ -1,11 +1,11 @@
-<div class="header"><h1 class="title">Mythbuntu Testing Repository</h1></div>
+<div class="header"><h1 class="title">Mythbuntu Updates Repository</h1></div>
<div class="main">
<div class="content wrap-top"><ul>
- <li>Mythbuntu developers often develop new software and place it in the Mythbuntu Testing repository for community testing.</li>
- <li>Activate this repository and stay up to date on Mythbuntu features that are in the works for the next release.</li>
- <li>Visit <a href="http://www.mythbuntu.org/testingandreporting">Mythbuntu Testing</a> for more info.</li>
+ <li>Mythbuntu developers provide updates to their software via the Mythbuntu Updates repository.</li>
+ <li>Activate this repository and stay up to date on Mythbuntu features.</li>
+ <li>Visit <a href="http://www.mythbuntu.org/repos">Mythbuntu Repos</a> for more info.</li>
</ul></div>
</div>
Follow ups