Control: tags 991180 pending Control: tags 986704 pending I have uploaded an NMU to DELAYED/10 fixing reproducible builds and cross-building issues, as well as some pending issues already merged in git found by Debian Janitor.
Merge request also available: https://salsa.debian.org/debian/xaw3dg/-/merge_requests/3 Full debdiff follows (including changes already in git, in particular, whitespace changes): diff -Nru xaw3d-1.5+F/debian/changelog xaw3d-1.5+F/debian/changelog --- xaw3d-1.5+F/debian/changelog 2021-01-07 10:57:42.000000000 -0800 +++ xaw3d-1.5+F/debian/changelog 2022-12-29 10:16:57.000000000 -0800 @@ -1,3 +1,20 @@ +xaw3d (1.5+F-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Debian Janitor ] + * Trim trailing whitespace. + * Update standards version to 4.6.1, no changes needed. + + [ Vagrant Cascadian ] + * debian/rules: Pass CFLAGS with file-prefix-map in dh_auto_build. + (Closes: #991180) + + [ Nilesh Patra ] + * Fix cross-building. (Closes: #986704) + + -- Vagrant Cascadian <vagr...@debian.org> Thu, 29 Dec 2022 10:16:57 -0800 + xaw3d (1.5+F-1) unstable; urgency=medium * Reassembled original tarball to cope with dquilt. @@ -13,7 +30,7 @@ * Non-maintainer upload. * debian/control: Drop explicit Pre-Depends on multiarch-support (Closes: - #870564). + #870564). -- Aurelien Jarno <aure...@debian.org> Sat, 20 Jan 2018 14:50:00 +0100 @@ -42,7 +59,7 @@ * Added patch XawIm.c to prevent gv segfaulting. (closes: #573474) * Added ${misc:Depends} to both binary packages to make lintian happy. - * Added xaw3dg.lintian-overrides to override the + * Added xaw3dg.lintian-overrides to override the package-name-doesnt-match-sonames lintian warning. * Added debian/README.source. @@ -50,8 +67,8 @@ xaw3d (1.5+E-17) unstable; urgency=low - * Bumped replace to conflicts with pre -16 version. That's needed for - moving of the .so link + * Bumped replace to conflicts with pre -16 version. That's needed for + moving of the .so link (closes: #492302) -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 25 Jul 2008 09:47:14 +0200 @@ -99,7 +116,7 @@ * Removed libxaw8-dev fake dependency, because it has been dropped in xorg roadmap. * Removed all X11 -dev dependencies in xaw3dg-dev, and the old - libc-dev|libc6-dev now superfluous dependency too. Packages now have to + libc-dev|libc6-dev now superfluous dependency too. Packages now have to declare explicitly their own -dev build-deps. (closes: #241280) @@ -107,7 +124,7 @@ xaw3d (1.5+E-11) unstable; urgency=low - * Changed to xorg 7 conformancy in paths: + * Changed to xorg 7 conformancy in paths: /usr/X11R6/lib -> /usr/lib /usr/X11R6/include -> /usr/include (closes: #362074, #363578) @@ -189,8 +206,8 @@ xaw3d (1.5+E-1) unstable; urgency=low - * Ready for unstable. - Changing release version for a smooth upgrading from experimental. + * Ready for unstable. + Changing release version for a smooth upgrading from experimental. (closes: #117325,#196439,#144877) -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 19 Aug 2003 00:35:30 +0200 @@ -295,12 +312,12 @@ xaw3d (1.5-15) unstable; urgency=low * Added -DARROW_SCROLLBAR in rules file for EXTRA_DEFINES. - The trick described in old scrollbars doc is no longer working due + The trick described in old scrollbars doc is no longer working due to changes in rules file: EXTRA_DEFINES in lib/Xaw3d/Imakefile are ignored. That obsolete document has been removed. Emacs folks will be happy :) - This seems also closing an old bug report about scrolling in + This seems also closing an old bug report about scrolling in emacs21 and xterm. Or hope so. I'll see if I could get some better patches to have a rock solid correction. (closes: #36736) @@ -370,7 +387,7 @@ * The xaw3dg preinst did return an error when the "medium" debconf note wasn't displayed. I added " || true" to fix this. (closes: #86599) - * debian/shlibs: Generate a dependency on xaw3dg (>= 1.5-6). + * debian/shlibs: Generate a dependency on xaw3dg (>= 1.5-6). -- Adrian Bunk <b...@fs.tum.de> Tue, 20 Feb 2001 14:21:24 +0100 @@ -486,7 +503,7 @@ * Non-maintainer upload * Handle ld.so.conf properly in postrm as well - + -- Wichert Akkerman <wakke...@debian.org> Tue, 21 Dec 1999 23:54:45 +0100 xaw3d (1.3-6.6) unstable; urgency=low @@ -554,13 +571,13 @@ * now uses libc6 * included a shlibs file * added xaw-wrappers file for axe - + -- joost witteveen <jo...@rulcmc.leidenuniv.nl> Sun, 3 Aug 1997 20:31:18 +0200 xaw3d (1.3-5) unstable; urgency=low * Compiled with -D_REENTRANT - * uses new, unreleased ld.so-1.8.9, so that the soname now can be + * uses new, unreleased ld.so-1.8.9, so that the soname now can be libxaw3d, making everything somewhat easier. -- joost witteveen <jo...@rulcmc.leidenuniv.nl> Sun, 9 Feb 1997 10:56:39 +0100 @@ -584,7 +601,7 @@ * Changed /sbin/ldconfig to ldconfig in postinst, prerm. * Included changelog.Debian * gzipped /usr/doc/xaw3d/* - + -- joost witteveen <jo...@rulcmc.leidenuniv.nl> Fri, 27 Dec 1996 19:12:04 +0100 xaw3d (1.3-1) unstable; urgency=low diff -Nru xaw3d-1.5+F/debian/control xaw3d-1.5+F/debian/control --- xaw3d-1.5+F/debian/control 2021-01-07 10:57:42.000000000 -0800 +++ xaw3d-1.5+F/debian/control 2022-12-29 09:53:07.000000000 -0800 @@ -12,7 +12,7 @@ ,x11proto-xext-dev ,bison ,flex (>= 2.5.31-16) -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Browser: https://salsa.debian.org/debian/xaw3dg Vcs-Git: https://salsa.debian.org/debian/xaw3dg.git diff -Nru xaw3d-1.5+F/debian/rules xaw3d-1.5+F/debian/rules --- xaw3d-1.5+F/debian/rules 2021-01-07 10:57:42.000000000 -0800 +++ xaw3d-1.5+F/debian/rules 2022-12-29 09:54:46.000000000 -0800 @@ -12,8 +12,9 @@ override_dh_auto_build: rm -rf $(SOURCE)/X11 && install -m755 -d $(SOURCE)/X11 cd $(SOURCE) && ln -sf ../ X11/Xaw3d && xmkmf - $(MAKE) -C $(SOURCE) \ - EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" + dh_auto_build -- -C $(SOURCE) \ + EXTRA_DEFINES="-D_REENTRANT -DARROW_SCROLLBAR" SHLIBDEF="-D_REENTRANT -DARROW_SCROLLBAR" \ + CFLAGS="-ffile-prefix-map=$(CURDIR)=. -I." override_dh_auto_clean: rm -rf $(SOURCE)/X11 $(COMPAT) lib/Xaw3d/laygram.h @@ -22,7 +23,7 @@ dh_clean `find . -name Makefile` override_dh_auto_install: - $(MAKE) -C $(SOURCE) install \ + dh_auto_install -- -C $(SOURCE) install \ DESTDIR=$(CURDIR)/debian/tmp INCDIR=/usr/include \ SHLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) @@ -31,4 +32,4 @@ dh_installexamples $(SOURCE)/app-defaults override_dh_installdocs: - dh_installdocs $(SOURCE)/README.XAW3D + dh_installdocs $(SOURCE)/README.XAW3D live well, vagrant
signature.asc
Description: PGP signature
