[Python-apps-commits] r12426 - in packages/gitinspector/trunk/debian/patches (2 files)

[ckk at users.alioth.debian.org]

    Date: Wednesday, September 30, 2015 @ 15:40:56
  Author: ckk
Revision: 12426

d/patches: Refresh patches

Modified:
  packages/gitinspector/trunk/debian/patches/Move-arch-indep-files-to-usr-share.patch
  packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch

Modified: packages/gitinspector/trunk/debian/patches/Move-arch-indep-files-to-usr-share.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Move-arch-indep-files-to-usr-share.patch	2015-09-30 15:40:25 UTC (rev 12425)
+++ packages/gitinspector/trunk/debian/patches/Move-arch-indep-files-to-usr-share.patch	2015-09-30 15:40:56 UTC (rev 12426)
@@ -12,11 +12,11 @@
  setup.py                     | 6 ++++--
  3 files changed, 7 insertions(+), 5 deletions(-)
 
-Index: gitinspector-0.3.2/gitinspector/format.py
+Index: gitinspector-0.4.1/gitinspector/format.py
 ===================================================================
---- gitinspector-0.3.2.orig/gitinspector/format.py
-+++ gitinspector-0.3.2/gitinspector/format.py
-@@ -55,7 +55,7 @@ def __output_html_template__(name):
+--- gitinspector-0.4.1.orig/gitinspector/format.py
++++ gitinspector-0.4.1/gitinspector/format.py
+@@ -59,7 +59,7 @@ def __output_html_template__(name):
  
  def output_header():
  	if __selected_format__ == "html" or __selected_format__ == "htmlembedded":
@@ -25,7 +25,7 @@
  		html_header = __output_html_template__(base + "/html/html.header")
  		tablesorter_js = None
  		flot_js = None
-@@ -102,7 +102,7 @@ def output_header():
+@@ -114,7 +114,7 @@ def output_header():
  
  def output_footer():
  	if __selected_format__ == "html" or __selected_format__ == "htmlembedded":
@@ -34,23 +34,23 @@
  		html_footer = __output_html_template__(base + "/html/html.footer")
  		print(html_footer)
  	elif __selected_format__ == "xml":
-Index: gitinspector-0.3.2/gitinspector/localization.py
+Index: gitinspector-0.4.1/gitinspector/localization.py
 ===================================================================
---- gitinspector-0.3.2.orig/gitinspector/localization.py
-+++ gitinspector-0.3.2/gitinspector/localization.py
-@@ -47,7 +47,7 @@ def init():
- 				lang = locale.getdefaultlocale()
- 				os.environ['LANG'] = lang[0]
+--- gitinspector-0.4.1.orig/gitinspector/localization.py
++++ gitinspector-0.4.1/gitinspector/localization.py
+@@ -55,7 +55,7 @@ def init():
+ 					os.environ['LANG'] = lang[0]
  
--			filename = basedir.get_basedir() + "/translations/messages_%s.mo" % lang[0][0:2]
-+			filename = "/usr/share/gitinspector/translations/messages_%s.mo" % lang[0][0:2]
+ 			if lang[0] is not None:
+-				filename = basedir.get_basedir() + "/translations/messages_%s.mo" % lang[0][0:2]
++				filename = "/usr/share/gitinspector/translations/messages_%s.mo" % lang[0][0:2]
  
- 			try:
- 				__translation__ = gettext.GNUTranslations(open(filename, "rb"))
-Index: gitinspector-0.3.2/setup.py
+ 				try:
+ 					__translation__ = gettext.GNUTranslations(open(filename, "rb"))
+Index: gitinspector-0.4.1/setup.py
 ===================================================================
---- gitinspector-0.3.2.orig/setup.py
-+++ gitinspector-0.3.2/setup.py
+--- gitinspector-0.4.1.orig/setup.py
++++ gitinspector-0.4.1/setup.py
 @@ -45,8 +45,10 @@ setup(
  		"Topic :: Utilities"
  	],

Modified: packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2015-09-30 15:40:25 UTC (rev 12425)
+++ packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2015-09-30 15:40:56 UTC (rev 12426)
@@ -8,11 +8,11 @@
  gitinspector/format.py | 26 +++++++++++++++-----------
  1 file changed, 15 insertions(+), 11 deletions(-)
 
-diff --git a/gitinspector/format.py b/gitinspector/format.py
-index 48014ce..a809945 100644
---- a/gitinspector/format.py
-+++ b/gitinspector/format.py
-@@ -53,20 +53,23 @@ def __output_html_template__(name):
+Index: gitinspector-0.4.1/gitinspector/format.py
+===================================================================
+--- gitinspector-0.4.1.orig/gitinspector/format.py
++++ gitinspector-0.4.1/gitinspector/format.py
+@@ -57,21 +57,23 @@ def __output_html_template__(name):
  	file_r = open(template_path, "rb")
  	return file_r.read().decode("utf-8", "replace")
  
@@ -26,7 +26,8 @@
  	if __selected_format__ == "html" or __selected_format__ == "htmlembedded":
  		base = basedir.get_basedir()
  		html_header = __output_html_template__(base + "/html/html.header")
--		tablesorter_js = __get_zip_file_content__("jquery.tablesorter.min.js", "/html/jquery.tablesorter.min.js.zip")
+-		tablesorter_js = __get_zip_file_content__("jquery.tablesorter.min.js", "/html/jquery.tablesorter.min.js.zip").encode("latin-1", "replace")
+-		tablesorter_js = tablesorter_js.decode("utf-8", "ignore")
 -		flot_js = __get_zip_file_content__("jquery.flot.js")
 -		pie_js = __get_zip_file_content__("jquery.flot.pie.js")
 -		resize_js = __get_zip_file_content__("jquery.flot.resize.js")
@@ -46,7 +47,7 @@
  
  		logo_file = open(base + "/html/gitinspector_piclet.png", "rb")
  		logo = logo_file.read()
-@@ -74,7 +77,8 @@ def output_header():
+@@ -79,7 +81,8 @@ def output_header():
  		logo = base64.b64encode(logo)
  
  		if __selected_format__ == "htmlembedded":
@@ -54,5 +55,5 @@
 +			with open('/usr/share/javascript/jquery/jquery.js') as js:
 +				jquery_js = ">" + js.read()
  		else:
- 			jquery_js = " src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">"
+ 			jquery_js = " src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">"