Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
X-Debbugs-Cc: [email protected], [email protected]
Control: affects -1 + src:daps
Please unblock package daps
[ Reason ]
Fixes Bug #1103526 FTBFS when built in parallel
[ Impact ]
Anybody trying to build the package from source might find that the
package does not build. It may not happen to everybody, but in
some machines the failure rate may be close to 100%.
[ Tests ]
I've checked that the package builds ok again for everybody.
[ Risks ]
Very low. The patch is a one line fix in Makefile.am, and by
its nature, it can't really make things worse.
[ Checklist ]
[X] all changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in testing
[ Other info ]
This is a NMU that was uploaded to delayed/2 two days ago,
and now it has been already built in buildd.debian.org.
unblock daps/3.3.2+cleaned1-6.1
diff -Nru daps-3.3.2+cleaned1/debian/changelog
daps-3.3.2+cleaned1/debian/changelog
--- daps-3.3.2+cleaned1/debian/changelog 2023-08-23 12:18:08.000000000
+0200
+++ daps-3.3.2+cleaned1/debian/changelog 2025-06-04 12:15:00.000000000
+0200
@@ -1,3 +1,12 @@
+daps (3.3.2+cleaned1-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add bindir to INSTALLDIRS to fix parallel build. Closes: #1103526.
+ The old fix stopped working because Makefile.in is now regenerated from
+ Makefile.am after the package raised the debhelper compat version.
+
+ -- Santiago Vila <[email protected]> Wed, 04 Jun 2025 12:15:00 +0200
+
daps (3.3.2+cleaned1-6) unstable; urgency=low
* Move calibre to Suggests instead of Depends, so that daps can be installed
diff -Nru daps-3.3.2+cleaned1/debian/patches/add-bindir-to-installdirs.patch
daps-3.3.2+cleaned1/debian/patches/add-bindir-to-installdirs.patch
--- daps-3.3.2+cleaned1/debian/patches/add-bindir-to-installdirs.patch
1970-01-01 01:00:00.000000000 +0100
+++ daps-3.3.2+cleaned1/debian/patches/add-bindir-to-installdirs.patch
2025-06-04 12:11:43.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Add bindir to INSTALLDIRS
+Author: Santiago Vila <[email protected]>
+Bug-Debian: https://bugs.debian.org/1103526
+Forwarded: https://github.com/openSUSE/daps/issues/705
+Last-Update: 2025-04-18
+
+--- daps-3.3.2+cleaned1.orig/Makefile.am
++++ daps-3.3.2+cleaned1/Makefile.am
+@@ -208,6 +208,7 @@ all-local: $(USERGUIDE) $(QUICKSTART) $(
+
+ INSTALLDIRS = $(DESTDIR)$(docdir)/html $(DESTDIR)$(pkgdatadir) \
+ $(DESTDIR)$(datadir)/xml/$(PACKAGE)/schema/ \
++ $(DESTDIR)$(bindir) \
+ $(DESTDIR)$(templatedir)
+
+
diff -Nru
daps-3.3.2+cleaned1/debian/patches/fix-parallel-makefile-execution.patch
daps-3.3.2+cleaned1/debian/patches/fix-parallel-makefile-execution.patch
--- daps-3.3.2+cleaned1/debian/patches/fix-parallel-makefile-execution.patch
2023-08-23 12:18:08.000000000 +0200
+++ daps-3.3.2+cleaned1/debian/patches/fix-parallel-makefile-execution.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-Fix the parallel execution of the install make target.
-Thanks to Santiago Vila <[email protected]> for the report and the fix
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1731,6 +1731,7 @@
- tar c --mode=u+w,go+r-w,a-s -C $$BOOK . | \
- (cd $(DESTDIR)$(docdir)/html; tar xp); \
- done
-+ mkdir -p $(DESTDIR)$(bindir)
- install -m755 autobuild/daps-autobuild $(DESTDIR)$(bindir)
- install -m644 autobuild/daps-autobuild.rnc
$(DESTDIR)$(datadir)/xml/$(PACKAGE)/schema/
- install -m644 autobuild/daps-autobuild.xml $(DESTDIR)$(templatedir)
diff -Nru daps-3.3.2+cleaned1/debian/patches/series
daps-3.3.2+cleaned1/debian/patches/series
--- daps-3.3.2+cleaned1/debian/patches/series 2023-08-23 12:18:08.000000000
+0200
+++ daps-3.3.2+cleaned1/debian/patches/series 2025-04-18 18:23:34.000000000
+0200
@@ -1,4 +1,3 @@
-fix-parallel-makefile-execution.patch
fix-validate.mk-daps-jing-wrapper-call.patch
remove-which-call-flags.patch
-
+add-bindir-to-installdirs.patch
