Deb: Sync build and runtime dependencies from downstream to upstream

- Go back to using $MAJOR_VER instead of hard-coded version strings where
  possible.

- Default to 'auto' in NUMJOBS instead of just 1. Will make mysql-test-run
  faster.

- Unify autopkgtest with latest version in Debian, use eatmydata to make
  mysql-test-run faster.

- Salsa-CI: Remove obsolete 'artifacts: true' as that is the default value.

- Salsa-CI: Clean away obsolete temporary fixes.

- Salsa-CI: Unify with salsa-ci.yml in Debian, including test upgrades
  from Bullseye to Debian unstable.

debian/control

@@ -492,7 +492,7 @@ Recommends: libhtml-template-perl
 Pre-Depends: adduser (>= 3.40),
              debconf,
              mariadb-common (>= ${source:Version})
-Depends: galera-4 (>=26.4),
+Depends: galera-4 (>= 26.4),
          gawk,
          iproute2 [linux-any],
          libdbi-perl,

debian/mariadb-server-10.5.postinst

@@ -161,7 +161,7 @@ EOF
     # Clean up old flags before setting new one
     rm -f $mysql_datadir/debian-*.flag
     # Flag data dir to avoid downgrades
-    touch $mysql_datadir/debian-10.5.flag
+    touch "$mysql_datadir/debian-$MAJOR_VER.flag"
 
     # initiate databases. Output is not allowed by debconf :-(
     # This will fail if we are upgrading an existing database; in this case

debian/po/de.po

@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2016-05-12 22:39+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
-"Language-Team: german <debian-l10n-german@lists.debian.org>\n"
+"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

debian/po/es.po

-# mariadb translation to spanish
+# MariaDB translation to Spanish
 # Copyright (C) 2005-2016 Software in the Public Interest, SPI Inc.
 # This file is distributed under the same license as the mariadb package.
 #

debian/po/it.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mariadb-10.5 10.0.13 italian debconf templates\n"
+"Project-Id-Version: mariadb-10.5 10.0.13 Italian debconf templates\n"
 "Report-Msgid-Bugs-To: mariadb-10.5@packages.debian.org\n"
 "POT-Creation-Date: 2019-07-23 19:16-0300\n"
 "PO-Revision-Date: 2017-083-20 20:29+0100\n"

debian/rules

@@ -34,8 +34,8 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
     MAKEFLAGS += -j$(NUMJOBS)
 else
-    # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 1.
-    NUMJOBS = 1
+    # NUMJOBS cannot be empty as it is used as a parameter to mtr, default to 'auto'.
+    NUMJOBS = auto
 endif
 
 # RocksDB cannot build on 32-bit platforms

debian/tests/control

@@ -7,5 +7,5 @@ Depends: mariadb-plugin-rocksdb | mariadb-server-10.5
 Restrictions: allow-stderr needs-root isolation-container
 
 Tests: upstream
-Depends: mariadb-test
+Depends: mariadb-test, eatmydata
 Restrictions: allow-stderr breaks-testbed

debian/tests/upstream

@@ -60,7 +60,9 @@ fi
 
 cd /usr/share/mysql/mysql-test
 echo "starting mysql-test-tun.pl..."
-perl -I. ./mysql-test-run.pl --suite=main --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
+eatmydata perl -I. ./mysql-test-run.pl --suite=main \
+    --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
     --parallel=auto --skip-rpl \
-    --force --skip-test-list=$SKIP_TEST_LST $@ 2>&1
+    --force --skip-test-list=$SKIP_TEST_LST \
+    --xml-report=$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml $@ 2>&1
 echo "run: OK"