[Python-apps-commits] r10485 - in packages/openteacher/trunk/debian (7 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Thu Feb 6 22:03:46 UTC 2014
Date: Thursday, February 6, 2014 @ 22:03:45
Author: cjsmo-guest
Revision: 10485
refreshed patches, removed minified jquery during clean symlink to system lib Closes: #737447
Modified:
packages/openteacher/trunk/debian/changelog
packages/openteacher/trunk/debian/clean
packages/openteacher/trunk/debian/control
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/10_index_html.patch
packages/openteacher/trunk/debian/patches/series
Modified: packages/openteacher/trunk/debian/changelog
===================================================================
--- packages/openteacher/trunk/debian/changelog 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/changelog 2014-02-06 22:03:45 UTC (rev 10485)
@@ -11,6 +11,9 @@
l-d-o.
- used dos2unix to convert txt files to unix format, this was needed
to correct quilt fuzz.
+ * Updated Vcs-Svn field to correct URL.
+ * Removed jquery-1.9.1.min.js during clean and symlink to system lib.
+ Closes: #737447
* Increased Standard Version to 3.9.5 no changes needed.
-- Charlie Smotherman <cjsmo at cableone.net> Tue, 04 Feb 2014 06:57:24 -0500
Modified: packages/openteacher/trunk/debian/clean
===================================================================
--- packages/openteacher/trunk/debian/clean 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/clean 2014-02-06 22:03:45 UTC (rev 10485)
@@ -20,8 +20,8 @@
openteacher/modules/org/openteacher/packagers/windowsMsi/COPYING.rtf
openteacher/modules/org/openteacher/dataTypeIcons/icons/COPYING
+openteacher/modules/org/openteacher/websiteGenerator/scripts/jquery-1.9.1.min.js
-
openteacher/modules/org/openteacher/maps/latinamerica/resources/COPYING
openteacher/modules/org/openteacher/maps/africa/resources/COPYING
openteacher/modules/org/openteacher/maps/usa/resources/COPYING
Modified: packages/openteacher/trunk/debian/control
===================================================================
--- packages/openteacher/trunk/debian/control 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/control 2014-02-06 22:03:45 UTC (rev 10485)
@@ -15,7 +15,7 @@
Standards-Version: 3.9.5
X-Python-Version: >= 2.5
Homepage: http://openteacher.org/
-Vcs-Svn: http://svn.debian.org/python-apps/packages/openteacher/trunk/
+Vcs-Svn: http://anonscm.debian.org/svn/python-apps/packages/openteacher/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/openteacher/trunk
Package: openteacher
Modified: packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-02-06 22:03:45 UTC (rev 10485)
@@ -1,42 +1,20 @@
-Description: Remove code that 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-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>
+--- a/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html
++++ /dev/null
+@@ -1,16 +0,0 @@
+-<!--(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
-+<!--(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-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-02-06 22:03:45 UTC (rev 10485)
@@ -1,76 +1,37 @@
-Description: Removed code that 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-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>
+--- a/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/using-openteacher-2.html
++++ /dev/null
+@@ -1,33 +0,0 @@
+-<!--(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="" 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="" 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="" 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="" 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/10_index_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-02-06 22:03:45 UTC (rev 10485)
@@ -1,6 +1,6 @@
-Description: Removed code that uses tracking serices
- (privacy-breach-{generic,facebook,google-adsense})
-Author: Charlie Smotherman <cjsmo at cableone.net>
+#Description: Removed code that uses tracking serices
+# (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
===================================================================
Modified: packages/openteacher/trunk/debian/patches/series
===================================================================
--- packages/openteacher/trunk/debian/patches/series 2014-02-05 20:58:47 UTC (rev 10484)
+++ packages/openteacher/trunk/debian/patches/series 2014-02-06 22:03:45 UTC (rev 10485)
@@ -1,7 +1,7 @@
+07_using_openteacher_2_html.patch
+06_install_ubuntu_html.patch
10_index_html.patch
09_download_html.patch
08_base_html.patch
-07_using_openteacher_2_html.patch
-06_install_ubuntu_html.patch
04desktop
05setup_py
More information about the Python-apps-commits
mailing list