diff options
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/libmariadbd19.install (renamed from debian/libmariadbd19t64.install) | 0 | ||||
| -rw-r--r-- | debian/libmariadbd19.lintian-overrides (renamed from debian/libmariadbd19t64.lintian-overrides) | 1 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 8 |
4 files changed, 6 insertions, 10 deletions
diff --git a/debian/control b/debian/control index 6f088752..070f75ac 100644 --- a/debian/control +++ b/debian/control @@ -135,10 +135,7 @@ Description: MariaDB database client library . This package includes the client library. -Package: libmariadbd19t64 -Provides: ${t64:Provides} -Replaces: libmariadbd19 -Breaks: libmariadbd19 (<< ${source:Version}) +Package: libmariadbd19 Architecture: any Section: libs Depends: ${misc:Depends}, @@ -158,7 +155,7 @@ Section: libdevel Provides: libmysqld-dev Pre-Depends: ${misc:Pre-Depends} Depends: libmariadb-dev (= ${binary:Version}), - libmariadbd19t64 (= ${binary:Version}), + libmariadbd19 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Breaks: libmariadb-dev (<< 1:10.4), diff --git a/debian/libmariadbd19t64.install b/debian/libmariadbd19.install index cb627204..cb627204 100644 --- a/debian/libmariadbd19t64.install +++ b/debian/libmariadbd19.install diff --git a/debian/libmariadbd19t64.lintian-overrides b/debian/libmariadbd19.lintian-overrides index acf42a22..a7fd30db 100644 --- a/debian/libmariadbd19t64.lintian-overrides +++ b/debian/libmariadbd19.lintian-overrides @@ -4,4 +4,3 @@ spelling-error-in-binary thats that's [usr/lib/*/libmariadbd.so.19] spelling-error-in-binary theres there's [usr/lib/*/libmariadbd.so.19] # False positive from Lintian, these strings are nowhere in test in source code spelling-error-in-binary AfE Safe [usr/lib/*/libmariadbd.so.19] -libmariadbd19t64: package-name-doesnt-match-sonames libmariadbd19 diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index 3bcda390..abcd3361 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -6,7 +6,7 @@ include: # Override Salsa-CI with MariaDB specific variations variables: - BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19t64 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data" + BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data" DEB_BUILD_OPTIONS: "nocheck noautodbgsym" RELEASE: sid # Reprotest works, but takes very long time and often fails due to timeouts. @@ -205,7 +205,7 @@ blhc: - *test-enable-artifacts-repo - apt-get install -yq --no-install-recommends libmariadb-dev-compat libmariadbd-dev # Installs 31 packages, including: - # libmariadb3 libmariadb-dev libmariadb-dev-compat libmariadbd19t64 libmariadbd-dev + # libmariadb3 libmariadb-dev libmariadb-dev-compat libmariadbd19 libmariadbd-dev .test-full-upgrade-libs: &test-full-upgrade-libs - *test-enable-artifacts-repo @@ -366,7 +366,7 @@ simple upgrade: stage: upgrade MariaDB script: - *test-prepare-container - # @TODO: Re-enable the line below once libmariadbd19t64 exists in repository + # @TODO: Re-enable the line below once libmariadbd19 exists in repository #- apt-get install -qq --yes 'default-mysql*' ${BUILT_PACKAGES} - apt-get install -qq --yes 'default-mysql*' libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data - *test-full-upgrade @@ -675,7 +675,7 @@ libmysql* to libmariadb* upgrade: - apt-get install -qq --yes libmariadb-dev-compat - pkg-config --cflags mysqlclient # mysqlclient.pc from compat package - pkg-config --list-all - - apt-get install -qq --yes libmariadbd19t64 + - apt-get install -qq --yes libmariadbd19 - pkg-config --list-all - apt-get install -qq --yes libmariadbd-dev - pkg-config --list-all |