Bug#986101: unblock: udo/6.4.1-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package udo
Deduplication across packages created broken symlinks like
/usr/share/doc/udo-doc-en/html/images/dh.gif -> /udo-doc-de/usr/share/doc/udo-doc-de/html/images/dh.gif
And even if the link targets were correct, one would have to install
both German and English documentation packages to have all
files needed by the English docs. So don't deduplicate
between packages.
The cross build fix is not active during "regular" builds.
unblock udo/6.4.1-6
diff -Nru udo-6.4.1/debian/changelog udo-6.4.1/debian/changelog
--- udo-6.4.1/debian/changelog 2019-08-31 22:39:18.000000000 +0200
+++ udo-6.4.1/debian/changelog 2021-03-29 15:45:16.000000000 +0200
@@ -1,3 +1,16 @@
+udo (6.4.1-6) unstable; urgency=medium
+
+ * QA upload.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: Build a second time for cross building. (Closes: #947138)
+
+ [ Andreas Beckmann ]
+ * Do not deduplicate between packages to avoid creating broken symlinks.
+ * Set Rules-Requires-Root: no.
+
+ -- Andreas Beckmann <anbe@debian.org> Mon, 29 Mar 2021 15:45:16 +0200
+
udo (6.4.1-5) unstable; urgency=medium
* QA upload.
diff -Nru udo-6.4.1/debian/control udo-6.4.1/debian/control
--- udo-6.4.1/debian/control 2019-08-31 21:30:03.000000000 +0200
+++ udo-6.4.1/debian/control 2021-03-29 15:42:32.000000000 +0200
@@ -4,6 +4,7 @@
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: debhelper-compat (= 12),
jdupes
+Rules-Requires-Root: no
Standards-Version: 4.4.0
Homepage: https://www.udo-open-source.org/
diff -Nru udo-6.4.1/debian/rules udo-6.4.1/debian/rules
--- udo-6.4.1/debian/rules 2019-08-30 16:06:07.000000000 +0200
+++ udo-6.4.1/debian/rules 2021-03-29 15:26:58.000000000 +0200
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
#export DH_VERBOSE = 1
+include /usr/share/dpkg/architecture.mk
+
export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-format
%:
@@ -23,13 +25,19 @@
Source/udo --no-logfile --html -q -o eng/html/index.html $(CURDIR)/Guide/eng/manual/index.u
cp Guide/ger/manual/images/*.gif ger/html/images/
Source/udo --no-logfile --html -q -o ger/html/index.html $(CURDIR)/Guide/ger/manual/index.u
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+ dh_auto_clean --sourcedirectory=Source --buildsystem=makefile -- -f Makefile.debian
+ dh_auto_build --sourcedirectory=Source --buildsystem=makefile -- -f Makefile.debian \
+ CFLAGS="$(CFLAGS) $(CPPFLAGS) -D__LINUX__" LDFLAGS="$(LDFLAGS)"
+endif
override_dh_auto_install:
$(MAKE) -C Source -f Makefile.debian install DESTDIR=$(CURDIR)/debian/tmp
override_dh_install:
dh_install
- jdupes -rl debian/udo-doc-*
+ jdupes -rl debian/udo-doc-en
+ jdupes -rl debian/udo-doc-de
override_dh_installchangelogs:
dh_installchangelogs -X Changes
diff -Nru udo-6.4.1/debian/udo.lintian-overrides udo-6.4.1/debian/udo.lintian-overrides
--- udo-6.4.1/debian/udo.lintian-overrides 2019-08-29 01:58:30.000000000 +0200
+++ udo-6.4.1/debian/udo.lintian-overrides 2021-03-29 15:37:17.000000000 +0200
@@ -1,3 +1,3 @@
-# False positive. The words 'Programm' and 'ReEncode' were written in german and are correct.
+# False positive. The words 'Programm' and 'ReEncode' were written in German and are correct.
udo: spelling-error-in-binary usr/bin/udo Programm Program
udo: spelling-error-in-binary usr/bin/udo ReEncode Re-encode
Reply to: