diff -Nru matlab2tikz-1.1.0/debian/changelog matlab2tikz-1.1.0/debian/changelog --- matlab2tikz-1.1.0/debian/changelog 2017-01-04 16:13:36.000000000 +0000 +++ matlab2tikz-1.1.0/debian/changelog 2017-06-22 16:19:30.000000000 +0000 @@ -1,3 +1,10 @@ +matlab2tikz (1.1.0-1ubuntu1) artful; urgency=medium + + * d/p/new-octave-test-results.patch: + - Add new patch to fix test failures against octave >= 4.2.0. + + -- Łukasz 'sil2100' Zemczak Tue, 20 Jun 2017 18:20:52 +0200 + matlab2tikz (1.1.0-1) unstable; urgency=medium * New upstream version 1.1.0 diff -Nru matlab2tikz-1.1.0/debian/control matlab2tikz-1.1.0/debian/control --- matlab2tikz-1.1.0/debian/control 2017-01-04 15:56:55.000000000 +0000 +++ matlab2tikz-1.1.0/debian/control 2017-06-20 16:23:26.000000000 +0000 @@ -1,7 +1,8 @@ Source: matlab2tikz Section: math Priority: extra -Maintainer: Debian Octave Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Octave Group Uploaders: Sébastien Villemot Build-Depends: debhelper (>= 10) Standards-Version: 3.9.8 diff -Nru matlab2tikz-1.1.0/debian/patches/new-octave-test-results.patch matlab2tikz-1.1.0/debian/patches/new-octave-test-results.patch --- matlab2tikz-1.1.0/debian/patches/new-octave-test-results.patch 1970-01-01 00:00:00.000000000 +0000 +++ matlab2tikz-1.1.0/debian/patches/new-octave-test-results.patch 2017-06-22 16:19:13.000000000 +0000 @@ -0,0 +1,103 @@ +Description: Refresh test result hashes for newer octave + Due to changes in octave 4.2.1, the resulting .tex files now have an + additional batch of styles for axes. To accomodate this change we need to + use different test result hashes - and for this reason we create a new test + suite file. + The forwarded change to upstream has different hashes as the develop branch + has different tests than those we have in the current Ubuntu release. +Author: Łukasz 'sil2100' Zemczak +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/matlab2tikz/+bug/1699176 +Forwarded: https://github.com/matlab2tikz/matlab2tikz/pull/996 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + +--- /dev/null ++++ b/test/suites/ACID.Octave.4.2.0.md5 +@@ -0,0 +1,87 @@ ++alphaImage : a51ff2c6514fb5606ee2fcb732edc7ea ++alphaTest : 0aabea57e8351373e2c3090fa1929435 ++annotationAll : 5139104b005a70d3650c6dedb8f1dc7e ++annotationSubplots : 3da2ff3cadd2167ab1726c88f18a8a63 ++annotationText : efe23b1567345ec24564b598c0d2c146 ++annotationTextUnits : 0c874e12ee2167ffe041b48ab2124417 ++areaPlot : cdb88d8449ea9275c7eeed21c236e055 ++axesColors : 45751a2a4fd30e0c888237721c0ae018 ++axesLocation : 27dd4473cb5871188a20d7e6cbc0d171 ++bars : 15a269e905602896394eabd367040ce1 ++besselImage : 0ffc3e10adb87029b44cbeb4bc435e07 ++colorbarLabelTitle : 272a4d2f645b296e43c01f4ab2ae25a4 ++colorbarLogplot : cb326bbb54e486a40d387acfe82f1b72 ++colorbarManualLocationLeftIn : d2d90ddaa56b9f13d009a595c21e9601 ++colorbarManualLocationLeftOut : dea8de2bdf0d866dc3f4f2b8327ea494 ++colorbarManualLocationRightIn : c8866d76fee1a0876cf3f46aa5bb5761 ++colorbarManualLocationRightOut : 81b67065a6281c3de6c1a9181d4dfcbc ++colorbars : 13b6b31da1f9aef218ef68a6a2c4bbc5 ++compassplot : 94efa27f5503d3a56e6b40a0ca0f75d1 ++contourPenny : fbd639280f4c31dcce7d463e4eac27f4 ++customLegend : 7b0d1d80a2f72bc920d869151ffe96c1 ++decayingharmonic : a5551e12b79edd8f32bd5d91ae5fa561 ++double_axes : 125855bab62dbd8a599bfb6d9d2a041f ++double_axes2 : 6cd1b9ea3b7ae29801738674446e5f64 ++errorBars : 52e1abac8c4ba10d9427cebc9e6845db ++errorBars2 : 3b9d45c6f5e37317a1a869cc961880d9 ++herrorbarPlot : 92c6a3ebd7e6194362b31117b1e52d92 ++imageOrientation_PNG : 8086dd5610c028cf75501954cbaccf2c ++imageOrientation_inline : 02c0fb3e810aab39cb690e0fa3f8b7eb ++imagescplot : 88328b4f32c5ed1cc4e0ad09ea7f47cb ++imagescplot2 : 39ce8c49f28f3ce90a6bd5a9d0f1cd42 ++latexInterpreter : 73b51aed59a6644c15f1561e51ecbf6d ++latexmath2 : 5359827e1d218311bf80228f89deffdf ++legendplot : 5f351094a8e4cd2192fe7cbb2859fd5c ++legendplotBoxoff : 2654de1ee49ac8f4d2546eb6f254952f ++legendsubplots : 17c08345bafc58e1562984b37d4e01c9 ++linesWithOutliers : 0aa11947614995837eb1ce45265b45f5 ++logbaseline : f23182b1e230b1b21244ad9364475863 ++logicalImage : 82e9e5ed998aa1ecd78b514d801dc914 ++logplot : 5d5c676b2a3338558939d0407171edc6 ++manualAlignment : ff6a5307120276310c01fb6f9c223d77 ++many_random_points : 44f79b07c32fe2d334cb4d41bb245a2a ++markerSizes : c80e1e82fcd9d7cbcb52265cd966273b ++markerSizes2 : 2bc71206cca5fecdd89ee0ca6e7dec9a ++meshPlot : 390a65be331e6aeab8f4164b36b85e30 ++mixedBarLine : 124b6efc0a9b4d350e0f179bdcc794c9 ++multiline_labels : 113098f446ba5b37be05b2e495753a38 ++multipleAxes : c7c64c5f627f8633ee89ae02ba0b487e ++multiplePatches : 4d77a30b4a6b14772505e0e9c2a727cf ++overlappingPlots : 714f8029c2ad4fc86a8fb5323f35b0e4 ++pColorPlot : ce623ad5a9ebf4b3c74d5954027f0631 ++parameterCurve3d : ce2a304c64eb5283a40779f6f410d6ba ++peaks_contour : a08b52735b11941aef4194d42c50ca95 ++peaks_contourf : bae99cfb0c6d76fbb9eda7cf3253c861 ++pixelLegend : 2afe53d2be6f01a41b74c5bd892fda83 ++plain_cos : defebe18ad95f9f1b1f823ad96bd12bd ++plotyyLegends : 96cb3c09f470251db4ddf24f59e8e9f4 ++polarplot : a663c1b56d3073601536d4dacae5e8a0 ++quiver3plot : 5dd5d89ff4c5d3de0c000a999814d10a ++quiveroverlap : f446d413254f3f1e8e4ec449b8a7f813 ++quiverplot : 22d70477697462b313c3d56ef78ac9c8 ++randomWithLines : 9857814e260c4a929f5f0e9e92ba896d ++rectanglePlot : 045df69771942ea322873279a61c7b9f ++removeOutsideMarker : f9330795ff85ba1ce4753a700825ab8c ++roseplot : 526bbf61758a3ac158b2f1de6a39de73 ++scatter3Plot : cede4e9f5248013f47b95e589d805ea8 ++scatterPlotMarkers : b9f6262dba1b2035eb14abda46194ba7 ++scatterPlotRandom : 4b47c90b5493c5e53c3e60a4681e93fd ++sine_with_annotation : 0b0f9823c6c36cae49d5053d8b984884 ++sine_with_markers : 2cf4b72e72482e4b192012c4165ef5b5 ++spherePlot : 5b0e48733101f43996cc70c2962b52d8 ++stackedBarsWithOther : ac3c350f5af365630e0aaf4352108dd8 ++stairsplot : 73051cf170b77661c4ea464718af1ded ++stemplot : 983fded97cd2f6cb3286bbcbc5002473 ++stemplot2 : 7450fcbc9332ecbd8ac9e801aad4d8fc ++subplot2x2b : 7db858e541e4edc35e9721226d8a0f5a ++subplotCustom : 14bbb2edbd657c7386139bfd7085f8c9 ++surfPlot : 2aadedca0c9e2fe866252a5969fdd08a ++surfPlot2 : 30a4abfa8829ce6562f6bceb9e702b74 ++texInterpreter : b67b59f407a551196fa1448d9c35e9e7 ++texcolor : 7a8b8c01525fc11ac4f1186c803748a9 ++texrandom : 4dacf9590338ff73553c4a82a78e09bf ++textAlignment : 5e75059b1f661be10d3d790983f20f40 ++textext : 5be451a1b3314c54ee8ba519f6d2cae9 ++xAxisReversed : 1448dd92ba4ca7c492f060e3d585d340 ++ylabels : 9e68a9002553bcfe576a22d60ec7c5e9 ++zoom : 7777afa78e6ee6169841ccd5a894c942 diff -Nru matlab2tikz-1.1.0/debian/patches/series matlab2tikz-1.1.0/debian/patches/series --- matlab2tikz-1.1.0/debian/patches/series 2017-01-04 16:03:25.000000000 +0000 +++ matlab2tikz-1.1.0/debian/patches/series 2017-06-22 16:15:36.000000000 +0000 @@ -1,3 +1,4 @@ disable-updater.patch unreliable-test.patch path-issues.patch +new-octave-test-results.patch