[Python-apps-commits] r10466 - in packages/openteacher/trunk/debian/patches (6 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Tue Feb 4 11:40:19 UTC 2014
Date: Tuesday, February 4, 2014 @ 11:40:18
Author: cjsmo-guest
Revision: 10466
make use of dos2unix before creating the needed patches
Modified:
packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch
packages/openteacher/trunk/debian/patches/08_base_html.patch
packages/openteacher/trunk/debian/patches/09_download_html.patch
packages/openteacher/trunk/debian/patches/10_index_html.patch
packages/openteacher/trunk/debian/patches/series
Modified: packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,23 +1,39 @@
-Description: Removed code which uses tracking services (privacy-breach-generic)
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html
===================================================================
---- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-02 23:34:17.787080868 -0600
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-02 23:35:42.299078851 -0600
-@@ -7,10 +7,10 @@
- <ol>
- <li>@!tr('Download the Ubuntu .deb file from the Download section of this website.')!@</li>
- <li>@!tr('When the download has completed, doubleclick the .deb file you just downloaded. This will open the Ubuntu Software Center.')!@<br />
-- <a href="http://www.milanboers.nl/openteacher/images/doc/inst1.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst1.png" alt="Ubuntu Software Center" /></a>
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
- </li>
- <li>@!tr('Click "install" to start the installation.')!@</li>
- <li>@!tr('When the installation has finished, you can start OpenTeacher from Applications -> Education -> OpenTeacher.')!@<br />
-- <a href="http://www.milanboers.nl/openteacher/images/doc/inst2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst2.png" alt="OpenTeacher" /></a>
-- </li>
+--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-04 04:13:42.520619077 -0600
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-02-04 04:15:12.300616934 -0600
+@@ -1,16 +1,17 @@
+-<!--(set_escape)-->
+-None
+-<!--(end)-->
+-
+-<h1>@!tr('Installing OpenTeacher in Ubuntu')!@</h1>
+-<p>@!tr('This simple guide explains how to install OpenTeacher for Ubuntu. I will be using Ubuntu 10.10 (Maverick Meerkat) for this.')!@</p>
+-<ol>
+- <li>@!tr('Download the Ubuntu .deb file from the Download section of this website.')!@</li>
+- <li>@!tr('When the download has completed, doubleclick the .deb file you just downloaded. This will open the Ubuntu Software Center.')!@<br />
+- <a href="http://www.milanboers.nl/openteacher/images/doc/inst1.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst1.png" alt="Ubuntu Software Center" /></a>
+- </li>
+- <li>@!tr('Click "install" to start the installation.')!@</li>
+- <li>@!tr('When the installation has finished, you can start OpenTeacher from Applications -> Education -> OpenTeacher.')!@<br />
+- <a href="http://www.milanboers.nl/openteacher/images/doc/inst2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst2.png" alt="OpenTeacher" /></a>
+- </li>
-</ol>
\ No newline at end of file
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a></li></ol>
++<!--(set_escape)-->
++None
++<!--(end)-->
+
++<h1>@!tr('Installing OpenTeacher in Ubuntu')!@</h1>
++<p>@!tr('This simple guide explains how to install OpenTeacher for Ubuntu. I will be using Ubuntu 10.10 (Maverick Meerkat) for this.')!@</p>
++<ol>
++ <li>@!tr('Download the Ubuntu .deb file from the Download section of this website.')!@</li>
++ <li>@!tr('When the download has completed, doubleclick the .deb file you just downloaded. This will open the Ubuntu Software Center.')!@<br />
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
++ </li>
++ <li>@!tr('Click "install" to start the installation.')!@</li>
++ <li>@!tr('When the installation has finished, you can start OpenTeacher from Applications -> Education -> OpenTeacher.')!@<br />
++ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a>
++ </li>
++</ol>
+
Modified: packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,42 +1,73 @@
-Description: Removed code which uses tracking services (privacy-breach-generic)
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2014-02-02 23:41:34.923070437 -0600
-@@ -9,25 +9,24 @@
- <p>@!tr('The screenshots are all taken in Ubuntu, but this should all work exactly the same in Windows and Mac OS X.')!@</p>
- <ol>
- <li>@!tr('Start OpenTeacher')!@<br />
-- <a href="http://www.milanboers.nl/openteacher/images/doc/inst2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst2.png" alt="OpenTeacher" /></a>
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html 2014-02-04 04:34:33.800589218 -0600
+@@ -1,33 +1,34 @@
+-<!--(set_escape)-->
+-None
+-<!--(end)-->
+-
+-<h1>@!tr('Using OpenTeacher 2: A Quick Start')!@</h1>
+-
+-<p>@!tr('This quick start guide shows you how to do a simple self-test using OpenTeacher 2. We\'re going to learn counting to ten in French today! For this example we are assuming that you already know English, and you want to learn French.')!@</p>
+-
+-<p>@!tr('The screenshots are all taken in Ubuntu, but this should all work exactly the same in Windows and Mac OS X.')!@</p>
+-<ol>
+- <li>@!tr('Start OpenTeacher')!@<br />
+- <a href="http://www.milanboers.nl/openteacher/images/doc/inst2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/inst2.png" alt="OpenTeacher" /></a>
+- </li>
+- <li>
+- <p>@!tr('Enter a title for the word list you are going to enter. Also enter the known language, which, in our case, is English, and the foreign language (the language you want to learn), which, in our case, is French.')!@</p>
+- <p>@!tr('Then enter all words you want to learn, seperating the foreign and known language by =, and the words by newlines (see the screenshot for an example).')!@</p>
+- <a href="http://www.milanboers.nl/openteacher/images/doc/qs2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs2.png" alt="OpenTeacher" /></a>
+- </li>
+- <li>
+- <p>@!tr('Click "Enter!". Now the table of words on the bottom will be filled with your words. You have now successfully made your word list!')!@</p>
+- <a href="http://www.milanboers.nl/openteacher/images/doc/qs3.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs3.png" alt="Ubuntu Software Center" /></a>
+- </li>
+- <li>
+- <p>@!tr('Click the "Teach me!" tab on the top to start the test. A word will now be asked to you in your own language, and you have to type the translation of it in the text field. When you have entered the translation, press Enter on your keyboard, or click "Check!"')!@</p>
+- <a href="http://www.milanboers.nl/openteacher/images/doc/qs4.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs4.png" alt="Ubuntu Software Center" /></a>
+- <p>@!tr('If you entered the right translation, the next question will be asked to you. If you did not enter the right translation, OpenTeacher will show you the correct answer, and the difference from your answer.')!@</p>
+- <a href="http://www.milanboers.nl/openteacher/images/doc/qs5.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs5.png" alt="Ubuntu Software Center" /></a>
+- </li>
+- <li>
+- <p>@!tr('Once the test is completed, OpenTeacher will tell you if you did well by giving you a "note" (grade).')!@</p>
+- <a href="http://www.milanboers.nl/openteacher/images/doc/qs6.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs6.png" alt="Ubuntu Software Center" /></a>
+- </li>
+-</ol>
+\ No newline at end of file
++<!--(set_escape)-->
++None
++<!--(end)-->
++
++<h1>@!tr('Using OpenTeacher 2: A Quick Start')!@</h1>
++
++<p>@!tr('This quick start guide shows you how to do a simple self-test using OpenTeacher 2. We\'re going to learn counting to ten in French today! For this example we are assuming that you already know English, and you want to learn French.')!@</p>
++
++<p>@!tr('The screenshots are all taken in Ubuntu, but this should all work exactly the same in Windows and Mac OS X.')!@</p>
++<ol>
++ <li>@!tr('Start OpenTeacher')!@<br />
+ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a>
- </li>
- <li>
- <p>@!tr('Enter a title for the word list you are going to enter. Also enter the known language, which, in our case, is English, and the foreign language (the language you want to learn), which, in our case, is French.')!@</p>
- <p>@!tr('Then enter all words you want to learn, seperating the foreign and known language by =, and the words by newlines (see the screenshot for an example).')!@</p>
-- <a href="http://www.milanboers.nl/openteacher/images/doc/qs2.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs2.png" alt="OpenTeacher" /></a>
++ </li>
++ <li>
++ <p>@!tr('Enter a title for the word list you are going to enter. Also enter the known language, which, in our case, is English, and the foreign language (the language you want to learn), which, in our case, is French.')!@</p>
++ <p>@!tr('Then enter all words you want to learn, seperating the foreign and known language by =, and the words by newlines (see the screenshot for an example).')!@</p>
+ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a>
- </li>
- <li>
- <p>@!tr('Click "Enter!". Now the table of words on the bottom will be filled with your words. You have now successfully made your word list!')!@</p>
-- <a href="http://www.milanboers.nl/openteacher/images/doc/qs3.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs3.png" alt="Ubuntu Software Center" /></a>
++ </li>
++ <li>
++ <p>@!tr('Click "Enter!". Now the table of words on the bottom will be filled with your words. You have now successfully made your word list!')!@</p>
+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
- </li>
- <li>
- <p>@!tr('Click the "Teach me!" tab on the top to start the test. A word will now be asked to you in your own language, and you have to type the translation of it in the text field. When you have entered the translation, press Enter on your keyboard, or click "Check!"')!@</p>
-- <a href="http://www.milanboers.nl/openteacher/images/doc/qs4.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs4.png" alt="Ubuntu Software Center" /></a>
++ </li>
++ <li>
++ <p>@!tr('Click the "Teach me!" tab on the top to start the test. A word will now be asked to you in your own language, and you have to type the translation of it in the text field. When you have entered the translation, press Enter on your keyboard, or click "Check!"')!@</p>
+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
- <p>@!tr('If you entered the right translation, the next question will be asked to you. If you did not enter the right translation, OpenTeacher will show you the correct answer, and the difference from your answer.')!@</p>
-- <a href="http://www.milanboers.nl/openteacher/images/doc/qs5.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs5.png" alt="Ubuntu Software Center" /></a>
-- </li>
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a></li>
- <li>
- <p>@!tr('Once the test is completed, OpenTeacher will tell you if you did well by giving you a "note" (grade).')!@</p>
-- <a href="http://www.milanboers.nl/openteacher/images/doc/qs6.png" target="_blank"><img class="docThumb" src="http://www.milanboers.nl/openteacher/images/doc/qs6.png" alt="Ubuntu Software Center" /></a>
-- </li>
--</ol>
-\ No newline at end of file
-+ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a></li></ol>
++ <p>@!tr('If you entered the right translation, the next question will be asked to you. If you did not enter the right translation, OpenTeacher will show you the correct answer, and the difference from your answer.')!@</p>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
++ </li>
++ <li>
++ <p>@!tr('Once the test is completed, OpenTeacher will tell you if you did well by giving you a "note" (grade).')!@</p>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
++ </li>
++</ol>
+
-+
Modified: packages/openteacher/trunk/debian/patches/08_base_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/08_base_html.patch 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/08_base_html.patch 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,12 +1,8 @@
-Description: Removed code which uses tracking services
- (privacy-breach-google-adsense)
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2014-02-02 23:50:38.883057456 -0600
-@@ -6,35 +6,13 @@
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/base.html 2014-02-04 05:01:06.104551221 -0600
+@@ -6,35 +6,15 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -28,8 +24,8 @@
<script type="text/javascript">
-// Set current menu item
-selectedMenuItem = '#@!pageName!@Link';
--</script>
--<script type="text/javascript">
+ </script>
+ <script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-4568688-9']);
-_gaq.push(['_trackPageview']);
Modified: packages/openteacher/trunk/debian/patches/09_download_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/09_download_html.patch 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/09_download_html.patch 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,24 +1,19 @@
-Description: Removed code which uses tracking services
- (privacy-breach-{generic,facebook})
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2014-02-02 23:53:52.395052839 -0600
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/download.html 2014-02-04 05:04:36.328546205 -0600
@@ -83,9 +83,10 @@
</div>
<div class="center">
-<iframe src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FOpenTeacher%2F128284743904373&width=292&colorscheme=light&show_faces=false&stream=false&header=false&height=62" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:292px; height:62px;" allowTransparency="true"></iframe>
-+<iframe src=""></iframe>
++<iframe></iframe>
-<a href="http://twitter.com/share" class="twitter-share-button" data-count="vertical" data-via="openteacher">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<a href="">Tweet</a>
<br />
--<img src="../images/information.png" alt="" style="width:500px" />
+ <img src="../images/information.png" alt="" style="width:500px" />
-</div>
\ No newline at end of file
-+<img src="../images/information.png" alt="" style="width:500px" /></div>
++</div>
+
-+
Modified: packages/openteacher/trunk/debian/patches/10_index_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,17 +1,13 @@
-Description: Removed code which uses tracking services
- (privacy-breach-{generic,facebook,google-adsense})
-Author: Charlie Smotherman <cjsmo at cableone.net>
-
Index: openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html
===================================================================
--- openteacher_3.2.orig.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2013-03-31 02:46:26.000000000 -0500
-+++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2014-02-02 23:58:14.955046573 -0600
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/templates/index.html 2014-02-04 05:18:09.144526809 -0600
@@ -43,22 +43,23 @@
<!-- NOT XHTML STRICT (But not our problem ;D) -->
<!-- Facebook -->
- <iframe src="http://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.facebook.com%2Fpages%2FOpenTeacher%2F128284743904373&layout=button_count&show_faces=false&width=450&action=like&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:115px; height:21px;" allowTransparency="true"></iframe>
-+ <iframe src=""></iframe>
++ <iframe></iframe>
<!-- Twitter -->
- <a href="http://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="openteacher">Tweet</a><script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
@@ -19,7 +15,7 @@
<!-- Hyves -->
- <iframe src="http://www.hyves.nl/respect/button?url=http%3A%2F%2Fopenteacher.hyves.nl" style="border: medium none; overflow:hidden; width:130px; height:21px;" scrolling="no" frameborder="0" allowTransparency="true" ></iframe>
-+ <iframe src="" ></iframe>
++ <iframe></iframe>
<!-- Stumbleupon -->
- <script src="http://www.stumbleupon.com/hostedbadge.php?s=2"></script>
Modified: packages/openteacher/trunk/debian/patches/series
===================================================================
--- packages/openteacher/trunk/debian/patches/series 2014-02-03 19:49:04 UTC (rev 10465)
+++ packages/openteacher/trunk/debian/patches/series 2014-02-04 11:40:18 UTC (rev 10466)
@@ -1,7 +1,7 @@
+10_index_html.patch
+09_download_html.patch
+08_base_html.patch
+07_using_openteacher_2_html.patch
06_install_ubuntu_html.patch
-07_using_openteacher_2_html.patch
-08_base_html.patch
-09_download_html.patch
-10_index_html.patch
04desktop
05setup_py
More information about the Python-apps-commits
mailing list