Package: trac-graphviz Severity: normal
added patch
diff -Nru trac-graphviz-0.7.5/debian/changelog trac-graphviz-0.7.5/debian/changelog --- trac-graphviz-0.7.5/debian/changelog 2011-05-08 17:21:41.000000000 +0000 +++ trac-graphviz-0.7.5/debian/changelog 2011-05-08 17:14:59.000000000 +0000 @@ -1,3 +1,11 @@ +trac-graphviz (0.7.5-1.1) unstable; urgency=low + + * Fix sha deprecation warning (LP:#578145) + * Switch to dpkg-source 3.0 (quilt) format + * Bump standards version + + -- Jerico Dev <jerico....@gmail.com> Sun, 08 May 2011 16:25:59 +0000 + trac-graphviz (0.7.5-1) unstable; urgency=low * Initial release (Closes: #504552) diff -Nru trac-graphviz-0.7.5/debian/control trac-graphviz-0.7.5/debian/control --- trac-graphviz-0.7.5/debian/control 2011-05-08 17:21:41.000000000 +0000 +++ trac-graphviz-0.7.5/debian/control 2011-05-08 17:14:46.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Christoph Egger <christoph.eg...@gmx.de> Build-Depends: debhelper (>= 7.0~), python-setuptools, python (>= 2.5.4-1~) Build-Depends-Indep: python-support (>= 0.3) -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 DM-Upload-Allowed: yes Vcs-Git: git://git.debian.org/git/users/christoph-guest/trac-graphviz.git/ Vcs-Browser: http://git.debian.org/?p=users/christoph-guest/trac-graphviz.git diff -Nru trac-graphviz-0.7.5/debian/patches/debian-changes-0.7.5-1.1 trac-graphviz-0.7.5/debian/patches/debian-changes-0.7.5-1.1 --- trac-graphviz-0.7.5/debian/patches/debian-changes-0.7.5-1.1 1970-01-01 00:00:00.000000000 +0000 +++ trac-graphviz-0.7.5/debian/patches/debian-changes-0.7.5-1.1 2011-05-08 17:15:04.000000000 +0000 @@ -0,0 +1,59 @@ +Description: Upstream changes introduced in version 0.7.5-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + trac-graphviz (0.7.5-1.1) unstable; urgency=low + . + * Fix sha deprecation warning (LP:#578145) + * Switch to dpkg-source 3.0 (quilt) format + * Bump standards version + . + The person named in the Author field signed this changelog entry. +Author: Jerico Dev <jerico....@gmail.com> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- /dev/null ++++ trac-graphviz-0.7.5/0.11-0.7.5/patch.diff +@@ -0,0 +1,29 @@ ++Index: 0.11/graphviz/graphviz.py ++=================================================================== ++--- 0.11/graphviz/graphviz.py (revision 9130) +++++ 0.11/graphviz/graphviz.py (working copy) ++@@ -20,7 +20,6 @@ ++ import locale ++ import os ++ import re ++-import sha ++ import subprocess ++ import sys ++ ++@@ -31,6 +30,7 @@ ++ from trac.core import * ++ from trac.mimeview.api import Context, IHTMLPreviewRenderer, MIME_MAP ++ from trac.util import escape +++from trac.util.compat import sha1 ++ from trac.util.text import to_unicode ++ from trac.util.translation import _ ++ from trac.web.api import IRequestHandler ++@@ -310,7 +310,7 @@ ++ encoded_cmd = (processor + unicode(self.processor_options)) \ ++ .encode(self.encoding) ++ encoded_content = content.encode(self.encoding) ++- sha_key = sha.new(encoded_cmd + encoded_content).hexdigest() +++ sha_key = sha1(encoded_cmd + encoded_content).hexdigest() ++ img_name = '%s.%s.%s' % (sha_key, processor, out_format) ++ # cache: hash.<dot>.<png> ++ img_path = os.path.join(self.cache_dir, img_name) diff -Nru trac-graphviz-0.7.5/debian/patches/fix-sha-deprecation-warning trac-graphviz-0.7.5/debian/patches/fix-sha-deprecation-warning --- trac-graphviz-0.7.5/debian/patches/fix-sha-deprecation-warning 1970-01-01 00:00:00.000000000 +0000 +++ trac-graphviz-0.7.5/debian/patches/fix-sha-deprecation-warning 2011-05-08 16:48:34.000000000 +0000 @@ -0,0 +1,34 @@ +From: Jerico Dev <jerico....@gmail.com> +Subject: Fix sha deprecation warning in graphviz.py +Origin: upstream, http://trac-hacks.org/attachment/ticket/5747/GraphViz-fix-py26-sha.2.patch +Bug: http://trac-hacks.org/ticket/5747 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/trac-graphviz/+bug/578145 +Index: trac-graphviz-0.7.5/0.11-0.7.5/graphviz/graphviz.py +=================================================================== +--- trac-graphviz-0.7.5.orig/0.11-0.7.5/graphviz/graphviz.py 2011-05-08 16:40:05.000000000 +0000 ++++ trac-graphviz-0.7.5/0.11-0.7.5/graphviz/graphviz.py 2011-05-08 16:41:37.000000000 +0000 +@@ -20,7 +20,6 @@ + import locale + import os + import re +-import sha + import subprocess + import sys + +@@ -31,6 +30,7 @@ + from trac.core import * + from trac.mimeview.api import Context, IHTMLPreviewRenderer, MIME_MAP + from trac.util import escape ++from trac.util.compat import sha1 + from trac.util.text import to_unicode + from trac.util.translation import _ + from trac.web.api import IRequestHandler +@@ -310,7 +310,7 @@ + encoded_cmd = (processor + unicode(self.processor_options)) \ + .encode(self.encoding) + encoded_content = content.encode(self.encoding) +- sha_key = sha.new(encoded_cmd + encoded_content).hexdigest() ++ sha_key = sha1(encoded_cmd + encoded_content).hexdigest() + img_name = '%s.%s.%s' % (sha_key, processor, out_format) + # cache: hash.<dot>.<png> + img_path = os.path.join(self.cache_dir, img_name) diff -Nru trac-graphviz-0.7.5/debian/patches/series trac-graphviz-0.7.5/debian/patches/series --- trac-graphviz-0.7.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ trac-graphviz-0.7.5/debian/patches/series 2011-05-08 17:14:03.000000000 +0000 @@ -0,0 +1,2 @@ +fix-sha-deprecation-warning +debian-changes-0.7.5-1.1 diff -Nru trac-graphviz-0.7.5/debian/source/format trac-graphviz-0.7.5/debian/source/format --- trac-graphviz-0.7.5/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ trac-graphviz-0.7.5/debian/source/format 2011-05-08 16:33:55.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)
