Hi wookey,
you seem to be busy with non-dpkg-cross things and that's fine. The
package has a few filed bugs and other minor issues though and I'm
taking the liberty to NMU it in accordance with the LowNMU list you've
subscribed to. I'm attaching the full .debdiff of the performed changes.
Helmut
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/config/cross-config.cache
dpkg-cross-2.6.18+nmu2/config/cross-config.cache
--- dpkg-cross-2.6.18+nmu1/config/cross-config.cache 2020-06-21
21:30:02.000000000 +0200
+++ dpkg-cross-2.6.18+nmu2/config/cross-config.cache 2021-08-28
07:23:28.000000000 +0200
@@ -10,6 +10,11 @@
# Common libc things - global until someone finds a reason not to
ac_cv_func_malloc_0_nonnull=yes
ac_cv_func_realloc_0_nonnull=yes
+
+# xorg variant of it
+test "$ac_cv_func_realloc_0_nonnull" = yes && xorg_cv_malloc0_returns_null=no
+test "$ac_cv_func_realloc_0_nonnull" = no && xorg_cv_malloc0_returns_null=yes
+
# shadow
ac_cv_func_setpgrp_void=yes
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/debian/changelog
dpkg-cross-2.6.18+nmu2/debian/changelog
--- dpkg-cross-2.6.18+nmu1/debian/changelog 2021-05-10 20:42:09.000000000
+0200
+++ dpkg-cross-2.6.18+nmu2/debian/changelog 2021-08-28 07:23:28.000000000
+0200
@@ -1,3 +1,22 @@
+dpkg-cross (2.6.18+nmu2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Helmut Grohne ]
+ * Mark cross-config Multi-Arch: foreign.
+ * Reduce maintainer scripts:
+ + Delete dpkg-cross.preinst.
+ + Delete dpkg-cross.prerm.
+ + Delete diversion cleanup from dpkg-cross.postinst.
+ * Declare compliance with policy 4.6.0.
+ + Emit priority optional instead of extra in generated packages.
+ * cross-config: Set xorg_cv_malloc0_returns_null. (Closes: #861073)
+
+ [ YunQiang Su ]
+ * Support mips r6 dynamic linker. (Closes: #993059)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sat, 28 Aug 2021 07:23:28 +0200
+
dpkg-cross (2.6.18+nmu1) unstable; urgency=medium
* Non-maintainer upload.
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/debian/control
dpkg-cross-2.6.18+nmu2/debian/control
--- dpkg-cross-2.6.18+nmu1/debian/control 2021-03-02 05:18:17.000000000
+0100
+++ dpkg-cross-2.6.18+nmu2/debian/control 2021-08-28 07:23:28.000000000
+0200
@@ -3,11 +3,12 @@
Priority: optional
Maintainer: Wookey <woo...@debian.org>
Build-Depends: cdbs, debhelper ( >=10 )
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
Rules-Requires-Root: no
Package: cross-config
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: dpkg-cross (<= 2.6.14)
Replaces: dpkg-cross (<= 2.6.14)
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.postinst
dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.postinst
--- dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.postinst 2016-07-12
20:33:01.000000000 +0200
+++ dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.postinst 2021-08-28
07:23:28.000000000 +0200
@@ -23,32 +23,8 @@
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
-diverted="dpkg-buildpackage dpkg-shlibdeps"
-
case "$1" in
configure)
- # Remove diversion of dh_strip left from older versions of dpkg-cross
- if dpkg-divert --list /usr/bin/dh_strip | grep -q dpkg-cross; then
- # For some reason, dh_strip from older version of package is still
- # there at this point. Looks like dpkg does not delete file from
- # older version of a package if that file diverts another file ..
- # This causes funny things such as #237511 that don't seem to have
- # a good solution. Looks that the only way to make a sane upgrade
- # is to delete the file here - which is bad, I know, but IMHO
- # it's better than dpkg errors.
- test -e /usr/bin/dh_strip && test -e /usr/bin/dh_strip.orig &&
- rm -f /usr/bin/dh_strip
- dpkg-divert --package dpkg-cross --remove --rename \
- --divert /usr/bin/dh_strip.orig \
- /usr/bin/dh_strip
- fi
- # dpkg-divert --package wibble --rename --remove /usr/bin/example
- for prog in $diverted; do
- if dpkg-divert --list /usr/bin/$prog | grep -q dpkg-cross; then
- dpkg-divert --package dpkg-cross --rename --remove \
- /usr/bin/$prog
- fi
- done
if [ ! -f '/etc/dpkg-cross/cross-compile' ]; then
cp /usr/share/dpkg-cross/cross-compile.sample
/etc/dpkg-cross/cross-compile
fi
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.preinst
dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.preinst
--- dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.preinst 2011-03-27
08:14:10.000000000 +0200
+++ dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.preinst 1970-01-01
01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-#! /bin/sh
-# preinst script for dpkg-cross
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-#
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
- install|upgrade)
- # Move dpkg-cross's files from /etc/dpkg in /etc/dpkg-cross directory.
- # Do this in preinst, not postinst, to make dpkg conffile handling
- # to work as expected. Needed until Etch becomes oldstable.
- if test -n "$2" && dpkg --compare-versions "$2" lt "1.24"; then
- mkdir -p /etc/dpkg-cross
- mv -f /etc/dpkg/cross-compile* /etc/dpkg/cross-config.* \
- /etc/dpkg/crosstools* /etc/dpkg-cross/. 2>/dev/null || true
- fi
-
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-# vim:ts=4:et
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.prerm
dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.prerm
--- dpkg-cross-2.6.18+nmu1/debian/dpkg-cross.prerm 2011-03-27
08:14:10.000000000 +0200
+++ dpkg-cross-2.6.18+nmu2/debian/dpkg-cross.prerm 1970-01-01
01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-#! /bin/sh
-# prerm script for dpkg-cross
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-case "$1" in
- upgrade)
- # Move dpkg-cross's files from /etc/dpkg in /etc/dpkg-cross directory.
- # Do this in preinst, not postinst, to make dpkg conffile handling
- # to work as expected. Needed until Etch becomes oldstable.
- if dpkg --compare-versions "$2" lt "1.24"; then
- mkdir -p /etc/dpkg
- mv -f /etc/dpkg-cross/cross-compile* /etc/dpkg-cross/cross-config* \
- /etc/dpkg-cross/crosstools* /etc/dpkg/. 2>/dev/null || true
- rmdir /etc/dpkg-cross 2>/dev/null || true
- fi
- ;;
- remove|deconfigure|failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --minimal -Nru dpkg-cross-2.6.18+nmu1/dpkg-cross
dpkg-cross-2.6.18+nmu2/dpkg-cross
--- dpkg-cross-2.6.18+nmu1/dpkg-cross 2021-05-10 20:42:08.000000000 +0200
+++ dpkg-cross-2.6.18+nmu2/dpkg-cross 2021-08-28 07:23:28.000000000 +0200
@@ -633,10 +633,13 @@
while (<FROM>) {
if ($multiarch =~ m/mips(isa)?64.*-linux.*-gnuabi64.*/)
{
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslib64/ld.so.1:g;
+
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslib64/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarch =~
m/^mips(isa)?64.*-linux.*-gnuabin32.*/) {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslibn32/ld.so.1:g;
+
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslibn32/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarch =~
m/^mips(isa32)?.*-linux.*-gnu.*/) {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld\.so\.1:$1$crosslib/ld.so.1:g;
+
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux-mipsn8\.so\.1:$1$crosslib/ld-linux-mipsn8\.so\.1:g;
} elsif ($multiarchtriplet eq "sparc64-linux-gnu") {
s:(^|[^-\w/])(/usr)?/lib/${multiarch}ld-linux\.so\.2:$1$crosslib64/ld-linux.so.2:g;
}
@@ -1065,6 +1068,7 @@
# skip /usr/$(multiarch)/lib/ld.so.1 for mips n32 and 64.
# their ld.so.1 should be in lib32 and lib64.
next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~
m:lib/ld\.so\.1$:);
+ next if ($multiarch =~ m/^mips(isa)?64/ && $_ =~
m:lib/ld-linux-mipsn8\.so\.1$:);
next if ($multiarchtriplet eq "sparc64-linux-gnu" && $_ =~
m:lib/ld-linux\.so\.2$:);
# skip links to private modules and plugins that are not
@@ -1151,7 +1155,7 @@
print CONTROL "Package: " . $control{"package"} . "-$arch-cross\n";
print CONTROL "Version: " . $control{"version"} . "\n";
print CONTROL "Section: " . $control{"section"} . "\n";
- print CONTROL "Priority: extra\n";
+ print CONTROL "Priority: optional\n";
print CONTROL "Architecture: all\n";
print CONTROL "Multi-Arch: foreign\n";
