Your message dated Sun, 16 Nov 2014 10:17:17 +0100 with message-id <54686B9D.8080904@thykier.net> and subject line Re: Bug#769675: unblock: gnucash/1:2.6.4-3 has caused the Debian Bug report #769675, regarding unblock: gnucash/1:2.6.4-3 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 769675: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769675 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: gnucash/1:2.6.4-3
- From: Sébastien Villemot <sebastien@debian.org>
- Date: Sat, 15 Nov 2014 15:34:12 +0100
- Message-id: <[🔎] 20141115143408.GA3465@villemot.name>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Dear Release Team, Please unblock gnucash 1:2.6.4-3. Changelog is: gnucash (1:2.6.4-3) unstable; urgency=medium * barchart.patch: incorporate upstream fix for stacked barchart graphs. (Closes: #767735) -- Sébastien Villemot <sebastien@debian.org> Sat, 15 Nov 2014 14:59:46 +0100 The debdiff is attached. Since this is a patch to a patch, I also attach the corresponding interdiff. unblock gnucash/1:2.6.4-3 Thanks, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594diff -Nru gnucash-2.6.4/debian/changelog gnucash-2.6.4/debian/changelog --- gnucash-2.6.4/debian/changelog 2014-10-18 00:03:22.000000000 +0200 +++ gnucash-2.6.4/debian/changelog 2014-11-15 14:59:46.000000000 +0100 @@ -1,3 +1,10 @@ +gnucash (1:2.6.4-3) unstable; urgency=medium + + * barchart.patch: incorporate upstream fix for stacked barchart graphs. + (Closes: #767735) + + -- Sébastien Villemot <sebastien@debian.org> Sat, 15 Nov 2014 14:59:46 +0100 + gnucash (1:2.6.4-2) unstable; urgency=medium * crash-missing-comma.patch: new patch, fixes random crashes. diff -Nru gnucash-2.6.4/debian/patches/barchart.patch gnucash-2.6.4/debian/patches/barchart.patch --- gnucash-2.6.4/debian/patches/barchart.patch 2014-10-18 00:02:52.000000000 +0200 +++ gnucash-2.6.4/debian/patches/barchart.patch 2014-11-15 14:54:52.000000000 +0100 @@ -3,13 +3,30 @@ https://github.com/Gnucash/gnucash/commit/96289823e5a7b7904bf9e64fe94bcb1dbcb0c7ee https://github.com/Gnucash/gnucash/commit/6d0a3707e1f6cc0d8ca00a5a96fe0e9355bcbb61 https://github.com/Gnucash/gnucash/commit/00b827dbf255d8c29c4c296e10a7baf4ee172cfe + https://github.com/Gnucash/gnucash/commit/3b21aacbc8476484f00a4558add9c198b0bdd306 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=737815 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765412 -Last-Update: 2014-10-17 + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767735 +Last-Update: 2014-11-15 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/src/report/report-system/html-barchart.scm +++ b/src/report/report-system/html-barchart.scm +@@ -359,12 +359,12 @@ + (push "var d") + (push series-index) + (push " = [];\n"))) +- (series-data-add (lambda (series-index date y) ++ (series-data-add (lambda (series-index x y) + (push (string-append + " d" + (number->string series-index) + ".push([" +- "\"" date "\"" ++ (number->string x) + ", " + (number->string y) + "]);\n")))) @@ -386,7 +386,7 @@ (push (gnc:html-js-include "jqplot/jquery.jqplot.js")) (push (gnc:html-js-include "jqplot/jqplot.barRenderer.js")) @@ -19,15 +36,25 @@ (push (gnc:html-js-include "jqplot/jqplot.highlighter.js")) (push (gnc:html-js-include "jqplot/jqplot.canvasTextRenderer.js")) (push (gnc:html-js-include "jqplot/jqplot.canvasAxisTickRenderer.js")) -@@ -421,7 +421,7 @@ - data) - (series-data-end col (list-ref-safe (gnc:html-barchart-col-labels barchart) col)) - (if (< col (- cols 1)) -- (loop (+ 1 col) 1))))) -+ (loop (+ 1 col) 0))))) - - - (push "var options = { +@@ -406,15 +406,15 @@ + (if (and data (list? data)) + (let ((rows (length data)) + (cols 0)) +- (let loop ((col 0) (rowcnt 0)) ++ (let loop ((col 0) (rowcnt 1)) + (series-data-start col) + (if (list? (car data)) + (begin + (set! cols (length (car data))))) + (for-each + (lambda (row) +- (if (< rowcnt rows) +- (series-data-add col (list-ref (gnc:html-barchart-row-labels barchart) rowcnt) ++ (if (<= rowcnt rows) ++ (series-data-add col rowcnt + (ensure-numeric (list-ref-safe row col))) + ) + (set! rowcnt (+ rowcnt 1))) @@ -445,7 +445,7 @@ }, axes: { @@ -50,15 +77,25 @@ zoom: true } };\n") -@@ -495,12 +499,9 @@ - (push "var plot = $.jqplot('")(push chart-id)(push"', data, options); +@@ -489,6 +493,15 @@ + (push " options.axes.yaxis.label = \"") + (push y-label) + (push "\";\n"))) ++ (if (and (string? row-labels) (> (string-length row-labels) 0)) ++ (begin ++ (push " options.axes.xaxis.ticks = [") ++ (for-each (lambda (val) ++ (push "\"") ++ (push val) ++ (push "\",")) ++ (gnc:html-barchart-row-labels barchart)) ++ (push "];\n"))) + - function formatTooltip(str, seriesIndex, pointIndex) { -- if (options.axes.xaxis.ticks[pointIndex] !== undefined) -- x = options.axes.xaxis.ticks[pointIndex]; -- else -- x = pointIndex; -+ x = data[seriesIndex][pointIndex][0]; + (push "$.jqplot.config.enablePlugins = true;") +@@ -500,7 +513,7 @@ + else + x = pointIndex; y = data[seriesIndex][pointIndex][1].toFixed(2); - return options.series[seriesIndex].label + ' ' + x + '<br><b>' + y + '</b>'; + return options.series[seriesIndex].label + '<br/>' + x + '<br/><b>' + y + '</b>';commit 3b21aacbc8476484f00a4558add9c198b0bdd306 Author: Geert Janssens <janssens-geert@telenet.be> Date: Tue Oct 21 17:13:14 2014 +0200 Revert to using numerical indexes for the x-axis on bar charts There is a bug in jqplot to prevents stacked charts from rendering properly when using strings for x-axis categories: https://bitbucket.org/cleonello/jqplot/issue/587/charts-disappear-by-enabling-stackseries diff --git a/src/report/report-system/html-barchart.scm b/src/report/report-system/html-barchart.scm index 60d4b92..0a04f62 100644 --- a/src/report/report-system/html-barchart.scm +++ b/src/report/report-system/html-barchart.scm @@ -359,12 +359,12 @@ (push "var d") (push series-index) (push " = [];\n"))) - (series-data-add (lambda (series-index date y) + (series-data-add (lambda (series-index x y) (push (string-append " d" (number->string series-index) ".push([" - "\"" date "\"" + (number->string x) ", " (number->string y) "]);\n")))) @@ -406,22 +406,22 @@ (if (and data (list? data)) (let ((rows (length data)) (cols 0)) - (let loop ((col 0) (rowcnt 0)) + (let loop ((col 0) (rowcnt 1)) (series-data-start col) (if (list? (car data)) (begin (set! cols (length (car data))))) (for-each (lambda (row) - (if (< rowcnt rows) - (series-data-add col (list-ref (gnc:html-barchart-row-labels barchart) rowcnt) + (if (<= rowcnt rows) + (series-data-add col rowcnt (ensure-numeric (list-ref-safe row col))) ) (set! rowcnt (+ rowcnt 1))) data) (series-data-end col (list-ref-safe (gnc:html-barchart-col-labels barchart) col)) (if (< col (- cols 1)) - (loop (+ 1 col) 0))))) + (loop (+ 1 col) 1))))) (push "var options = { @@ -493,13 +493,25 @@ (push " options.axes.yaxis.label = \"") (push y-label) (push "\";\n"))) + (if (and (string? row-labels) (> (string-length row-labels) 0)) + (begin + (push " options.axes.xaxis.ticks = [") + (for-each (lambda (val) + (push "\"") + (push val) + (push "\",")) + (gnc:html-barchart-row-labels barchart)) + (push "];\n"))) (push "$.jqplot.config.enablePlugins = true;\n") (push "var plot = $.jqplot('")(push chart-id)(push"', data, options); function formatTooltip(str, seriesIndex, pointIndex) { - x = data[seriesIndex][pointIndex][0]; + if (options.axes.xaxis.ticks[pointIndex] !== undefined) + x = options.axes.xaxis.ticks[pointIndex]; + else + x = pointIndex; y = data[seriesIndex][pointIndex][1].toFixed(2); return options.series[seriesIndex].label + '<br/>' + x + '<br/><b>' + y + '</b>'; }\n")Attachment: signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
- To: Sébastien Villemot <sebastien@debian.org>, 769675-done@bugs.debian.org
- Subject: Re: Bug#769675: unblock: gnucash/1:2.6.4-3
- From: Niels Thykier <niels@thykier.net>
- Date: Sun, 16 Nov 2014 10:17:17 +0100
- Message-id: <54686B9D.8080904@thykier.net>
- In-reply-to: <[🔎] 20141115143408.GA3465@villemot.name>
- References: <[🔎] 20141115143408.GA3465@villemot.name>
On 2014-11-15 15:34, Sébastien Villemot wrote: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Dear Release Team, > > Please unblock gnucash 1:2.6.4-3. Changelog is: > > gnucash (1:2.6.4-3) unstable; urgency=medium > > * barchart.patch: incorporate upstream fix for stacked barchart graphs. > (Closes: #767735) > > -- Sébastien Villemot <sebastien@debian.org> Sat, 15 Nov 2014 14:59:46 +0100 > > The debdiff is attached. Since this is a patch to a patch, I also attach the > corresponding interdiff. > > unblock gnucash/1:2.6.4-3 > > Thanks, > Unblocked, thanks. ~Niels
--- End Message ---