Ubuntu

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

Proposed by Dmitry Shachnev on 2013-03-19
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
To merge this branch: bzr merge lp:~mitya57/ubuntu/raring/python-coverage/lp1109090
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve on 2013-03-22
Francis Ginther (community) Approve on 2013-03-19
Ubuntu branches 2013-03-19 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.
Francis Ginther (fginther) wrote :

This is the proper fix for the bug. Approve.

review: Approve
Sebastien Bacher (seb128) wrote :

thanks for your work

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-25 09:06:51 +0000
3+++ debian/changelog 2013-03-19 15:29:23 +0000
4@@ -1,3 +1,10 @@
5+python-coverage (3.6-0ubuntu2) raring; urgency=low
6+
7+ * Fix a typo in 02.use-system-js-libraries.patch that was causing
8+ NameErrors (LP: #1109090).
9+
10+ -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 19 Mar 2013 19:25:38 +0400
11+
12 python-coverage (3.6-0ubuntu1) raring; urgency=low
13
14 * New upstream release.
15
16=== modified file 'debian/patches/02.use-system-js-libraries.patch'
17--- debian/patches/02.use-system-js-libraries.patch 2013-01-25 09:06:51 +0000
18+++ debian/patches/02.use-system-js-libraries.patch 2013-03-19 15:29:23 +0000
19@@ -1,7 +1,7 @@
20 Description: Use Debian system ECMAScript libraries.
21 Origin: Created to address Debian Bug#596212.
22 Author: Ben Finney <ben+debian@benfinney.id.au>
23-Last-Update: 2012-01-25
24+Last-Update: 2013-03-19
25 diff -Naurp python-coverage-3.6.orig/coverage/htmlfiles/index.html python-coverage-3.6/coverage/htmlfiles/index.html
26 --- python-coverage-3.6.orig/coverage/htmlfiles/index.html 2012-11-19 19:51:47.000000000 -0600
27 +++ python-coverage-3.6/coverage/htmlfiles/index.html 2013-01-25 09:00:25.002246121 -0600
28@@ -50,7 +50,7 @@
29 + "jquery.min.js":
30 + os.path.join(system_javascript_path, "jquery"),
31 + "jquery.tablesorter.min.js":
32-+ os.path.join(system_javascript.path, "jquery-tablesorter"),
33++ os.path.join(system_javascript_path, "jquery-tablesorter"),
34 + }
35 + for static, source_dir in system_javascript_libraries.items():
36 + os.symlink(

Subscribers

People subscribed via source and target branches