From: Peter Michael Green Date: Sun, 29 May 2022 13:30:34 +0000 (+0000) Subject: Manual merge of version 1.19.1+ds-9+rpi1 and 1.20+ds-4 to produce 1.20+ds-4+rpi1 X-Git-Tag: archive/raspbian/1.20+ds-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1c6b56a9757d7f25ea9e76acef6b135f8f716e43;p=macaulay2.git Manual merge of version 1.19.1+ds-9+rpi1 and 1.20+ds-4 to produce 1.20+ds-4+rpi1 --- 1c6b56a9757d7f25ea9e76acef6b135f8f716e43 diff --cc debian/changelog index adca71c,d5154e0..d7805a7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,17 -1,122 +1,137 @@@ - macaulay2 (1.19.1+ds-9+rpi1) bookworm-staging; urgency=medium ++macaulay2 (1.20+ds-4+rpi1) bookworm-staging; urgency=medium + + [Changes introduced in 1.18+ds-1+rpi1 by Peter Michael Green] + * Disable testsuite. + * Link individual font files rather than whole directory to avoid errors + on ".uuid" file. + * Disable upstream clean target, it's worse than useless + * Start writing manual cleanup (far from complete at this point) + + [changes introduced in 1.19.1+ds-8+rpi1 by Peter Michael Green] + * Disable documentation build. + * Extend manual cleaning (still not complete). + - -- Raspbian forward porter Fri, 06 May 2022 22:45:04 +0000 ++ -- Peter Michael Green Sat, 28 May 2022 07:25:19 +0000 ++ + macaulay2 (1.20+ds-4) unstable; urgency=medium + + * debian/control + - Add node-import-local, node-interpret, and node-rechoir to + Build-Depends-Indep; needed for webpack 5 to build highlight.js for + syntax highlighting in the HTML documentation. + * debian/rules + - Re-enable syntax highlighting in the HTML documentation; the webpack + bug that was causing build failures has been fixed. + + -- Doug Torrance Sat, 21 May 2022 07:09:31 -0400 + + macaulay2 (1.20+ds-3) unstable; urgency=medium + + * debian/rules + - Temporarily disable syntax highlighting in the HTML documentation. + Otherwise, a webpack bug will cause the build to fail. + + -- Doug Torrance Mon, 16 May 2022 22:26:51 -0400 + + macaulay2 (1.20+ds-2) unstable; urgency=medium + + * debian/control + - Bring w3c-markup-validator back to Build-Depends-Indep. + * debian/patches/highlightjs.patch + - Fix typo in Description; the backport was for highlight.js 9, not + webpack 9. + * debian/patches/skip-failing-package-tests.patch + - Skip check(13, "SpecialFanoFourfolds") on s390x. + * debian/rules + - Restore validate-html check now that the libxml bug that was causing + it to fail has been fixed. + + -- Doug Torrance Mon, 16 May 2022 14:20:47 -0400 + + macaulay2 (1.20+ds-1) unstable; urgency=medium + + * New upstream release. + * debian/control + - Add libboost-math-dev to Build-Depends; needed for several new + numerical functions. + - Add versioned dependency for libmathicgb-dev; need a newer version + to enable TBB support. + - Add libjs-bootsidemenu and libjs-nouislider to Build-Depends-Indep; + these replace formerly embedded JavaScript libraries. + - Add a versioned dependency for libjs-katex to ensure it has the + render-a11y-string extension. + - Add several dependencies for syntax highlighting in the HTML + documentation (node-css-loader, node-highlight.js, node-style-loader, + pkg-js-tools, and webpack) to Build-Depends-Indep. + - Bump Standards-Version to 4.6.1. + * debian/copyright + - Simplify KaTeX files in Files-Excluded; we now exclude the entire + directory instead of various specific files. + - Add BootSideMenu and noUiSlider embedded JavaScript libraries to + Files-Excluded since we now use their Debian packages. + - Bump my copyright years. + - Remove license information for formerly embedded JavaScript + libraries. + - Add license information for new packages that appeared in this + release. + * debian/macaulay2-common.linktrees + - Add symbolic links to BootSideMenu, noUiSlider, and the KaTeX + extension render-a11y-string. + * debian/macaulay2-common.lintian-overrides + - Add package-contains-documentation-outside-usr-share-doc overrides + for MergeTeX and SimplicialComplexes packages. + * debian/missing-sources + - Remove directory and its contents; no longer needed. + * debian/nodejs/extlinks + - New file; create symlinks during build to node modules needed for + enabling syntax highlighting in the HTML documentation. + * debian/patches + - Remove patches that have been applied or otherwise dealt with + upstream. + + givaro-bool-constant.patch + + tbb-2021.patch + + use-shared-mathicgb-and-friends.patch + * debian/patches/customize-argument-mode.patch + - New patch; enable adjusting command line arguments during package + tests. + * debian/patches/highlightjs.patch + - New patch; backport building of higlight.js for syntax highlighting + in HTML documentation to webpack 9, which is the version still in + Debian. + * debian/patches/skip-failing-{core,package}-tests.patch + - Stop skipping a number of tests that have either been fixed + upstream, fail very rarely, or should no longer be an issue + now that we are no longer setting ulimits. + * debian/patches/skip-failing-engine-tests.patch + - Skip an engine test that has been known to fail frequently. + * debian/README.Debian + - Drop section about embedded JavaScript libraries as there are no + longer any. + * debian/rules + - Use a number of new options to "configure" script. + + Specify that we are using the Debian packages for memtailor, + mathic, mathicgb, and gc. + + Disable building documentation when appropriate. + + Enable syntax highlighting in the HTML documentation when + appropriate. + - Use pkg-js-tools to create symlinks to the node modules needed + for enabling syntax highlighting. + - Instead of creating dummy copies of various KaTeX files before + the symlinks are created by dh_linktree, just create an empty dummy + directory. + - Don't set ulimits during tests. These were a frequent cause of build + errors on slow build machines. + * debian/scripts/Debian.m2 + - Cache SemidefiniteProgramming::Solver example; it had reproducility + problems. + * debian/source/lintian-overrides + - Add package-does-not-install-examples override for OnlineLookup + cached examples. + * debian/tests/control + - Skip package tests on armhf instead of marking them as flaky on all + architectures. + + -- Doug Torrance Sun, 15 May 2022 07:04:54 -0400 macaulay2 (1.19.1+ds-9) unstable; urgency=medium diff --cc debian/rules index bac288b,a78ec7f..4e009a0 --- a/debian/rules +++ b/debian/rules @@@ -18,26 -18,38 +18,38 @@@ VERSION := $(shell cat M2/VERSION dh $@ --sourcedirectory=M2 --with linktree # use exec_prefix instead of prefix in libdir, as that's what's needed - # to properly substitute paths in Layout#2, and set emacs lisp file - # installation directory so that the documentation matches where dh_elpa - # installs them + # to properly substitute paths in Layout#2 + LIBDIR := \$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) + + # set emacs lisp file installation directory so that the documentation + # matches where dh_elpa installs them EMACSDIR := \ \$${prefix}/share/emacs/site-lisp/elpa/macaulay2-$(VERSION) + WITH_PYTHON := $(if $(filter nopython, $(DEB_BUILD_PROFILES)),, --with-python) - override_dh_auto_configure: - dh_auto_configure -- \ - --libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --with-emacsdir=$(EMACSDIR) $(WITH_PYTHON) - # prevent html-check-links from failing to find KaTeX files before - # they get added by dh_linktree - KATEX_DIR := $(CURDIR)/M2/Macaulay2/packages/Style/katex - KATEX_FILES := $(patsubst %, $(KATEX_DIR)/%, \ - katex.min.css katex.min.js contrib/auto-render.min.js \ - contrib/copy-tex.min.css contrib/copy-tex.min.js) -ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) ++#ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + DISABLE_DOCUMENTATION = --disable-documentation -else -DISABLE_DOCUMENTATION := $(if $(shell dh_listpackages -i),,\ - --disable-documentation) -endif ++#else ++#DISABLE_DOCUMENTATION := $(if $(shell dh_listpackages -i),,\ ++# --disable-documentation) ++#endif - $(KATEX_DIR)/%: - touch $@ + override_dh_auto_configure: + dh_auto_configure -- \ + --libdir=$(LIBDIR) \ + --with-emacsdir=$(EMACSDIR) \ + --with-system-memtailor \ + --with-system-mathic \ + --with-system-mathicgb \ + --with-system-gc \ + $(WITH_PYTHON) \ + $(DISABLE_DOCUMENTATION) \ + $(if $(DISABLE_DOCUMENTATION),,--enable-syntax-highlighting) + ifeq ($(DISABLE_DOCUMENTATION),) + dh_auto_configure --buildsystem=nodejs + mv node_modules M2/Macaulay2/editors/highlightjs + endif # copy cached example output files (for examples known to fail on # various architectures) to source directory @@@ -66,11 -70,12 +70,12 @@@ execute_before_dh_auto_build: $(EXAMPLE # instead to run the test suite # related: https://bugs.debian.org/924052 override_dh_auto_test-arch: - # $(MAKE) -C M2 check - $(MAKE) -C M2 check ArgumentMode="defaultMode - SetUlimit" LIMIT= ++# $(MAKE) -C M2 check ArgumentMode="defaultMode - SetUlimit" LIMIT= + ifeq ($(DISABLE_DOCUMENTATION),) override_dh_auto_test-indep: - # uncomment after #994765 is fixed - # $(MAKE) -C M2 validate-html + $(MAKE) -C M2 validate-html + endif # create dumps of package documentation databases to ship with macaulay2-common # and then load during postinst