diff -pruN 5.9-8/debian/changelog 5.9-8ubuntu2/debian/changelog --- 5.9-8/debian/changelog 2024-08-16 10:17:47.000000000 +0000 +++ 5.9-8ubuntu2/debian/changelog 2025-09-06 15:41:37.000000000 +0000 @@ -1,3 +1,22 @@ +zsh (5.9-8ubuntu2) questing; urgency=medium + + * Rebuild to include updated RISC-V base ISA RVA23 + + -- Heinrich Schuchardt Sat, 06 Sep 2025 15:41:37 +0000 + +zsh (5.9-8ubuntu1) questing; urgency=medium + + * Merge with Debian unstable (LP: #2091426). Remaining changes: + - d/rules: disable building zsh-static on Ubuntu/i386 + * Dropped changes: + - d/p/cherry-pick-50641-use-int-main-in-test-C-codes-in-configure.patch, + dropped as it was upstreamed + - d/p/fix-boolcodes-pointer-type.patch: add a patch to fix the + pointer type of boolcodes to fix build with GCC 14, dropped as the patch + is no longer necessary to build the package + + -- Ural Tunaboyu Fri, 16 May 2025 14:09:33 +0200 + zsh (5.9-8) unstable; urgency=medium * [75b0275] Cherry-pick upstream commit 727b493e to address FTBFS on @@ -22,6 +41,29 @@ zsh (5.9-7) unstable; urgency=medium -- Michael Prokop Wed, 14 Aug 2024 13:18:44 +0200 +zsh (5.9-6ubuntu3) oracular; urgency=medium + + * Resolve ftbfs due to GCC 14 (LP: #2081998): + - d/p/fix-boolcodes-pointer-type.patch: add a patch to fix the + pointer type of boolcodes to fix build with GCC 14. + - d/p/cherry-pick-50641-use-int-main-in-test-C-codes-in-configure.patch: + add an upstream patch to fix broken detections with GCC 14. + + -- Zixing Liu Thu, 19 Sep 2024 11:14:09 -0600 + +zsh (5.9-6ubuntu2) noble; urgency=high + + * No change rebuild for 64-bit time_t and frame pointers. + + -- Julian Andres Klode Mon, 08 Apr 2024 18:24:20 +0200 + +zsh (5.9-6ubuntu1) noble; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Don't build zsh-static on Ubuntu/i386. + + -- Steve Langasek Fri, 23 Feb 2024 13:36:38 -0800 + zsh (5.9-6) unstable; urgency=medium * [c366ecc] Cherry pick upstream commit ecd3f9c9 to fix FTBFS issue with @@ -29,6 +71,12 @@ zsh (5.9-6) unstable; urgency=medium -- Michael Prokop Tue, 09 Jan 2024 11:15:01 +0100 +zsh (5.9-5ubuntu1) mantic; urgency=medium + + * Don't build zsh-static on Ubuntu/i386. + + -- Steve Langasek Thu, 21 Sep 2023 21:49:44 -0700 + zsh (5.9-5) unstable; urgency=medium * [138340f9,dc77864f] Cherry pick multiple (partial) upstream commits to diff -pruN 5.9-8/debian/control 5.9-8ubuntu2/debian/control --- 5.9-8/debian/control 2024-01-09 10:14:12.000000000 +0000 +++ 5.9-8ubuntu2/debian/control 2025-05-16 12:09:33.000000000 +0000 @@ -19,7 +19,8 @@ Build-Depends-Indep: cm-super-minimal, texlive-latex-base, texlive-latex-recommended, yodl (>= 3.08.01) | yodl (<< 3.08.00) -Maintainer: Debian Zsh Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Zsh Maintainers Uploaders: Michael Prokop , Axel Beckert , Frank Terbeck , diff -pruN 5.9-8/debian/rules 5.9-8ubuntu2/debian/rules --- 5.9-8/debian/rules 2024-08-14 12:12:11.000000000 +0000 +++ 5.9-8ubuntu2/debian/rules 2025-05-16 12:09:33.000000000 +0000 @@ -47,6 +47,10 @@ CONFIGFLAGS += --enable-zsh-secure-free CONFIGFLAGS += --enable-zsh-hash-debug endif +ifeq ($(DEB_HOST_ARCH):$(VENDOR),i386:ubuntu) + PKGS=-Nzsh-static +endif + # We first need to check if the package is installed, otherwise the # resulting syntax might be invalid. Needed for packages which are # also provided by other packages like libncurses-dev and @@ -54,13 +58,16 @@ endif BUILT_USING=$(shell for pkg in libcap-dev libncurses-dev libpcre2-dev libc-dev-bin; do dpkg-query -f '$${status}' -W $$pkg 2>&1 | grep -Fq installed && dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $$pkg; done) %: - dh $@ + dh $@ $(PKGS) override_dh_auto_build-arch: build-dynamic build-static build-dynamic: dh_auto_build -B obj build-static: +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) dh_auto_build -B obj-static +endif + : override_dh_auto_build-indep: dh_auto_build -B obj -- pdf @@ -70,7 +77,9 @@ override_dh_auto_test-arch: if dpkg-architecture -qDEB_BUILD_ARCH_OS | grep -qv hurd; then \ HOME="$(CURDIR)/obj/testhome" ZTST_verbose=1 dh_auto_test -B obj; \ fi +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) HOME="$(CURDIR)/obj-static/testhome" ZTST_verbose=1 dh_auto_test -B obj-static || true +endif override_dh_auto_test-indep: @@ -78,16 +87,24 @@ override_dh_auto_configure: chmod 755 configure mkdir -p obj/testhome obj-static/testhome dh_auto_configure -B obj -- $(CONFIGFLAGS) +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) dh_auto_configure -B obj-static -- $(CONFIGFLAGS) $(STATICFLAGS) +endif sed -e 's/#define VENDOR "pc"/#define VENDOR "$(VENDOR)"/' \ - -i obj/config.h obj-static/config.h + -i obj/config.h +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) + sed -e 's/#define VENDOR "pc"/#define VENDOR "$(VENDOR)"/' \ + -i obj-static/config.h sed -e 's/files.mdd link=no/files.mdd link=static/;s/stat.mdd link=no/stat.mdd link=static/' \ -i obj-static/config.modules +endif override_dh_auto_clean: dh_auto_clean -B obj +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) dh_auto_clean -B obj-static +endif override_dh_installdocs-indep: dh_installdocs -pzsh-doc --link-doc=zsh-common --doc-main-package=zsh-common @@ -147,12 +164,16 @@ override_dh_shlibdeps-arch: -dRecommends debian/zsh/usr/lib/*/zsh/*/zsh/*.so execute_after_dh_installdocs-arch: +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian +endif execute_after_dh_install-arch: +ifneq (,$(filter zsh-static, $(shell dh_listpackages))) mv debian/zsh-static/usr/bin/zsh debian/zsh-static/usr/bin/zsh-static mv debian/zsh-static/usr/bin/zsh5 debian/zsh-static/usr/bin/zsh5-static sed -e 's:#!/bin/zsh:#!/bin/zsh-static:' -i debian/zsh-static/usr/bin/zsh5-static +endif find debian/zsh-dev/usr/include/zsh -name '*.h' -o -name '*.mdh' | \ xargs sed -e 's@\.\./config\.h@config.h@;s@#\(\s*\)include "\([^"]\+\)"@#\1include @' -i