Étienne Mollier pushed to branch master at Debian Med / epcr
Commits: 3dea2ed9 by Étienne Mollier at 2025-11-14T19:42:56+01:00 d/rules: invoke various targets in sequence. This is simpler and less intrusive than adjusting upstream makefiles. Closes: #1105316 - - - - - dfb0afae by Étienne Mollier at 2025-11-14T19:44:11+01:00 target-deps.patch: removed. - - - - - df311fdb by Étienne Mollier at 2025-11-14T19:45:19+01:00 d/changelog: adjust to new approach. - - - - - 4 changed files: - debian/changelog - debian/patches/series - − debian/patches/target-deps.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,6 @@ epcr (2.3.12-1-11) unstable; urgency=medium - * target-deps.patch: new: fix makefile dependencies. (Closes: #1105316) + * d/rules: invoke various targets in sequence. (Closes: #1105316) * d/rules: enable parallel builds again. * d/copyright: remove the old fsf mail address. * d/control: declare compliance to standards version 4.7.2. @@ -8,7 +8,7 @@ epcr (2.3.12-1-11) unstable; urgency=medium * d/watch: convert to v5 untrackable watch file. * d/patches/*: normalize Last-Update timestamp. - -- Étienne Mollier <[email protected]> Fri, 14 Nov 2025 19:10:54 +0100 + -- Étienne Mollier <[email protected]> Fri, 14 Nov 2025 19:44:36 +0100 epcr (2.3.12-1-10) unstable; urgency=medium ===================================== debian/patches/series ===================================== @@ -4,4 +4,3 @@ ensure_build_options.patch use-dpkg-buildflags.patch mayhem.patch spelling.patch -target-deps.patch ===================================== debian/patches/target-deps.patch deleted ===================================== @@ -1,38 +0,0 @@ -Description: fix makefile target dependencies. - This fixes building with make flag --shuffle=reverse and enables - parallel builds again. -Author: Étienne Mollier <[email protected]> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1105316 -Forwarded: no -Last-Update: 2025-11-14 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- epcr.orig/stand/Makefile.libepcr -+++ epcr/stand/Makefile.libepcr -@@ -61,7 +61,7 @@ - LIBNAME = epcr - TARGET = $(tgtdir)/libepcr.a - --target: $(TARGET) -+target: $(TARGET) links - - install: - ---- epcr.orig/stand/config.mk -+++ epcr/stand/config.mk -@@ -83,10 +83,11 @@ - - all: links target - --links: -- if test -n "$(LIBNAME)" ; then \ -- test -L $(LIBNAME) || ln -s $(srcdir) $(LIBNAME) ; \ -- fi -+links: epcr -+.PHONY: links -+ -+epcr: -+ test -L epcr || ln -s $(srcdir) epcr ; \ - - dirs: - for i in $(INCDIR)/$(LIBNAME) $(BINDIR) $(LIBDIR) ; do \ ===================================== debian/rules ===================================== @@ -34,7 +34,9 @@ override_dh_auto_clean: rm -f e-PCR famap fahash re-PCR override_dh_auto_build: - dh_auto_build -- links depend all OPTIMIZE=6 + dh_auto_build -- links OPTIMIZE=6 + dh_auto_build -- depend OPTIMIZE=6 + dh_auto_build -- all OPTIMIZE=6 override_dh_auto_install: # do nothing View it on GitLab: https://salsa.debian.org/med-team/epcr/-/compare/cb3e72a7b6940927a6cc96560621fef5987342b3...df311fdbaea6b014e3882abf5e3373a8eae7cd14 -- View it on GitLab: https://salsa.debian.org/med-team/epcr/-/compare/cb3e72a7b6940927a6cc96560621fef5987342b3...df311fdbaea6b014e3882abf5e3373a8eae7cd14 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
