diff -Nru octave-4.2.1/debian/changelog octave-4.2.1/debian/changelog --- octave-4.2.1/debian/changelog 2017-12-30 17:24:28.000000000 +0000 +++ octave-4.2.1/debian/changelog 2018-01-04 14:41:31.000000000 +0000 @@ -1,14 +1,19 @@ -octave (4.2.1-4build2) bionic; urgency=medium +octave (4.2.1-5) unstable; urgency=medium - * No-change rebuild against libsuitesparseconfig5 + * Disable java on powerpc, fixes FTBFS on that arch. + * Adapt for new QScintilla library naming scheme. + + qscintilla-rename.patch: new patch. + + Now Build-Depends on libqscintilla2-qt5-dev. + Thanks to Scott Kitterman (Closes: #886195) + * Bump Standards-Version to 4.1.3. + * Use secure URL in debian/watch. + * Do not run debhelper in verbose mode. + * Convert d/upstream/signing-key.pgp to .asc format. + * Bump to debhelper compat level 11. + Incidentally, all documentation is now under /usr/share/doc/octave. + * No longer rename *.png files under /usr/share/info/. (Closes: #816534) - -- Graham Inggs Sat, 30 Dec 2017 17:24:28 +0000 - -octave (4.2.1-4build1) bionic; urgency=medium - - * No-change rebuild against libgl2ps1.4 - - -- Steve Langasek Sat, 11 Nov 2017 06:30:45 +0000 + -- Sébastien Villemot Thu, 04 Jan 2018 15:41:31 +0100 octave (4.2.1-4) unstable; urgency=medium diff -Nru octave-4.2.1/debian/compat octave-4.2.1/debian/compat --- octave-4.2.1/debian/compat 2017-06-09 14:51:55.000000000 +0000 +++ octave-4.2.1/debian/compat 2018-01-04 14:41:28.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru octave-4.2.1/debian/control octave-4.2.1/debian/control --- octave-4.2.1/debian/control 2017-11-11 06:30:45.000000000 +0000 +++ octave-4.2.1/debian/control 2018-01-04 14:41:28.000000000 +0000 @@ -1,13 +1,12 @@ Source: octave -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Octave Group +Maintainer: Debian Octave Group Uploaders: Sébastien Villemot , Rafael Laboissiere Section: math Priority: optional Build-Depends: automake, bison, - debhelper (>= 10.3), + debhelper (>= 11), default-jdk, desktop-file-utils, dh-exec, @@ -37,8 +36,8 @@ libpcre3-dev, libqhull-dev, libqrupdate-dev, + libqscintilla2-qt5-dev, libqt5opengl5-dev, - libqt5scintilla2-dev, libreadline-dev, librsvg2-bin, libsndfile1-dev, @@ -56,7 +55,7 @@ unzip, xauth, zip -Standards-Version: 4.1.0 +Standards-Version: 4.1.3 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-octave/octave.git Vcs-Git: https://anonscm.debian.org/git/pkg-octave/octave.git Homepage: http://www.octave.org/ @@ -71,7 +70,7 @@ Recommends: gnuplot-qt | gnuplot-x11 | gnuplot-nox, libopenblas-base | libatlas3-base, pstoedit, - default-jre-headless [!armel !hppa !hurd-i386 !m68k !mips !mipsel !sparc64], + default-jre-headless [!armel !hppa !hurd-i386 !m68k !mips !mipsel !powerpc !sparc64], octave-info Suggests: octave-doc, octave-htmldoc diff -Nru octave-4.2.1/debian/octave-doc.doc-base.lib octave-4.2.1/debian/octave-doc.doc-base.lib --- octave-4.2.1/debian/octave-doc.doc-base.lib 2017-09-10 14:52:03.000000000 +0000 +++ octave-4.2.1/debian/octave-doc.doc-base.lib 2018-01-04 14:41:28.000000000 +0000 @@ -8,4 +8,4 @@ Section: Science/Mathematics Format: PDF -Files: /usr/share/doc/octave-doc/liboctave.pdf +Files: /usr/share/doc/octave/liboctave.pdf diff -Nru octave-4.2.1/debian/octave-doc.doc-base.manual octave-4.2.1/debian/octave-doc.doc-base.manual --- octave-4.2.1/debian/octave-doc.doc-base.manual 2017-09-10 14:52:03.000000000 +0000 +++ octave-4.2.1/debian/octave-doc.doc-base.manual 2018-01-04 14:41:28.000000000 +0000 @@ -8,4 +8,4 @@ Section: Science/Mathematics Format: PDF -Files: /usr/share/doc/octave-doc/octave.pdf +Files: /usr/share/doc/octave/octave.pdf diff -Nru octave-4.2.1/debian/octave-doc.doc-base.refs octave-4.2.1/debian/octave-doc.doc-base.refs --- octave-4.2.1/debian/octave-doc.doc-base.refs 2017-09-10 14:52:03.000000000 +0000 +++ octave-4.2.1/debian/octave-doc.doc-base.refs 2018-01-04 14:41:28.000000000 +0000 @@ -8,4 +8,4 @@ Section: Science/Mathematics Format: PDF -Files: /usr/share/doc/octave-doc/refcard-*.pdf +Files: /usr/share/doc/octave/refcard-*.pdf diff -Nru octave-4.2.1/debian/octave-htmldoc.doc-base.lib octave-4.2.1/debian/octave-htmldoc.doc-base.lib --- octave-4.2.1/debian/octave-htmldoc.doc-base.lib 2017-06-19 13:05:58.000000000 +0000 +++ octave-4.2.1/debian/octave-htmldoc.doc-base.lib 2018-01-04 14:41:28.000000000 +0000 @@ -8,5 +8,5 @@ Section: Science/Mathematics Format: HTML -Index: /usr/share/doc/octave-htmldoc/liboctave.html/index.html -Files: /usr/share/doc/octave-htmldoc/liboctave.html/*.html +Index: /usr/share/doc/octave/liboctave.html/index.html +Files: /usr/share/doc/octave/liboctave.html/*.html diff -Nru octave-4.2.1/debian/octave-htmldoc.doc-base.manual octave-4.2.1/debian/octave-htmldoc.doc-base.manual --- octave-4.2.1/debian/octave-htmldoc.doc-base.manual 2017-06-19 13:41:11.000000000 +0000 +++ octave-4.2.1/debian/octave-htmldoc.doc-base.manual 2018-01-04 14:41:28.000000000 +0000 @@ -8,5 +8,5 @@ Section: Science/Mathematics Format: HTML -Index: /usr/share/doc/octave-htmldoc/octave.html/index.html -Files: /usr/share/doc/octave-htmldoc/octave.html/*.html +Index: /usr/share/doc/octave/octave.html/index.html +Files: /usr/share/doc/octave/octave.html/*.html diff -Nru octave-4.2.1/debian/patches/qscintilla-rename.patch octave-4.2.1/debian/patches/qscintilla-rename.patch --- octave-4.2.1/debian/patches/qscintilla-rename.patch 1970-01-01 00:00:00.000000000 +0000 +++ octave-4.2.1/debian/patches/qscintilla-rename.patch 2018-01-04 14:41:22.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix detection of QScintilla following change in library naming scheme +Author: Scott Kitterman +Bug-Debian: https://bugs.debian.org/886195 +Forwarded: no +Reviewed-by: Sébastien Villemot +Last-Update: 2018-01-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- octave-4.2.1.orig/m4/acinclude.m4 ++++ octave-4.2.1/m4/acinclude.m4 +@@ -1346,7 +1346,7 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_ + ;; + 5) + QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" +- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" ++ octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5" + ;; + *) + AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff -Nru octave-4.2.1/debian/patches/series octave-4.2.1/debian/patches/series --- octave-4.2.1/debian/patches/series 2017-09-10 14:58:14.000000000 +0000 +++ octave-4.2.1/debian/patches/series 2018-01-04 14:41:22.000000000 +0000 @@ -10,3 +10,4 @@ strncmp.patch add-corrcoef-function.patch java9.patch +qscintilla-rename.patch diff -Nru octave-4.2.1/debian/README.Debian octave-4.2.1/debian/README.Debian --- octave-4.2.1/debian/README.Debian 2014-02-12 17:52:32.000000000 +0000 +++ octave-4.2.1/debian/README.Debian 2018-01-04 14:41:31.000000000 +0000 @@ -2,7 +2,7 @@ =================== The octave-doc package contains extra documentation in PDF form which can be -found in the directory /usr/share/doc/octave-doc once this supplementary +found in the directory /usr/share/doc/octave once this supplementary package is installed. Similarly, documentation in HTML format is available in the octave-htmldoc package, and documentation in Info format is in the octave-info package. @@ -48,5 +48,5 @@ pkg.m is not part of liboctave-dev as it's used to find already installed packages (via /etc/octave.conf). - -- Sébastien Villemot , Wed, 12 Feb 2014 18:52:32 +0100 + -- Sébastien Villemot , Thu, 4 Jan 2018 15:54:01 +0100 diff -Nru octave-4.2.1/debian/rules octave-4.2.1/debian/rules --- octave-4.2.1/debian/rules 2017-09-22 14:55:30.000000000 +0000 +++ octave-4.2.1/debian/rules 2018-01-04 14:41:31.000000000 +0000 @@ -1,8 +1,6 @@ #!/usr/bin/make -f # -*- makefile -*- -export DH_VERBOSE=1 - # Needed by octave-common.links include /usr/share/dpkg/pkg-info.mk DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM)) @@ -18,7 +16,7 @@ # build deps because it is needed for octave-common, see # debian/patches/always-build-octave-jar.patch). include /usr/share/dpkg/architecture.mk -NO_JDK_ARCHS := armel hppa hurd-i386 m68k mips mipsel sparc64 +NO_JDK_ARCHS := armel hppa hurd-i386 m68k mips mipsel powerpc sparc64 ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JDK_ARCHS))) WITH_JAVA_FLAGS := --disable-java else @@ -68,14 +66,15 @@ # Delete .la files (for liboctgui) find debian/tmp -name '*.la' -delete -# The info files have references to .png images -# Rename them by prefixing their name with "octave-", adapt the *.info files to -# this new name, and ship the images under /usr/share/info +# The info files have references to .png images, so also ship those. +# Note that we do not install all doc/interpreter/*.png, since some are not referenced +# when compiling the output info (using @ifnotinfo macro). +# We used to rename them by prefixing their name with "octave-", but this was breaking some +# info files (see #816534). override_dh_installinfo-indep: dh_installinfo for f in `grep -a src=\".*\" doc/interpreter/*.info* | sed 's/.*src="\([^"]*\)".*/\1/'`; do \ - cp doc/interpreter/$$f debian/octave-info/usr/share/info/octave-$$f; \ - sed -i "s/src=\"$$f\"/src=\"octave-$$f\"/g" debian/octave-info/usr/share/info/octave.info*; \ + cp doc/interpreter/$$f debian/octave-info/usr/share/info/; \ done # Strip the executable bit from the .oct files @@ -91,6 +90,12 @@ dh_makeshlibs --package=octave --noscripts dh_makeshlibs --no-package=octave +# Since octave-htmldoc does not end with "-doc", dh_installdocs needs help in order +# to figure the main doc package. +override_dh_installdocs: + dh_installdocs --package=octave-htmldoc --doc-main-package=octave + dh_installdocs --no-package=octave-htmldoc + get-orig-source: uscan --force-download --rename --destdir . .PHONY: get-orig-source diff -Nru octave-4.2.1/debian/subdirs-vars.pl octave-4.2.1/debian/subdirs-vars.pl --- octave-4.2.1/debian/subdirs-vars.pl 2013-07-26 14:49:44.000000000 +0000 +++ octave-4.2.1/debian/subdirs-vars.pl 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -#!/usr/bin/perl -w - -### Manipulates the SUBDIRS and INSTALL_SUBDIRS variables. Run like this -### subdirs-vars.pl no-doc -### subdirs-vars.pl only-doc - -my $line = ""; -my $action = shift @ARGV; - -while (<>) { - $line .= $_; - - ## Line continuation character ("\") - next if /\\$/; - - if ($line =~ /^((INSTALL_|)SUBDIRS =)/) { - if ($action eq "no-doc") { - $line =~ s/doc//; - } else { - $line = "$1 doc\n"; - } - } - - print $line; - - $line = ""; -} - - diff -Nru octave-4.2.1/debian/upstream/signing-key.asc octave-4.2.1/debian/upstream/signing-key.asc --- octave-4.2.1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ octave-4.2.1/debian/upstream/signing-key.asc 2018-01-04 14:41:28.000000000 +0000 @@ -0,0 +1,72 @@ +-----BEGIN PGP ARMORED FILE----- +Comment: Use "gpg --dearmor" for unpacking + +mQGiBEQyCSoRBACyF3x52nJTkkCuSSLFdObndwTAoRIJT96ZTxy4FFDXs9yazjHX +JN/vGt0mO7mLpmu4eX8BBFN/e8i8YKndm3lGxwwvQGMvBy9DSjTyzwaR5SF/NWx8 +0vdiUslY991Qvr6l96Ppv4slTJshxZJrwRmAmaYBnXnqcdnnLeVuI69z9wCgwlBn +yu+XiI/WjZzKH0EyZNEqKS8D/Rumx+ft7thtp4AN/wY4I+Qy+z/OAILuybChnywx +T71XhQOnoZ/37IhtJWZFEW+ycfgHofbTKzrdE9BmUNeJNZ8gCm+fmEAC+bpru2Fy +vsjKPonghl0n7kQApxJsHVas/WesjrUA2/0sF6ki/Usbug+RhNMqmyHjkzuCK3fT +9ItpBACYgxsaeSKwH78vItSMFtCrgk6/gjiQtLRnn9Ctpoq8Ev8CPw6l/Xe+sVYM +2HuwYjSPAz2Z8b2G+p73r4xZ8IMqfDYRcMmBoGTUfNPfxDU7CR3mQk4viMl/bVZA +mbGFg39rZAFDgtHwvZ9BsHlSkCUOadZ3PGVRwbseOBbCXK10BrQbSm9obiBXLiBF +YXRvbiA8andlQGdudS5vcmc+iEYEEBECAAYFAkffLhEACgkQqDKTP8AvU8WvFgCb +B0Rm9/eOkG+xs0wzE9xtUMBU3AEAoJ6I8HKcANNx1wlHndPyKQnN71SXiEYEEBEC +AAYFAkfgYCYACgkQWWWZgY31A6ntngCfSFAJ3k9lu1XtvBIjLxShWI63RjYAn2j1 +CXSna1yHw7BrQGSJEXXaQVlPiEYEEBECAAYFAkfm7xsACgkQTUgKy1IqesZ9NACf +VGSsI62mjHErtsbjo+iwL7sn/tUAnjH/ICN7OcOoNAQF+NBBk5lnt9JCiEYEEBEC +AAYFAknFhp8ACgkQO50JPzGwl0tsjACfXdB1LSmwpDQu18gEL97FqYetR/wAn3N1 +st7LaCJx2MLxOjuWn9WV9L50iEYEEBECAAYFAknM3pEACgkQUjSEXfK5IPXmcwCg +lCRKKgIhf3yHFUadnYg+GWoxEwsAoOaOn1EbD5smUHsYpDn/F6qy/wrMiEYEEBEC +AAYFAknQBOEACgkQuuui10VsrVGM7QCghWLeaI6d7+UqWdlcJs38gj+wRUUAn0/f +x0niV4Q+Y9EhmHq1vs4G9L3piEYEEBECAAYFAkurhgoACgkQbiFv7WQGnVwGUACf +Vxwj22dQmob4Hoisln+mFW+LYfcAn2nZNeXXRI8EhJF06WEB1/wc8CyiiEYEEBEC +AAYFAkuydUwACgkQB5GvjMAzY/T8owCeNNUZVBDQYj1TfzWQcESjTUEoioYAoMtG +xBKB5yrsSncnmXh1t2GrB+KMiEYEEBECAAYFAku2LzMACgkQCRwR0q6GALb0bgCf +TJccZsa6/Ves5xhwPria1gLBFUoAnA1OHsbH51SwsQwzHQ30LROTeg7riEYEEBEC +AAYFAk2FNn0ACgkQUJT6e6HFtqQ+RQCZAWNkJNp75nysmBDheZLN+4B8px4Anj7P +2KQB5y+QfTUkzq29O5mQMSsHiEYEEBECAAYFAk2IEwUACgkQ/dd9nqO0c9hVXgCg +1TuOvOx3CGIDGsv9XCCz7px2t2AAn09gz89bRDv9s5gw/fGeLSsPlx27iGAEExEC +ACAFAkQyCSoCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCwXwW3XTZkS8MH +AJ962M8ZYCTP0KI16PgH4kLbM9wNVACfbsVb5pYr9Mj8kR2XBwZLssPbOgaInAQQ +AQIABgUCScpQLAAKCRD1TYragIIf6r5dA/9X+1FWcpFCNQUQ9U8wcmlFFbcur8Cs +I4qVAqDTr8HfKxOuroeEBnlA11PJ90c9FlshITMNC5Wjtd4+lcz7QCc629LEDVvh +fXbBDcCuUfalKxEBNtbTtWLEmuivlKLU4Q69TlZnr5NQ7GSOAnQSfflzzblyOda1 +OQL8UfRCQ/d6KYkCHAQQAQoABgUCS7DKEgAKCRCMv5oyKGGnkBplEACIZ5HFUEGJ +qfDqMkDrOb4x65PPPcCK2F5ZvOlVZyVc5A8eh7qMUm3HKPKWYBKUuv06t2HeuaFC +qhJT4ilyj2Xo6Q2G+y5jy6EFwtvr2RTDGd8qh2XKHg6SbNZNxc+IyrnpLhTUpm7/ +/DsE4e74QA/0HtRM0fytoVEn2pIYtQcuVM03cr/+NyaSUgkwTGGXnsnyaq7sv89r +Dfxhef1LEB/9B31J1X7fCtT8Y5gEc57EMiGwSyB/cYXgGKyfoaB9H9zmcUY+B1t8 +JEVXqSgoHcPubkA0mLjRL2Nl/jfLGf/sDn+X4LgvA0mKNDoDuG62MxTT6clMtFot +e5h5xju+nhO7HrlZOd4wkclO+PSuJ+xhOLGEP4CbSzH7xhOwUtFS2y0bniuFpyIZ +6i+wp1vw1ijzUs3bCsWVDgjil4XMFMePBOpPZid94i6F6wL4ATlHGLhfgV1sYzr3 +3YKJBwhind92guH0SYTUnNchshK2yaVwkB3HcHEU4JbHmaZSHgW6FcfoaTfhlACp +Pl+Amz512syMMrxi8FqiwlrxcYJmMr0GRgvoiCQFPE23B2Pbez6Ow9bZg+2nOsvG +/knD8atEDhl/gX/kHhnCJngMMbboAP1+BoK+s9efJAtAAFOxlZ5f6hpi1Ga13RM6 +Ikm3mGP21SK3PHjDXQD7VCuNkWtLCEZCAIkCHAQQAQgABgUCUkjOYwAKCRDDkq9J +Jfd0q5tKEACNoFlXkpn1BGqWmW0s6MExJf5JosVvmZIymbmP1Qnmb2YXBb7PpptK +I83926/rJCvC1INGvxqe+RnG9tG8i2As/i2OMXUACq+baBaqEA1c4R+gCtq7PgyM +ZrXC+n9nfAynWLX0FzRh716EoQ1K1SyegUEZ46Z84/+vr76RbSHrwclj3unX8E+J +pXzorhK/DvllqBuO64I8gSvqwaTd+O0T7YVpzG2pCw7Ts+ndEXFzn1hx96lxjcDy +xOSLHEw8P5gI6a/xuJpbZsQANPse11MnV+Ay4wcMoJ2/3gerlEBaoCIZDRiFrTt3 +aUh4siFTzurkuzSewurKAuGNzpstxXH7DxDdU01RJlqb8VYRhzL0lBtPf4bZFHqF +cITNsXBF7UWUDEhk2d5cRIQ1lSAsmwmAv+6n18T1EQxD8ktpp05nTe4nBwpcH5Ig +NLHb2rr0cdz67J6711DpIq4naCsIQiQmUH0p9UQUHceAoJaqlwO8ewpxTlWdaQMF +5nmCH0Lf0u8Lwsz9gmi1uib1xSgWCJ3/hAm5vWPm0nVo/6KG1jMIX/YXVyWDZenY +fUKyUfxI+xcvmNYWwF3Bxard0V29h9I9dvzSimdwQG2wAAKqs2/K8tSh+6oZjXug +JeTr4tF08ShHA8TWrInYiuqNtbnBHHvvjKSzT8vwKw8eP1Ze7l6mwrkCDQREMgk3 +EAgAiaQCSr4i7xfy+xUP2SI7JxkfwPFt05ab2ybRv68tJJWGM6LQF7izHFICGTbS +pxtIM3jNQkAZ1uS2god0KoRiQ2roXbV3hWxSEBHildVn522KyTotKLIsdsu/3oTD +3JVheaHP4fVGDQQfXMXjt7OY8aZZbCkczc5dMiyMEb6rd4X8ldOmQPpb5AD5vkze +Ep/5RqYQ422MPvCkBeHlY68EAV44qkp0OXO2jaW/zVU4gplNSM+NzupgC5vPDEnn +g08TPDiu8nlIcl1JVhTP9h/KyMlm4WCVD/tG1woHo9hA8toIrFF0+cMxSftEfgzq +bP8bkTgFD4//Hj8uAlRtpnLYIwADBQf/aTylPOH6Y2BmUSofy+jiw7zL4Lr8bIzs +LGGWcaVsdng62VPP7/sx0dZDXtu6wLxOab0UhPa0HOK4oTvP5el+eywQzr/kU9gs +4fCuQ1LdB63RPCvlkFrD5pZIjQeI+mknUQ9v3fYeYPYKnXukaFhbKRkhKTRMOPdf +hP+JZdbLBVAFXQpc+m1MJCy8io3rZVOiK+aPhyBY8lMRZA7hlcwNhM+maEXbKDrj +C5mz+Xj4YmDhreK+jTSY3MtaOyPRWYdwwxn2tVQvyuJouzQKC6sDndgu4dYaWze9 +N2kRg60vupCuZ8c0avh/C0G/ztYBDXWpTE/NDHKksJT5nXwqVU01SYhJBBgRAgAJ +BQJEMgk3AhsMAAoJELBfBbddNmRL6egAoKs868fId10Rj6irNMtEY/G+v+QSAJ9E +IXYQi3Sjmf2nx/3J2eAhK13ZRg== +=+mV9 +-----END PGP ARMORED FILE----- Binary files /tmp/tmpS0lmhU/QNkaccDMYj/octave-4.2.1/debian/upstream/signing-key.pgp and /tmp/tmpS0lmhU/2XcTqVHp1d/octave-4.2.1/debian/upstream/signing-key.pgp differ diff -Nru octave-4.2.1/debian/watch octave-4.2.1/debian/watch --- octave-4.2.1/debian/watch 2017-07-11 13:53:39.000000000 +0000 +++ octave-4.2.1/debian/watch 2018-01-04 14:41:28.000000000 +0000 @@ -1,2 +1,2 @@ version=4 -opts=pgpsigurlmangle=s/$/.sig/ http://ftpmirror.gnu.org/octave/octave-([\d\.]+)\.tar\.xz +opts=pgpsigurlmangle=s/$/.sig/ https://ftpmirror.gnu.org/octave/octave-([\d\.]+)\.tar\.xz