Merge lp:~mitya57/ubuntu/raring/python-coverage/lp1109090 into lp:ubuntu/raring/python-coverage

Proposed by Dmitry Shachnev
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~mitya57/ubuntu/raring/python-coverage/lp1109090
Merge into: lp:ubuntu/raring/python-coverage
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/patches/02.use-system-js-libraries.patch (+2/-2)
To merge this branch: bzr merge lp:~mitya57/ubuntu/raring/python-coverage/lp1109090
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Francis Ginther (community) Approve
Ubuntu branches Pending
Review via email: mp+154123@code.launchpad.net

Description of the change

This branch provides a better fix for bug 1109090. It seems that it was caused by Ubuntu's patch, so it is now fixed directly in the patch, not by adding a new one.

Note that this doesn't affect Debian, and the bug was introduced in Ubuntu's 3.6-0ubuntu1 upload.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

This is the proper fix for the bug. Approve.

review: Approve
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks for your work

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-01-25 09:06:51 +0000
+++ debian/changelog 2013-03-19 15:29:23 +0000
@@ -1,3 +1,10 @@
1python-coverage (3.6-0ubuntu2) raring; urgency=low
2
3 * Fix a typo in 02.use-system-js-libraries.patch that was causing
4 NameErrors (LP: #1109090).
5
6 -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 19 Mar 2013 19:25:38 +0400
7
1python-coverage (3.6-0ubuntu1) raring; urgency=low8python-coverage (3.6-0ubuntu1) raring; urgency=low
29
3 * New upstream release.10 * New upstream release.
411
=== modified file 'debian/patches/02.use-system-js-libraries.patch'
--- debian/patches/02.use-system-js-libraries.patch 2013-01-25 09:06:51 +0000
+++ debian/patches/02.use-system-js-libraries.patch 2013-03-19 15:29:23 +0000
@@ -1,7 +1,7 @@
1Description: Use Debian system ECMAScript libraries.1Description: Use Debian system ECMAScript libraries.
2Origin: Created to address Debian Bug#596212.2Origin: Created to address Debian Bug#596212.
3Author: Ben Finney <ben+debian@benfinney.id.au>3Author: Ben Finney <ben+debian@benfinney.id.au>
4Last-Update: 2012-01-254Last-Update: 2013-03-19
5diff -Naurp python-coverage-3.6.orig/coverage/htmlfiles/index.html python-coverage-3.6/coverage/htmlfiles/index.html5diff -Naurp python-coverage-3.6.orig/coverage/htmlfiles/index.html python-coverage-3.6/coverage/htmlfiles/index.html
6--- python-coverage-3.6.orig/coverage/htmlfiles/index.html 2012-11-19 19:51:47.000000000 -06006--- python-coverage-3.6.orig/coverage/htmlfiles/index.html 2012-11-19 19:51:47.000000000 -0600
7+++ python-coverage-3.6/coverage/htmlfiles/index.html 2013-01-25 09:00:25.002246121 -06007+++ python-coverage-3.6/coverage/htmlfiles/index.html 2013-01-25 09:00:25.002246121 -0600
@@ -50,7 +50,7 @@
50+ "jquery.min.js":50+ "jquery.min.js":
51+ os.path.join(system_javascript_path, "jquery"),51+ os.path.join(system_javascript_path, "jquery"),
52+ "jquery.tablesorter.min.js":52+ "jquery.tablesorter.min.js":
53+ os.path.join(system_javascript.path, "jquery-tablesorter"),53+ os.path.join(system_javascript_path, "jquery-tablesorter"),
54+ }54+ }
55+ for static, source_dir in system_javascript_libraries.items():55+ for static, source_dir in system_javascript_libraries.items():
56+ os.symlink(56+ os.symlink(

Subscribers

People subscribed via source and target branches