diff -Nru octave-msh-1.0.10/debian/autoreconf.after octave-msh-1.0.10/debian/autoreconf.after --- octave-msh-1.0.10/debian/autoreconf.after 1970-01-01 00:00:00.000000000 +0000 +++ octave-msh-1.0.10/debian/autoreconf.after 2017-09-09 17:05:52.000000000 +0000 @@ -0,0 +1,45 @@ +dd483f5587c4fffb240e109c58fb0914 ./NEWS +e8a673d5d4d69a5fd11c880fd4c3c481 ./.pc/.quilt_series +96a379677a3d09f4bec918f507e62597 ./.pc/applied-patches +26ab0db90d72e28ad0ba1e22ee510510 ./.pc/.version +d41d8cd98f00b204e9800998ecf8427e ./.pc/configure-script-source.patch/src/configure.ac +816b532938a672eb654d4bb633882a60 ./.pc/continuation-lines.patch/inst/msh2m_structured_mesh.m +941466257f3bf791dc0a8f50f794f6f4 ./.pc/pkg-config-dolfin.patch/src/configure.ac +266f9759f56277b2751b24d1eb17c50f ./.pc/.quilt_patches +e7a40dd1e38b94eb05890e35aec09dc2 ./INDEX +e3fc3e98460f9ab1359cf9c2213a9cd7 ./DESCRIPTION +a8aa7b5f2b329cdc87ed83825613dd10 ./inst/msh2m_equalize_mesh.m +2f3670dbe718ae1ad73f732468742a1c ./inst/msh2m_submesh.m +476eb23fc307b83d2e481575f87df136 ./inst/msh3m_geometrical_properties.m +177330b6124fb8ea8b2c0b11b5ded0c4 ./inst/msh2p_mesh.m +dbae2df0290d58f54203832015b51000 ./inst/msh2m_mesh_along_spline.m +2c70e04d0224ce63ac21a26ba3454179 ./inst/msh3m_nodes_on_faces.m +0d0063de8b684609845dc94e6230d591 ./inst/msh2m_join_structured_mesh.m +b670725d4424a903bcfb99e3cf5f8b34 ./inst/msh3e_surface_mesh.m +0b3e96c9610e253a5828481185cb3727 ./inst/msh2m_nodes_on_sides.m +406c3c30cafde0fc56168119279aeb73 ./inst/msh2m_geometrical_properties.m +28095c5adb412b49ea3a38a568ab7310 ./inst/msh2m_jiggle_mesh.m +9a15cb4179cc9fb8fc7cfa2f3bf08b90 ./inst/msh3m_join_structured_mesh.m +6afd4b9178e1e004c8a668fd3c85aa54 ./inst/msh2m_structured_mesh.m +b193915facbf5f48692731f949a2629c ./inst/msh2m_gmsh.m +45d2f492585c7d389077ff0d45a1ff3c ./inst/msh3m_gmsh_write.m +171057f8935c65f93f3741c53d857e3a ./inst/msh2m_topological_properties.m +eb932a841d8852b37a5a13e1d353bb0c ./inst/msh3m_structured_mesh.m +ebdf88e2023aa5e012ecdc8034c7cef9 ./inst/msh2m_displacement_smoothing.m +a9beecad9d960b8fe4804b15b1d24079 ./inst/msh2m_gmsh_write.m +b2efd0107bdca5a847a8adea4d1f0cd3 ./inst/msh3m_submesh.m +101c023341ddc7e0dcc769bbb26e65e7 ./inst/msh3m_gmsh.m +969307b2d49493863c31de2e8447bd95 ./.gitignore +b30071820b68cd3ba9a6fd2d9291f08f ./src/autom4te.cache/traces.0 +135f6323ef574e8c04ce654787c8d808 ./src/autom4te.cache/output.1 +d7d53ac4b6903379beb9ae456679f4ab ./src/autom4te.cache/traces.1 +566691995d474315d1fa6ab8c95a64b9 ./src/autom4te.cache/requests +135f6323ef574e8c04ce654787c8d808 ./src/autom4te.cache/output.0 +06c7c12be7f63feef38832bbb7663685 ./src/mshm_dolfin_read.cc +3afd72badcc6eb344034a2880f42c13f ./src/configure.ac +325078991af6f242991cadd66bcd53ee ./src/aclocal.m4 +270e9accb15c8e2a20917379a352570a ./src/Makefile.in +a2339bb05f359efe89ae7ed392a3de43 ./src/mshm_refine.cc +0bccdff0b7dabb5dfc8642a30229198c ./src/configure +9d14012a237b9b8405028056b2aa93ea ./src/mshm_dolfin_write.cc +ba0cbea55eef6369a84d90afd6757adb ./COPYING diff -Nru octave-msh-1.0.10/debian/autoreconf.before octave-msh-1.0.10/debian/autoreconf.before --- octave-msh-1.0.10/debian/autoreconf.before 1970-01-01 00:00:00.000000000 +0000 +++ octave-msh-1.0.10/debian/autoreconf.before 2017-09-09 17:05:50.000000000 +0000 @@ -0,0 +1,38 @@ +dd483f5587c4fffb240e109c58fb0914 ./NEWS +e8a673d5d4d69a5fd11c880fd4c3c481 ./.pc/.quilt_series +96a379677a3d09f4bec918f507e62597 ./.pc/applied-patches +26ab0db90d72e28ad0ba1e22ee510510 ./.pc/.version +d41d8cd98f00b204e9800998ecf8427e ./.pc/configure-script-source.patch/src/configure.ac +816b532938a672eb654d4bb633882a60 ./.pc/continuation-lines.patch/inst/msh2m_structured_mesh.m +941466257f3bf791dc0a8f50f794f6f4 ./.pc/pkg-config-dolfin.patch/src/configure.ac +266f9759f56277b2751b24d1eb17c50f ./.pc/.quilt_patches +e7a40dd1e38b94eb05890e35aec09dc2 ./INDEX +e3fc3e98460f9ab1359cf9c2213a9cd7 ./DESCRIPTION +a8aa7b5f2b329cdc87ed83825613dd10 ./inst/msh2m_equalize_mesh.m +2f3670dbe718ae1ad73f732468742a1c ./inst/msh2m_submesh.m +476eb23fc307b83d2e481575f87df136 ./inst/msh3m_geometrical_properties.m +177330b6124fb8ea8b2c0b11b5ded0c4 ./inst/msh2p_mesh.m +dbae2df0290d58f54203832015b51000 ./inst/msh2m_mesh_along_spline.m +2c70e04d0224ce63ac21a26ba3454179 ./inst/msh3m_nodes_on_faces.m +0d0063de8b684609845dc94e6230d591 ./inst/msh2m_join_structured_mesh.m +b670725d4424a903bcfb99e3cf5f8b34 ./inst/msh3e_surface_mesh.m +0b3e96c9610e253a5828481185cb3727 ./inst/msh2m_nodes_on_sides.m +406c3c30cafde0fc56168119279aeb73 ./inst/msh2m_geometrical_properties.m +28095c5adb412b49ea3a38a568ab7310 ./inst/msh2m_jiggle_mesh.m +9a15cb4179cc9fb8fc7cfa2f3bf08b90 ./inst/msh3m_join_structured_mesh.m +6afd4b9178e1e004c8a668fd3c85aa54 ./inst/msh2m_structured_mesh.m +b193915facbf5f48692731f949a2629c ./inst/msh2m_gmsh.m +45d2f492585c7d389077ff0d45a1ff3c ./inst/msh3m_gmsh_write.m +171057f8935c65f93f3741c53d857e3a ./inst/msh2m_topological_properties.m +eb932a841d8852b37a5a13e1d353bb0c ./inst/msh3m_structured_mesh.m +ebdf88e2023aa5e012ecdc8034c7cef9 ./inst/msh2m_displacement_smoothing.m +a9beecad9d960b8fe4804b15b1d24079 ./inst/msh2m_gmsh_write.m +b2efd0107bdca5a847a8adea4d1f0cd3 ./inst/msh3m_submesh.m +101c023341ddc7e0dcc769bbb26e65e7 ./inst/msh3m_gmsh.m +969307b2d49493863c31de2e8447bd95 ./.gitignore +06c7c12be7f63feef38832bbb7663685 ./src/mshm_dolfin_read.cc +3afd72badcc6eb344034a2880f42c13f ./src/configure.ac +270e9accb15c8e2a20917379a352570a ./src/Makefile.in +a2339bb05f359efe89ae7ed392a3de43 ./src/mshm_refine.cc +9d14012a237b9b8405028056b2aa93ea ./src/mshm_dolfin_write.cc +ba0cbea55eef6369a84d90afd6757adb ./COPYING diff -Nru octave-msh-1.0.10/debian/changelog octave-msh-1.0.10/debian/changelog --- octave-msh-1.0.10/debian/changelog 2017-06-12 10:21:34.000000000 +0000 +++ octave-msh-1.0.10/debian/changelog 2017-09-09 17:31:41.000000000 +0000 @@ -1,8 +1,18 @@ -octave-msh (1.0.10-2build1) artful; urgency=medium +octave-msh (1.0.10-3) unstable; urgency=medium - * Rebuild against new liboctave4. + [ Sébastien Villemot ] + * d/copyright: use secure URL for format. - -- Gianfranco Costamagna Mon, 12 Jun 2017 12:21:34 +0200 + [ Rafael Laboissiere ] + * d/p/continuation-lines.patch: New patch + * d/p/skip-dolfin-tests.patch: New patch. + Skip the unit tests related to the dolfin library, avoiding the + package to FTBFS. (Closes: #874138) + * d/control: + + Use cgit instead of gitweb in Vcs-Browser URL + + Bump Standards-Version to 4.1.0 (no changes needed) + + -- Rafael Laboissiere Sat, 09 Sep 2017 14:31:41 -0300 octave-msh (1.0.10-2) unstable; urgency=medium diff -Nru octave-msh-1.0.10/debian/control octave-msh-1.0.10/debian/control --- octave-msh-1.0.10/debian/control 2017-01-24 11:00:41.000000000 +0000 +++ octave-msh-1.0.10/debian/control 2017-09-09 17:31:02.000000000 +0000 @@ -9,10 +9,10 @@ Build-Depends: debhelper (>= 10), cdbs, octave-pkg-dev (>= 1.0.2), gmsh, openssh-client, libhdf5-openmpi-dev, liboctave-dev (>= 3.6.2-5) Build-Conflicts: libdolfin1.3-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 Homepage: http://octave.sourceforge.net/msh Vcs-Git: https://anonscm.debian.org/git/pkg-octave/octave-msh.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-octave/octave-msh.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-octave/octave-msh.git Package: octave-msh Architecture: any diff -Nru octave-msh-1.0.10/debian/copyright octave-msh-1.0.10/debian/copyright --- octave-msh-1.0.10/debian/copyright 2017-01-24 10:26:57.000000000 +0000 +++ octave-msh-1.0.10/debian/copyright 2017-06-09 19:43:30.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: MSH package for Octave Upstream-Contact: The Octave Community Source: http://octave.sourceforge.net/msh/ diff -Nru octave-msh-1.0.10/debian/patches/continuation-lines.patch octave-msh-1.0.10/debian/patches/continuation-lines.patch --- octave-msh-1.0.10/debian/patches/continuation-lines.patch 1970-01-01 00:00:00.000000000 +0000 +++ octave-msh-1.0.10/debian/patches/continuation-lines.patch 2017-09-09 17:27:31.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Use three periods instead of backslash as continuation lines +Author: Rafael Laboissière +Forwarded: https://savannah.gnu.org/bugs/index.php?51970 +Last-Update: 2017-09-09 + +--- octave-msh-1.0.10.orig/inst/msh2m_structured_mesh.m ++++ octave-msh-1.0.10/inst/msh2m_structured_mesh.m +@@ -229,9 +229,9 @@ endfunction + %!test + %! x = y = linspace(0,1,3); + %! msh = msh2m_structured_mesh(x,y,1,[1:4]); +-%! p = [0.00000 0.00000 0.00000 0.50000 0.50000 0.50000 \ ++%! p = [0.00000 0.00000 0.00000 0.50000 0.50000 0.50000 ... + %! 1.00000 1.00000 1.00000 +-%! 0.00000 0.50000 1.00000 0.00000 0.50000 1.00000 \ ++%! 0.00000 0.50000 1.00000 0.00000 0.50000 1.00000 ... + %! 0.00000 0.50000 1.00000]; + %! assert(msh.p,p) + %! e = [1 4 7 8 3 6 1 2 diff -Nru octave-msh-1.0.10/debian/patches/series octave-msh-1.0.10/debian/patches/series --- octave-msh-1.0.10/debian/patches/series 2017-01-24 10:26:57.000000000 +0000 +++ octave-msh-1.0.10/debian/patches/series 2017-09-09 17:19:26.000000000 +0000 @@ -1 +1,3 @@ configure-script-source.patch +continuation-lines.patch +skip-dolfin-tests.patch diff -Nru octave-msh-1.0.10/debian/patches/skip-dolfin-tests.patch octave-msh-1.0.10/debian/patches/skip-dolfin-tests.patch --- octave-msh-1.0.10/debian/patches/skip-dolfin-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ octave-msh-1.0.10/debian/patches/skip-dolfin-tests.patch 2017-09-09 17:22:24.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Skip the unit tests related to the dolfin library +Author: Rafael Laboissière +Forwarded: not-needed +Last-Update: 2017-09-09 + +--- octave-msh-1.0.10.orig/src/mshm_dolfin_read.cc ++++ octave-msh-1.0.10/src/mshm_dolfin_read.cc +@@ -148,7 +148,7 @@ with matrix fields (p,e,t).\n\ + + + /* +-%!test ++%!xtest + %! x = y = z = linspace (0, 1, 2); + %! msh = msh3m_structured_mesh (x, y, z, 1, [1 : 6]); + %! mshm_dolfin_write (msh, "msh"); +--- octave-msh-1.0.10.orig/src/mshm_dolfin_write.cc ++++ octave-msh-1.0.10/src/mshm_dolfin_write.cc +@@ -318,7 +318,7 @@ with matrix fields (p,e,t).\n\ + } + + /* +-%!test ++%!xtest + %! x = y = z = linspace (0, 1, 2); + %! msh = msh3m_structured_mesh (x, y, z, 1, [1 : 6]); + %! mshm_dolfin_write (msh, "msh"); +--- octave-msh-1.0.10.orig/src/mshm_refine.cc ++++ octave-msh-1.0.10/src/mshm_refine.cc +@@ -434,7 +434,7 @@ the same structure as @var{mesh}\n\ + %! title ('uniformly refined mesh'); + */ + /* +-%!test ++%!xtest + %! x = y = linspace (0, 1, 2); + %! msh = msh2m_structured_mesh (x, y, 1, [1 : 4]); + %! msh.t (4, 2) = 2;