[Python-apps-commits] r9264 - in packages/openteacher/trunk/debian (12 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Tue Nov 20 21:39:56 UTC 2012
Date: Tuesday, November 20, 2012 @ 21:39:52
Author: cjsmo-guest
Revision: 9264
* New upstream release.
* Update manpage
* debian/rules
- Generate and install openteacher-32.xpm.
- Fix /usr/bin/openteacher shebang.
* Update debian/copyright to include new content.
* debian/rules exclude courtousy copies of code, and extra license files.
* Removed debian/clean not needed any more.
* Removed debian/docs and debian/doc-base not needed any more.
Modified:
packages/openteacher/trunk/debian/changelog
packages/openteacher/trunk/debian/control
packages/openteacher/trunk/debian/links
packages/openteacher/trunk/debian/menu
packages/openteacher/trunk/debian/openteacher.1
packages/openteacher/trunk/debian/rules
packages/openteacher/trunk/debian/watch
Deleted:
packages/openteacher/trunk/debian/clean
packages/openteacher/trunk/debian/doc-base
packages/openteacher/trunk/debian/docs
packages/openteacher/trunk/debian/install
packages/openteacher/trunk/debian/patches/
Modified: packages/openteacher/trunk/debian/changelog
===================================================================
--- packages/openteacher/trunk/debian/changelog 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/changelog 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,3 +1,17 @@
+openteacher (3.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Update manpage
+ * debian/rules
+ - Generate and install openteacher-32.xpm.
+ - Fix /usr/bin/openteacher shebang.
+ * Update debian/copyright to include new content.
+ * debian/rules exclude courtousy copies of code, and extra license files.
+ * Removed debian/clean not needed any more.
+ * Removed debian/docs and debian/doc-base not needed any more.
+
+ -- Charlie Smotherman <cjsmo at cableone.net> Tue, 20 Nov 2012 15:32:27 -0500
+
openteacher (2.3-1) unstable; urgency=low
* New upstream release.
Deleted: packages/openteacher/trunk/debian/clean
===================================================================
--- packages/openteacher/trunk/debian/clean 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/clean 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,11 +0,0 @@
-src/resources.py
-src/gui/about.py
-src/gui/icons_rc.py
-src/gui/openteacher.py
-src/gui/settings.py
-src/gui/wrtsListChoice.py
-src/gui/wrtsLogin.py
-translations/*.ts
-translations/*.qm
-translations/*.po
-translations/*.pot
Modified: packages/openteacher/trunk/debian/control
===================================================================
--- packages/openteacher/trunk/debian/control 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/control 2012-11-20 21:39:52 UTC (rev 9264)
@@ -3,8 +3,16 @@
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Section: misc
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), translate-toolkit,
- pyqt4-dev-tools, qt4-linguist-tools, imagemagick, libicu48
+Build-Depends: debhelper (>= 7.0.50),
+ python (>= 2.6.6-3~),
+ python-qt4,
+ python-qt4-gl,
+ python-qt4-phonon,
+ libqt4-opengl,
+ pyqt4-dev-tools,
+ qt4-linguist-tools,
+ espeak,
+ imagemagick
Standards-Version: 3.9.3
X-Python-Version: >= 2.5
Homepage: http://openteacher.org/
@@ -13,7 +21,9 @@
Package: openteacher
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-qt4, hicolor-icon-theme
+Depends: ${misc:Depends}, ${python:Depends}, libjs-jquery-tablesorter,
+ libjs-jquery
+Suggests: hicolor-icon-theme
Description: learn words in a foreign language
OpenTeacher is an application that helps you in learning a foreign
language vocabulary. Just enter some words in your native or foreign
Deleted: packages/openteacher/trunk/debian/doc-base
===================================================================
--- packages/openteacher/trunk/debian/doc-base 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/doc-base 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,9 +0,0 @@
-Document: openteacher
-Title: OpenTeacher reference
-Author: David D Lowe <daviddlowe.flimm at gmail.com>
-Abstract: This manual describes OpenTeachers basic functions.
-Section: Help/Books
-
-Format: HTML
-Index: /usr/share/doc/openteacher/index.html
-Files: /usr/share/doc/openteacher/static/*.png
Deleted: packages/openteacher/trunk/debian/docs
===================================================================
--- packages/openteacher/trunk/debian/docs 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/docs 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,3 +0,0 @@
-NEWS
-README
-docs/*
Deleted: packages/openteacher/trunk/debian/install
===================================================================
--- packages/openteacher/trunk/debian/install 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/install 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,3 +0,0 @@
-linux/openteacher.desktop /usr/share/applications
-linux/openteacher.png /usr/share/icons/hicolor/48x48/apps
-translations /usr/share/openteacher
Modified: packages/openteacher/trunk/debian/links
===================================================================
--- packages/openteacher/trunk/debian/links 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/links 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1 +1,10 @@
-usr/share/openteacher/openteacher /usr/bin/openteacher
+usr/share/javascript/jquery/jquery.js usr/share/openteacher/openteacher/modules/org/openteacher/codeDocs/resources/jquery.js
+
+usr/share/javascript/jquery-tablesorter/jquery.tablesorter.js usr/share/openteacher/openteacher/modules/org/openteacher/codeDocs/resources/jquery.tablesorter.js
+
+usr/share/javascript/jquery/jquery.js usr/share/openteacher/openteacher/modules/org/openteacher/testserver/admin_files/js/jquery.js
+
+usr/share/javascript/jquery/jquery.min.js usr/share/openteacher/openteacher/modules/org/openteacher/testserver/admin_files/js/jquery.min.js
+
+usr/share/common-licenses/GPL-3 /usr/share/openteacher/openteacher/modules/org/openteacher/metadata/license.txt
+
Modified: packages/openteacher/trunk/debian/menu
===================================================================
--- packages/openteacher/trunk/debian/menu 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/menu 2012-11-20 21:39:52 UTC (rev 9264)
@@ -2,4 +2,4 @@
section="Applications/Education" \
title="OpenTeacher" \
command="/usr/bin/openteacher" \
- icon="/usr/share/pixmaps/openteacher.xpm"
+ icon="/usr/share/pixmaps/openteacher-32.xpm"
Modified: packages/openteacher/trunk/debian/openteacher.1
===================================================================
--- packages/openteacher/trunk/debian/openteacher.1 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/openteacher.1 2012-11-20 21:39:52 UTC (rev 9264)
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH OPENTEACHER 1 "July 21, 2011"
+.TH OPENTEACHER 1 "November 1, 2012"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -18,20 +18,10 @@
.SH NAME
openteacher \- Learn words in a foreign language
.SH SYNOPSIS
-.B openteacher
-.RI [filename]
+.B openteacher -p
+.RI [profile]
.br
-.PP
-filename is name of file which contains list of words and was
-created by openteacher previously.
-.br
.SH DESCRIPTION
-This manual page documents briefly
-.B OpenTeacher.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
OpenTeacher helps you to learn a foreign language. Just enter some words in
your native or foreign language, and OpenTeacher tests you.
@@ -48,20 +38,79 @@
* txt-output to print or send
* Available in English and Dutch
-.br
-.SH OPERATION
-.PP
-When openteacher starts, the user can do any of the following
-Enter list: User enters a list of words in the format '<known word> = <foreign word>'
-and optionally save the list. Alternatively, the user can open an already
-existing word list created earlier using openteacher.
-
-Teach Me: Questions will be asked from current loaded list of words.
-.br
+
+.SH USER PROFILES
+
+.TP
+\fB all\fR\fR
+Enable every OpenTeacher GUI feature.
+
+.TP
+\fB selfstudy\fR\fR
+Everything you need for using OpenTeacher for self-study.
+
+.TP
+\fB student at home\fR\fR
+Features for students using OpenTeacher at home.
+
+.TP
+\fB student at school\fR\fR
+Features for students using OpenTeacher at school.
+
+.TP
+\fB wordsonly\fR\fR
+Just gimme my good old OpenTeacher 2.x!
+
+
+.SH DEVELOPER PROFILES
+.TP
+\fB codedocumentation\fR\fR
+Code documentation web server.
+
+.TP
+\fB get-translation-authors\fR\fR
+Gathers a list of all translators of OpenTeacher in Python code format.
+
+.TP
+\fB help\fR\fR
+Shows an overview of all documented available profiles.
+
+.TP
+\fB ircbot\fR\fR
+Starts the IRC bot used in the #openteacher channel at irc.freenode.net.
+
+.TP
+\fB module-graph\fR\fR
+Builds a graph of all modules and how they are related.
+
+.TP
+\fB package-debian\fR\fR
+Packages this installation into a .deb package.
+
+.TP
+\fB package-source\fR\fR
+Packages the source of this installation into a zip file.
+
+.TP
+\fB package-source-with-setup\fR\fR
+Packages the source of this installation into a tarball, and includes a setup.py file.
+
+.TP
+\fB shell\fR\fR
+Starts an interactive python shell with a module manager with all modules loaded.
+
+.TP
+\fB testsuite\fR\fR
+Run the test suite.
+
+.TP
+\fB update-translations\fR\fR
+Updater for all .pot and .po files.
+
.SH AUTHOR
OpenTeacher was written by Milan Boers, Marten de Vries, Roel Huybrechts,
Cas Widdershoven and David D Lowe.
.PP
-This manual page was written by Arvind S Raj <sraj.arvind at gmail.com>,
+This manual page was written by Charlie Smotherman <cjsmo at cableone.net>,
for the Debian project (and may be used by others).
Modified: packages/openteacher/trunk/debian/rules
===================================================================
--- packages/openteacher/trunk/debian/rules 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/rules 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,22 +1,24 @@
#!/usr/bin/make -f
-DESTDIR = $(CURDIR)/debian/openteacher
-pork=$(DESTDIR)/usr/share/openteacher*.egg-info
-beef=$(DESTDIR)/usr/share/openteacher
+DESTDIR=$(CURDIR)/debian/openteacher/usr/share/openteacher
+PICDIR=$(CURDIR)/debian/openteacher/usr/share/icons/hicolor/128x128/mimetypes
+EGGG=$(CURDIR)/debian/openteacher/usr/share/openteacher/OpenTeacher*.egg-info
+
%:
dh $@ --with python2
-override_dh_auto_build:
- python setup.py update
- dh_auto_build
-
override_dh_auto_install:
- dh_auto_install -- --install-scripts=/usr/share \
- --install-lib=/usr/share
- mkdir -p $(DESTDIR)/usr/share/pixmaps
- convert $(CURDIR)/icons/openteacher-icon.png -resize 32 \
- $(DESTDIR)/usr/share/pixmaps/openteacher.xpm; \
+ dh_auto_install -- --install-layout=deb --install-scripts=/usr/share/openteacher \
+ --install-lib=/usr/share/openteacher
override_dh_install:
- mv $(pork) $(beef)
- dh_install
+ find $(CURDIR) \( -name 'jquery.tablesorter.js' -o -name 'jquery.js' -o -name 'license.txt' -o -name 'COPYING' -o -name 'COPYING.rtf' \) -delete
+ mv $(EGGG) $(DESTDIR)/openteacher
+ mv $(DESTDIR)/openteacher/openteacher $(DESTDIR)/run
+ sed -i 's,^#!/usr/bin/env python,#!/usr/bin/python,' $(DESTDIR)/run
+ dh_link /usr/share/openteacher/run /usr/bin/openteacher
+ mkdir -p $(CURDIR)/debian/openteacher/usr/share/pixmaps
+ convert $(PICDIR)/application-x-openteacher.png -resize 32 \
+ $(CURDIR)/debian/openteacher/usr/share/pixmaps/openteacher-32.xpm;
+
+
Modified: packages/openteacher/trunk/debian/watch
===================================================================
--- packages/openteacher/trunk/debian/watch 2012-11-19 22:42:55 UTC (rev 9263)
+++ packages/openteacher/trunk/debian/watch 2012-11-20 21:39:52 UTC (rev 9264)
@@ -1,3 +1,3 @@
version=3
-https://launchpad.net/openteacher/+download https://launchpad.net/openteacher/.*/openteacher-(.+).tar.gz
+https://launchpad.net/openteacher/+download https://launchpad.net/openteacher/.*/openteacher-(.+)-source.tar.gz
More information about the Python-apps-commits
mailing list