diff -Nru vtk6-6.1.0+dfsg2/debian/changelog vtk6-6.1.0+dfsg2/debian/changelog --- vtk6-6.1.0+dfsg2/debian/changelog 2015-03-12 18:45:00.000000000 +0100 +++ vtk6-6.1.0+dfsg2/debian/changelog 2015-03-15 01:15:55.000000000 +0100 @@ -1,3 +1,10 @@ +vtk6 (6.1.0+dfsg2-6ubuntu1) vivid; urgency=low + + * Merge from Debian unstable (LP: #1432274). Remaining changes: + - Add some autopkgtests fixes, allowing stderr outputs. (Closes: #767338) + + -- Gianfranco Costamagna Sun, 15 Mar 2015 01:15:47 +0100 + vtk6 (6.1.0+dfsg2-6) unstable; urgency=medium [ James Cowgill ] @@ -5,6 +12,13 @@ -- Anton Gladky Thu, 12 Mar 2015 18:44:44 +0100 +vtk6 (6.1.0+dfsg2-5ubuntu1) vivid; urgency=low + + * Merge from Debian unstable (LP: #1407476). Remaining changes: + - Add some autopkgtests fixes, allowing stderr outputs. (Closes: #767338) + + -- Gianfranco Costamagna Sun, 04 Jan 2015 19:10:36 +0100 + vtk6 (6.1.0+dfsg2-5) unstable; urgency=medium * [8a28236] Remove libvtk6-java. (Closes: #773422) @@ -14,6 +28,26 @@ -- Anton Gladky Sat, 03 Jan 2015 21:06:27 +0100 +vtk6 (6.1.0+dfsg2-4ubuntu3) vivid; urgency=medium + + * Rebuild against libhdf5-8. + + -- Colin Watson Fri, 07 Nov 2014 13:54:52 +0000 + +vtk6 (6.1.0+dfsg2-4ubuntu2) vivid; urgency=medium + + * Apply "allow-stderr" to the other tests as well, as the new warning also + pops up for buildVTU. + + -- Martin Pitt Thu, 30 Oct 2014 18:23:50 +0100 + +vtk6 (6.1.0+dfsg2-4ubuntu1) vivid; urgency=medium + + * testBoolean autopkgtest: Allow stderr output until the new warning gets + sorted out. (See Debian #767338) + + -- Martin Pitt Thu, 30 Oct 2014 11:19:19 +0100 + vtk6 (6.1.0+dfsg2-4) unstable; urgency=medium [ Ondřej Surý ] diff -Nru vtk6-6.1.0+dfsg2/debian/control vtk6-6.1.0+dfsg2/debian/control --- vtk6-6.1.0+dfsg2/debian/control 2015-01-03 21:04:13.000000000 +0100 +++ vtk6-6.1.0+dfsg2/debian/control 2015-03-13 11:19:41.000000000 +0100 @@ -1,7 +1,8 @@ Source: vtk6 Section: graphics Priority: optional -Maintainer: Debian Science Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Science Team Build-Depends: chrpath, cmake (>= 2.8.5), diff -Nru vtk6-6.1.0+dfsg2/debian/tests/control vtk6-6.1.0+dfsg2/debian/tests/control --- vtk6-6.1.0+dfsg2/debian/tests/control 2015-03-12 18:43:39.000000000 +0100 +++ vtk6-6.1.0+dfsg2/debian/tests/control 2015-03-13 11:19:41.000000000 +0100 @@ -1,2 +1,3 @@ Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP Depends: libvtk6-dev, build-essential, cmake +Restrictions: allow-stderr