[Python-apps-commits] r10405 - in packages/openteacher/trunk/debian (8 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Sun Jan 26 01:57:27 UTC 2014
Date: Sunday, January 26, 2014 @ 01:57:26
Author: cjsmo-guest
Revision: 10405
added patches to correct privacy-breach-{generic,facebook,google-adsense} lintian errors
Added:
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/09_download_html.patch
packages/openteacher/trunk/debian/patches/10_index_html.patch
Modified:
packages/openteacher/trunk/debian/changelog
packages/openteacher/trunk/debian/clean
packages/openteacher/trunk/debian/links
packages/openteacher/trunk/debian/patches/series
Modified: packages/openteacher/trunk/debian/changelog
===================================================================
--- packages/openteacher/trunk/debian/changelog 2014-01-25 00:41:05 UTC (rev 10404)
+++ packages/openteacher/trunk/debian/changelog 2014-01-26 01:57:26 UTC (rev 10405)
@@ -1,12 +1,17 @@
openteacher (3.2-2) unstable; urgency=low
- * After discussion with upstream it was decided to remove all html files
- from openteacher/modules/org/openteacher/websiteGenerator. This corrects
- the lintian error privacy-breach-google-adsense as reported on l-d-o.
- * Removed not needed symlinks from debian/links due to above changes.
+ * Added debian/patches:
+ - 06_install_ubuntu_html.patch.
+ - 07_using_openteacher_2_html.patch.
+ - 08_base_html.patch.
+ - 09_download_html.patch.
+ - 10_index_html.patch
+ - This corrects the lintian errors privacy-breach-generic,
+ privacy-breach-google-adsense, privacy-breach-facebook as reported on
+ l-d-o.
* Increased Standard Version to 3.9.5 no changes needed.
- -- Charlie Smotherman <cjsmo at cableone.net> Wed, 22 Jan 2014 11:21:43 -0500
+ -- Charlie Smotherman <cjsmo at cableone.net> Sat, 25 Jan 2014 05:43:43 -0500
openteacher (3.2-1) unstable; urgency=low
Modified: packages/openteacher/trunk/debian/clean
===================================================================
--- packages/openteacher/trunk/debian/clean 2014-01-25 00:41:05 UTC (rev 10404)
+++ packages/openteacher/trunk/debian/clean 2014-01-26 01:57:26 UTC (rev 10405)
@@ -20,10 +20,8 @@
openteacher/modules/org/openteacher/packagers/windowsMsi/COPYING.rtf
openteacher/modules/org/openteacher/dataTypeIcons/icons/COPYING
-openteacher/modules/org/openteacher/websiteGenerator/templates/*.html
-openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/*.html
-openteacher/modules/org/openteacher/websiteGenerator/*.html
+
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/links
===================================================================
--- packages/openteacher/trunk/debian/links 2014-01-25 00:41:05 UTC (rev 10404)
+++ packages/openteacher/trunk/debian/links 2014-01-26 01:57:26 UTC (rev 10405)
@@ -66,6 +66,59 @@
usr/share/openteacher/pics/media.png usr/lib/openteacher/openteacher/modules/org/openteacher/dataTypeIcons/icons/media.png
+usr/share/javascript/jquery/jquery-1.9.1.min.js usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/scripts/jquery-1.9.1.min.js
+usr/share/openteacher/pics/information.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/information.png
+
+usr/share/openteacher/pics/gnu150.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/gnu150.png
+
+usr/share/openteacher/pics/qs6.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/qs6.png
+
+usr/share/openteacher/pics/qs2.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/qs2.png
+
+usr/share/openteacher/pics/qs4.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/qs4.png
+
+usr/share/openteacher/pics/inst1.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/inst1.png
+
+usr/share/openteacher/pics/qs5.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/qs5.png
+
+usr/share/openteacher/pics/qs3.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/qs3.png
+
+usr/share/openteacher/pics/inst2.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/docs/2/inst2.png
+
+usr/share/openteacher/pics/3.0-windows-topo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-topo.png
+
+usr/share/openteacher/pics/3.0-windows-topo-thumb.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-topo-thumb.png
+
+usr/share/openteacher/pics/3.0-windows-teach-thumb.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-teach-thumb.png
+
+usr/share/openteacher/pics/3.0-ubuntu-enter.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-ubuntu-enter.png
+
+usr/share/openteacher/pics/2.-test-mac-thumb.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/2.-test-mac-thumb.png
+
+usr/share/openteacher/pics/3.0-windows-teach.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-teach.png
+
+usr/share/openteacher/pics/3.0-windows-media-thumb.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-media-thumb.png
+
+usr/share/openteacher/pics/3.0-ubuntu-enter-thumb.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-ubuntu-enter-thumb.png
+
+usr/share/openteacher/pics/2.-test-mac.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/2.-test-mac.png
+
+usr/share/openteacher/pics/3.0-windows-media.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/screens/3.0-windows-media.png
+
+usr/share/openteacher/pics/winlogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/winlogo.png
+
+usr/share/openteacher/pics/opensuselogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/opensuselogo.png
+
+usr/share/openteacher/pics/fedoralogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/fedoralogo.png
+
+usr/share/openteacher/pics/tuxlogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/tuxlogo.png
+
+usr/share/openteacher/pics/archlogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/archlogo.png
+
+usr/share/openteacher/pics/osxlogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/osxlogo.png
+
+usr/share/openteacher/pics/ubulogo.png usr/lib/openteacher/openteacher/modules/org/openteacher/websiteGenerator/images/oslogos/ubulogo.png
+
usr/share/openteacher/pics/maps/latinamerica/map.gif usr/lib/openteacher/openteacher/modules/org/openteacher/maps/latinamerica/resources/map.gif
usr/share/openteacher/pics/maps/africa/map.gif usr/lib/openteacher/openteacher/modules/org/openteacher/maps/africa/resources/map.gif
usr/share/openteacher/pics/maps/usa/map.gif usr/lib/openteacher/openteacher/modules/org/openteacher/maps/usa/resources/map.gif
Added: packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch (rev 0)
+++ packages/openteacher/trunk/debian/patches/06_install_ubuntu_html.patch 2014-01-26 01:57:26 UTC (rev 10405)
@@ -0,0 +1,22 @@
+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 2013-03-31 02:46:26.000000000 -0500
++++ openteacher_3.2.orig/openteacher/modules/org/openteacher/websiteGenerator/docsTemplates/install-ubuntu.html 2014-01-23 18:57:01.295554000 -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>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="OpenTeacher" /></a>
+ </li>
+-</ol>
+\ No newline at end of file
++</ol>
Added: packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch (rev 0)
+++ packages/openteacher/trunk/debian/patches/07_using_openteacher_2_html.patch 2014-01-26 01:57:26 UTC (rev 10405)
@@ -0,0 +1,41 @@
+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-01-23 19:03:45.943555000 -0600
+@@ -9,25 +9,25 @@
+ <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>
++ <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>
++ <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>
++ <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>
++ <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>
++ <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>
++ <a href="" target="_blank"><img class="docThumb" src="" alt="Ubuntu Software Center" /></a>
+ </li>
+-</ol>
+\ No newline at end of file
++</ol>
Added: packages/openteacher/trunk/debian/patches/09_download_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/09_download_html.patch (rev 0)
+++ packages/openteacher/trunk/debian/patches/09_download_html.patch 2014-01-26 01:57:26 UTC (rev 10405)
@@ -0,0 +1,23 @@
+Description: Removed code which uses facebook tracking services
+ (privacy-breach-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-01-23 19:10:52.779556000 -0600
+@@ -83,9 +83,9 @@
+ </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>
++
+
+-<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>
+ <br />
+ <img src="../images/information.png" alt="" style="width:500px" />
+-</div>
+\ No newline at end of file
++</div>
Added: packages/openteacher/trunk/debian/patches/10_index_html.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/10_index_html.patch (rev 0)
+++ packages/openteacher/trunk/debian/patches/10_index_html.patch 2014-01-26 01:57:26 UTC (rev 10405)
@@ -0,0 +1,38 @@
+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/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-01-23 19:21:43.007558000 -0600
+@@ -43,22 +43,22 @@
+ <!-- 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>
+
+ <!-- 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>
++ <a href="">Tweet</a>
+
+ <!-- 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>
+
+ <!-- Stumbleupon -->
+- <script src="http://www.stumbleupon.com/hostedbadge.php?s=2"></script>
++ <script src=""></script>
+
+ <!-- Google +1 -->
+- <g:plusone size="medium"></g:plusone>
++
+
+ <!-- Google+ -->
+- <a href="https://plus.google.com/110111932125055034719/?prsrc=3" style="text-decoration: none;"><img src="https://ssl.gstatic.com/images/icons/gplus-16.png" width="16" height="16" style="border: 0;"/></a>
++ <a href=""/></a>
+ </div>
+ <!-- Google +1 -->
+-<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
+\ No newline at end of file
++<script type="text/javascript" src=""></script>
Modified: packages/openteacher/trunk/debian/patches/series
===================================================================
--- packages/openteacher/trunk/debian/patches/series 2014-01-25 00:41:05 UTC (rev 10404)
+++ packages/openteacher/trunk/debian/patches/series 2014-01-26 01:57:26 UTC (rev 10405)
@@ -1,2 +1,7 @@
+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