[Python-apps-commits] r7602 - in packages/openteacher/trunk/debian (3 files)

cjsmo-guest at users.alioth.debian.org cjsmo-guest at users.alioth.debian.org
Tue Oct 4 06:46:48 UTC 2011


    Date: Tuesday, October 4, 2011 @ 06:46:45
  Author: cjsmo-guest
Revision: 7602

added pyqt4-dev-tools and qt4-linguist-tools to B-D, updated 02_compile_all_fix.patch to only remove launchpad integration, update rules to remove *.ts and *.qm file during clean

Modified:
  packages/openteacher/trunk/debian/control
  packages/openteacher/trunk/debian/patches/02_compile_all_fix.patch
  packages/openteacher/trunk/debian/rules

Modified: packages/openteacher/trunk/debian/control
===================================================================
--- packages/openteacher/trunk/debian/control	2011-10-02 20:51:25 UTC (rev 7601)
+++ packages/openteacher/trunk/debian/control	2011-10-04 06:46:45 UTC (rev 7602)
@@ -4,7 +4,7 @@
 Section: misc
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50), python (>= 2.6.6-3~), translate-toolkit,
- pyqt4-dev-tools
+ pyqt4-dev-tools, qt4-linguist-tools
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
 Homepage: http://openteacher.org/

Modified: packages/openteacher/trunk/debian/patches/02_compile_all_fix.patch
===================================================================
--- packages/openteacher/trunk/debian/patches/02_compile_all_fix.patch	2011-10-02 20:51:25 UTC (rev 7601)
+++ packages/openteacher/trunk/debian/patches/02_compile_all_fix.patch	2011-10-04 06:46:45 UTC (rev 7602)
@@ -1,95 +1,38 @@
-Description: Disable launchpad integration, disable ts and qm regeneration.
+Description: Removes Launchpad integration
 Author: Charlie Smotherman <cjsmo at cableone.net>
 
 Index: openteacher-2.2/compile_all.py
 ===================================================================
---- openteacher-2.2.orig/compile_all.py	2011-09-26 20:48:11.466402137 -0500
-+++ openteacher-2.2/compile_all.py	2011-09-26 20:49:55.814402120 -0500
-@@ -10,49 +10,49 @@
- 
- import os
- 
--print "\n\nGenerate new ts-files from po-files\n".upper()
--for po_name in os.listdir("translations"):
--	if po_name.endswith(".po"):
--		ts_name = po_name[:-3] + ".ts"
--		
--		po_path = os.path.join("translations", po_name)
--		ts_path = os.path.join("translations", ts_name)
--
--		check_call(["po2ts", po_path, ts_path])
-+#print "\n\nGenerate new ts-files from po-files\n".upper()
-+#for po_name in os.listdir("translations"):
-+#	if po_name.endswith(".po"):
-+#		ts_name = po_name[:-3] + ".ts"
-+#		
-+#		po_path = os.path.join("translations", po_name)
-+#		ts_path = os.path.join("translations", ts_name)
-+#
-+#		check_call(["po2ts", po_path, ts_path])
+--- openteacher-2.2.orig/compile_all.py	2011-10-04 00:42:08.334299847 -0500
++++ openteacher-2.2/compile_all.py	2011-10-04 00:43:00.762299838 -0500
+@@ -22,12 +22,12 @@
  		#clean up ts file
--		tree = ElementTree.parse(open(ts_path))
--
+ 		tree = ElementTree.parse(open(ts_path))
+ 
 -		for translation in tree.findall("//translation"):
--			translation.text = translation.text.strip()
--		tree.write(ts_path)
--
-+#		tree = ElementTree.parse(open(ts_path))
-+#
-+#		for translation in tree.findall("//translation"):
-+#			translation.text = translation.text.strip()
-+#		tree.write(ts_path)
-+#
++		for translation in tree.findall(".//translation"):
+ 			translation.text = translation.text.strip()
+ 		tree.write(ts_path)
+ 
  		#Add .ts to bzr
 -		check_call(["bzr", "add", ts_path])
--
--print "\n\nUpdate translations from source files.\n".upper()
--check_call("pylupdate4 -noobsolete openteacher.pro".split(" "))
--
--print "\n\nConvert ts-files to po-files for launchpad use, and convert them to .qm for runtime use\n".upper()
--for ts_name in os.listdir("translations"):
--	if ts_name == "translations.ts":
--		check_call(["ts2po", os.path.join("translations", ts_name), "-P",
--                    "translations/translations.pot"])
--	elif ts_name.endswith(".ts"):
--		#po conversion
--		po_name = ts_name[:-3] + ".po"
--		qm_name = ts_name[:-3] + ".qm"
--
--		check_call(["ts2po", os.path.join("translations", ts_name),
--							 os.path.join("translations", po_name)])
 +#		check_call(["bzr", "add", ts_path])
-+#
-+#print "\n\nUpdate translations from source files.\n".upper()
-+#check_call("pylupdate4 -noobsolete openteacher.pro".split(" "))
-+#
-+#print "\n\nConvert ts-files to po-files for launchpad use, and convert them to .qm for runtime use\n".upper()
-+#for ts_name in os.listdir("translations"):
-+#	if ts_name == "translations.ts":
-+#		check_call(["ts2po", os.path.join("translations", ts_name), "-P",
-+#                    "translations/translations.pot"])
-+#	elif ts_name.endswith(".ts"):
-+#		#po conversion
-+#		po_name = ts_name[:-3] + ".po"
-+#		qm_name = ts_name[:-3] + ".qm"
-+#
-+#		check_call(["ts2po", os.path.join("translations", ts_name),
-+#							 os.path.join("translations", po_name)])
+ 
+ print "\n\nUpdate translations from source files.\n".upper()
+ check_call("pylupdate4 -noobsolete openteacher.pro".split(" "))
+@@ -45,13 +45,13 @@
+ 		check_call(["ts2po", os.path.join("translations", ts_name),
+ 							 os.path.join("translations", po_name)])
  		#Add po file to bzr if not already
 -		check_call(["bzr", "add", os.path.join("translations", po_name)])
--
 +#		check_call(["bzr", "add", os.path.join("translations", po_name)])
-+#
+ 
  		#qm conversion
--		check_call(["lrelease", os.path.join("translations", ts_name)])
--
-+#		check_call(["lrelease", os.path.join("translations", ts_name)])
-+#
+ 		check_call(["lrelease", os.path.join("translations", ts_name)])
+ 
  		#Add qm file to bzr if not already
 -		check_call(["bzr", "add", os.path.join("translations", qm_name)])
--
 +#		check_call(["bzr", "add", os.path.join("translations", qm_name)])
-+#
+ 
  print "\n\nCompile application resources\n".upper()
  check_call("pyrcc4 resources.qrc -o src/resources.py".split(" "))
- 

Modified: packages/openteacher/trunk/debian/rules
===================================================================
--- packages/openteacher/trunk/debian/rules	2011-10-02 20:51:25 UTC (rev 7601)
+++ packages/openteacher/trunk/debian/rules	2011-10-04 06:46:45 UTC (rev 7602)
@@ -7,13 +7,22 @@
 	dh $@ --with python2
 
 override_dh_clean:
-	dh_clean 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
+	dh_clean 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/ar.ts translations/ar.qm \
+	translations/da.ts translations/da.qm translations/de.ts translations/de.qm \
+	translations/en_AU.ts translations/en_AU.qm translations/es.ts \
+	translations/es.qm translations/fr.ts translations/fr.qm translations/fy.ts \
+	translations/fy.qm translations/he.ts translations/he.qm translations/hr.ts \
+	translations/hr.qm translations/hu.ts translations/hu.qm translations/id.ts \
+	translations/id.qm translations/it.ts translations/it.qm translations/ja.ts \
+	translations/ja.qm translations/ko.ts translations/ko.qm translations/nb.ts \
+	translations/nb.qm translations/nl.ts translations/nl.qm translations/oc.ts \
+	translations/oc.qm translations/pl.ts translations/pl.qm translations/ro.ts \
+	translations/ro.qm translations/ru.ts translations/ru.qm translations/sl.ts \
+	translations/sl.qm translations/sr.ts translations/sr.qm translations/sv.ts \
+	translations/sv.qm translations/tr.ts translations/tr.qm translations/zh_CN.ts \
+	translations/zh_CN.qm translations/zh_TW.ts translations/zh_TW.qm
 
 override_dh_auto_build:
 	python setup.py update




More information about the Python-apps-commits mailing list