[Python-apps-commits] r13406 - in packages/gitinspector/tags (5 files)

ckk at users.alioth.debian.org ckk at users.alioth.debian.org
Tue Jul 19 18:52:44 UTC 2016


    Date: Tuesday, July 19, 2016 @ 18:52:43
  Author: ckk
Revision: 13406

[svn-buildpackage] Tagging gitinspector 0.4.4+dfsg-3

Added:
  packages/gitinspector/tags/0.4.4+dfsg-3/
  packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog
    (from rev 13405, packages/gitinspector/trunk/debian/changelog)
  packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch
    (from rev 13404, packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch)
Deleted:
  packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog
  packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch

Deleted: packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog
===================================================================
--- packages/gitinspector/trunk/debian/changelog	2016-04-17 18:33:48 UTC (rev 13090)
+++ packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog	2016-07-19 18:52:43 UTC (rev 13406)
@@ -1,82 +0,0 @@
-gitinspector (0.4.4+dfsg-2) unstable; urgency=medium
-
-  * d/control:
-    - Bump Standards-Version to 3.9.8 (no changes needed)
-
- -- Christian Kastner <ckk at debian.org>  Sun, 17 Apr 2016 19:58:39 +0200
-
-gitinspector (0.4.4+dfsg-1) unstable; urgency=medium
-
-  * New upstream release. 
-  * d/control:
-    - Bump Standards-Version to 3.9.7 (no changes needed)
-    - Switch Vcs-Browser from insecure URI to secure one
-
- -- Christian Kastner <ckk at debian.org>  Sun, 07 Feb 2016 17:12:42 +0100
-
-gitinspector (0.4.3+dfsg-1) unstable; urgency=medium
-
-  * New upstream release.
-  * d/control:
-    - Add python-unittest2 to Build-Depends, fixing a FTBFS. Closes: #804426
-  * d/patches (updated):
-    - Use-jQuery-libraries-from-the-Debian-archive.patch
-
- -- Christian Kastner <ckk at debian.org>  Sun, 08 Nov 2015 14:38:26 +0100
-
-gitinspector (0.4.2+dfsg-1) unstable; urgency=medium
-
-  * New upstream release.
-  * d/patches (refreshed):
-    - Use-jQuery-libraries-from-the-Debian-archive.patch
-    - Move-arch-indep-files-to-usr-share.patch
-
- -- Christian Kastner <ckk at debian.org>  Fri, 23 Oct 2015 14:13:29 +0200
-
-gitinspector (0.4.1+dfsg-1) unstable; urgency=medium
-
-  * New upstream release. 
-  * d/control:
-    - Add to Build-Depends:
-      + asciidoc
-      + libxml2-utils
-      + xsltproc
-      + docbook-xml
-      + docbook-xsl
-    - Replace my email in Updaters with my @debian.org address
-    - Update Homepage, upstream moved to GitHub
-  * d/rules:
-    - Build documentation from source
-  * d/doc-base, d/docs:
-    - Install HTML documentation
-  * d/man:
-    - Drop manpage, upstream provides one now
-  * d/copyright:
-    - Update copyright
-  * d/watch:
-    - Upstream moved to GitHub
-  * d/patches (dropped):
-    - Print-usage-when-called-without-any-args.patch
-    - Add-missing-HTML-footer-to-htmlembedded-output.patch
-    - fix-C-locale-crash.patch
-      All three included upstream
-  * d/patches (refreshed):
-    - Use-jQuery-libraries-from-the-Debian-archive.patch
-     -Move-arch-indep-files-to-usr-share.patch
-
- -- Christian Kastner <ckk at debian.org>  Wed, 30 Sep 2015 17:53:50 +0200
-
-gitinspector (0.3.2+dfsg-2) unstable; urgency=medium
-
-  * debian/patches (added):
-    - fix-C-locale-crash
-      Don't throw an exception when using the C locale. Fixes a FTBFS.
-      Closes: #773143
-
- -- Christian Kastner <debian at kvr.at>  Fri, 19 Dec 2014 21:36:17 +0100
-
-gitinspector (0.3.2+dfsg-1) unstable; urgency=medium
-
-  * Initial release. (Closes: #768508)
-
- -- Christian Kastner <debian at kvr.at>  Thu, 06 Nov 2014 12:21:31 +0100

Copied: packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog (from rev 13405, packages/gitinspector/trunk/debian/changelog)
===================================================================
--- packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog	                        (rev 0)
+++ packages/gitinspector/tags/0.4.4+dfsg-3/debian/changelog	2016-07-19 18:52:43 UTC (rev 13406)
@@ -0,0 +1,90 @@
+gitinspector (0.4.4+dfsg-3) unstable; urgency=medium
+
+  * debian/patches (updated):
+    - Use-jQuery-libraries-from-the-Debian-archive.patch
+      Fix typo breaking jquery-tablesorter inclusion. Closes: #831817
+
+ -- Christian Kastner <ckk at debian.org>  Tue, 19 Jul 2016 20:49:10 +0200
+
+gitinspector (0.4.4+dfsg-2) unstable; urgency=medium
+
+  * d/control:
+    - Bump Standards-Version to 3.9.8 (no changes needed)
+
+ -- Christian Kastner <ckk at debian.org>  Sun, 17 Apr 2016 19:58:39 +0200
+
+gitinspector (0.4.4+dfsg-1) unstable; urgency=medium
+
+  * New upstream release. 
+  * d/control:
+    - Bump Standards-Version to 3.9.7 (no changes needed)
+    - Switch Vcs-Browser from insecure URI to secure one
+
+ -- Christian Kastner <ckk at debian.org>  Sun, 07 Feb 2016 17:12:42 +0100
+
+gitinspector (0.4.3+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * d/control:
+    - Add python-unittest2 to Build-Depends, fixing a FTBFS. Closes: #804426
+  * d/patches (updated):
+    - Use-jQuery-libraries-from-the-Debian-archive.patch
+
+ -- Christian Kastner <ckk at debian.org>  Sun, 08 Nov 2015 14:38:26 +0100
+
+gitinspector (0.4.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * d/patches (refreshed):
+    - Use-jQuery-libraries-from-the-Debian-archive.patch
+    - Move-arch-indep-files-to-usr-share.patch
+
+ -- Christian Kastner <ckk at debian.org>  Fri, 23 Oct 2015 14:13:29 +0200
+
+gitinspector (0.4.1+dfsg-1) unstable; urgency=medium
+
+  * New upstream release. 
+  * d/control:
+    - Add to Build-Depends:
+      + asciidoc
+      + libxml2-utils
+      + xsltproc
+      + docbook-xml
+      + docbook-xsl
+    - Replace my email in Updaters with my @debian.org address
+    - Update Homepage, upstream moved to GitHub
+  * d/rules:
+    - Build documentation from source
+  * d/doc-base, d/docs:
+    - Install HTML documentation
+  * d/man:
+    - Drop manpage, upstream provides one now
+  * d/copyright:
+    - Update copyright
+  * d/watch:
+    - Upstream moved to GitHub
+  * d/patches (dropped):
+    - Print-usage-when-called-without-any-args.patch
+    - Add-missing-HTML-footer-to-htmlembedded-output.patch
+    - fix-C-locale-crash.patch
+      All three included upstream
+  * d/patches (refreshed):
+    - Use-jQuery-libraries-from-the-Debian-archive.patch
+     -Move-arch-indep-files-to-usr-share.patch
+
+ -- Christian Kastner <ckk at debian.org>  Wed, 30 Sep 2015 17:53:50 +0200
+
+gitinspector (0.3.2+dfsg-2) unstable; urgency=medium
+
+  * debian/patches (added):
+    - fix-C-locale-crash
+      Don't throw an exception when using the C locale. Fixes a FTBFS.
+      Closes: #773143
+
+ -- Christian Kastner <debian at kvr.at>  Fri, 19 Dec 2014 21:36:17 +0100
+
+gitinspector (0.3.2+dfsg-1) unstable; urgency=medium
+
+  * Initial release. (Closes: #768508)
+
+ -- Christian Kastner <debian at kvr.at>  Thu, 06 Nov 2014 12:21:31 +0100

Deleted: packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch
===================================================================
--- packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2016-04-17 18:33:48 UTC (rev 13090)
+++ packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2016-07-19 18:52:43 UTC (rev 13406)
@@ -1,60 +0,0 @@
-From: Christian Kastner <ckk at kvr.at>
-Date: Sat, 22 Nov 2014 20:48:21 +0100
-Subject: Use jQuery libraries from the Debian archive
-
-Forwarded: not-needed
-Last-Update: 2014-11-22
----
- gitinspector/format.py | 26 +++++++++++++++-----------
- 1 file changed, 15 insertions(+), 11 deletions(-)
-
-Index: gitinspector-0.4.3/gitinspector/format.py
-===================================================================
---- gitinspector-0.4.3.orig/gitinspector/format.py
-+++ gitinspector-0.4.3/gitinspector/format.py
-@@ -57,22 +57,23 @@ def __output_html_template__(name):
- 	file_r = open(template_path, "rb")
- 	return file_r.read().decode("utf-8", "replace")
- 
--def __get_zip_file_content__(name, file_name="/html/flot.zip"):
--	zip_file = zipfile.ZipFile(basedir.get_basedir() + file_name, "r")
--	content = zip_file.read(name)
--	zip_file.close()
--	return content.decode("utf-8", "replace")
--
- def output_header():
- 	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").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")
-+		tablesorter_js = None
-+		flot_js = None
-+		pie_js = None
-+		resize_js = None
-+		jquery_js = None
-+		with open('/usr/share/javascript/jquery-tablesorter/jquery.tablesorter.js') as js:
-+			tablersorter_js = js.read().decode("utf-8", "replace")
-+		with open('/usr/share/javascript/jquery-flot/jquery.flot.js') as js:
-+			flot_js = js.read().decode("utf-8", "replace")
-+		with open('/usr/share/javascript/jquery-flot/jquery.flot.pie.js') as js:
-+			pie_js = js.read().decode("utf-8", "replace")
-+		with open('/usr/share/javascript/jquery-flot/jquery.flot.resize.js') as js:
-+			resize_js = js.read().decode("utf-8", "replace")
- 
- 		logo_file = open(base + "/html/gitinspector_piclet.png", "rb")
- 		logo = logo_file.read()
-@@ -80,7 +81,8 @@ def output_header():
- 		logo = base64.b64encode(logo)
- 
- 		if __selected_format__ == "htmlembedded":
--			jquery_js = ">" + __get_zip_file_content__("jquery.js")
-+			with open('/usr/share/javascript/jquery/jquery.js') as js:
-+				jquery_js = ">" + js.read().decode("utf-8", "replace")
- 		else:
- 			jquery_js = " src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">"
- 

Copied: packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch (from rev 13404, packages/gitinspector/trunk/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch)
===================================================================
--- packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	                        (rev 0)
+++ packages/gitinspector/tags/0.4.4+dfsg-3/debian/patches/Use-jQuery-libraries-from-the-Debian-archive.patch	2016-07-19 18:52:43 UTC (rev 13406)
@@ -0,0 +1,60 @@
+From: Christian Kastner <ckk at kvr.at>
+Date: Sat, 22 Nov 2014 20:48:21 +0100
+Subject: Use jQuery libraries from the Debian archive
+
+Forwarded: not-needed
+Last-Update: 2014-11-22
+---
+ gitinspector/format.py | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+Index: gitinspector-0.4.3/gitinspector/format.py
+===================================================================
+--- gitinspector-0.4.3.orig/gitinspector/format.py
++++ gitinspector-0.4.3/gitinspector/format.py
+@@ -57,22 +57,23 @@ def __output_html_template__(name):
+ 	file_r = open(template_path, "rb")
+ 	return file_r.read().decode("utf-8", "replace")
+ 
+-def __get_zip_file_content__(name, file_name="/html/flot.zip"):
+-	zip_file = zipfile.ZipFile(basedir.get_basedir() + file_name, "r")
+-	content = zip_file.read(name)
+-	zip_file.close()
+-	return content.decode("utf-8", "replace")
+-
+ def output_header():
+ 	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").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")
++		tablesorter_js = None
++		flot_js = None
++		pie_js = None
++		resize_js = None
++		jquery_js = None
++		with open('/usr/share/javascript/jquery-tablesorter/jquery.tablesorter.js') as js:
++			tablesorter_js = js.read().decode("utf-8", "replace")
++		with open('/usr/share/javascript/jquery-flot/jquery.flot.js') as js:
++			flot_js = js.read().decode("utf-8", "replace")
++		with open('/usr/share/javascript/jquery-flot/jquery.flot.pie.js') as js:
++			pie_js = js.read().decode("utf-8", "replace")
++		with open('/usr/share/javascript/jquery-flot/jquery.flot.resize.js') as js:
++			resize_js = js.read().decode("utf-8", "replace")
+ 
+ 		logo_file = open(base + "/html/gitinspector_piclet.png", "rb")
+ 		logo = logo_file.read()
+@@ -80,7 +81,8 @@ def output_header():
+ 		logo = base64.b64encode(logo)
+ 
+ 		if __selected_format__ == "htmlembedded":
+-			jquery_js = ">" + __get_zip_file_content__("jquery.js")
++			with open('/usr/share/javascript/jquery/jquery.js') as js:
++				jquery_js = ">" + js.read().decode("utf-8", "replace")
+ 		else:
+ 			jquery_js = " src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js\">"
+ 




More information about the Python-apps-commits mailing list